diff options
author | Maxim Dounin <mdounin@mdounin.ru> | 2012-02-13 15:41:11 +0000 |
---|---|---|
committer | Maxim Dounin <mdounin@mdounin.ru> | 2012-02-13 15:41:11 +0000 |
commit | 9f38b20db50a22b434d35c9bf3c5b08d5ddfbd8b (patch) | |
tree | bf812ed61086a3746bb141c3df05ab8b4d2577cc /src/http/modules/ngx_http_log_module.c | |
parent | 8cb7134f49bcdded469b3e72415b96794190257e (diff) | |
download | nginx-9f38b20db50a22b434d35c9bf3c5b08d5ddfbd8b.tar.gz nginx-9f38b20db50a22b434d35c9bf3c5b08d5ddfbd8b.zip |
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).
Diffstat (limited to 'src/http/modules/ngx_http_log_module.c')
-rw-r--r-- | src/http/modules/ngx_http_log_module.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/http/modules/ngx_http_log_module.c b/src/http/modules/ngx_http_log_module.c index c55131772..bfbbe93bd 100644 --- a/src/http/modules/ngx_http_log_module.c +++ b/src/http/modules/ngx_http_log_module.c @@ -1249,7 +1249,7 @@ ngx_http_log_open_file_cache(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) s.data = value[i].data + 9; inactive = ngx_parse_time(&s, 1); - if (inactive < 0) { + if (inactive == (time_t) NGX_ERROR) { goto failed; } @@ -1272,7 +1272,7 @@ ngx_http_log_open_file_cache(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) s.data = value[i].data + 6; valid = ngx_parse_time(&s, 1); - if (valid < 0) { + if (valid == (time_t) NGX_ERROR) { goto failed; } |