Mercurial > hg > nginx
comparison src/http/modules/ngx_http_log_module.c @ 4474:41f640a693de
Time parsing cleanup.
Nuke NGX_PARSE_LARGE_TIME, it's not used since 0.6.30. The only error
ngx_parse_time() can currently return is NGX_ERROR, check it explicitly
and make sure to cast it to appropriate type (either time_t or ngx_msec_t)
to avoid signedness warnings on platforms with unsigned time_t (notably QNX).
author | Maxim Dounin <mdounin@mdounin.ru> |
---|---|
date | Mon, 13 Feb 2012 15:41:11 +0000 |
parents | d620f497c50f |
children | 08713bac87fc |
comparison
equal
deleted
inserted
replaced
4473:3b877a45d343 | 4474:41f640a693de |
---|---|
1247 | 1247 |
1248 s.len = value[i].len - 9; | 1248 s.len = value[i].len - 9; |
1249 s.data = value[i].data + 9; | 1249 s.data = value[i].data + 9; |
1250 | 1250 |
1251 inactive = ngx_parse_time(&s, 1); | 1251 inactive = ngx_parse_time(&s, 1); |
1252 if (inactive < 0) { | 1252 if (inactive == (time_t) NGX_ERROR) { |
1253 goto failed; | 1253 goto failed; |
1254 } | 1254 } |
1255 | 1255 |
1256 continue; | 1256 continue; |
1257 } | 1257 } |
1270 | 1270 |
1271 s.len = value[i].len - 6; | 1271 s.len = value[i].len - 6; |
1272 s.data = value[i].data + 6; | 1272 s.data = value[i].data + 6; |
1273 | 1273 |
1274 valid = ngx_parse_time(&s, 1); | 1274 valid = ngx_parse_time(&s, 1); |
1275 if (valid < 0) { | 1275 if (valid == (time_t) NGX_ERROR) { |
1276 goto failed; | 1276 goto failed; |
1277 } | 1277 } |
1278 | 1278 |
1279 continue; | 1279 continue; |
1280 } | 1280 } |