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/core/ngx_resolver.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/core/ngx_resolver.c')
| -rw-r--r-- | src/core/ngx_resolver.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/ngx_resolver.c b/src/core/ngx_resolver.c index 6ab0ddb51..5a0ade729 100644 --- a/src/core/ngx_resolver.c +++ b/src/core/ngx_resolver.c @@ -160,7 +160,7 @@ ngx_resolver_create(ngx_conf_t *cf, ngx_str_t *names, ngx_uint_t n) r->valid = ngx_parse_time(&s, 1); - if (r->valid == NGX_ERROR) { + if (r->valid == (time_t) NGX_ERROR) { ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, "invalid parameter: %V", &names[i]); return NULL; |