mirror/nginx
1
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2025-06-07 09:42:39 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Improved ngx_parse_time() code readability.

Browse Source
This commit is contained in:
Ruslan Ermilov 2011-10-07 08:03:16 +00:00
parent 6e86fb02d6
commit a610127fe3
2 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
src/core/ngx_parse.c
View File

@ -93,7 +93,7 @@ ngx_parse_offset(ngx_str_t *line)
ngx_int_t ngx_int_t
ngx_parse_time(ngx_str_t *line, ngx_uint_t sec) ngx_parse_time(ngx_str_t *line, ngx_uint_t is_sec)
{ {
u_char *p, *last; u_char *p, *last;
ngx_int_t value, total, scale; ngx_int_t value, total, scale;
@ -114,8 +114,8 @@ ngx_parse_time(ngx_str_t *line, ngx_uint_t sec)
valid = 0; valid = 0;
value = 0; value = 0;
total = 0; total = 0;
step = sec ? st_start : st_month; step = is_sec ? st_start : st_month;
scale = sec ? 1 : 1000; scale = is_sec ? 1 : 1000;
p = line->data; p = line->data;
last = p + line->len; last = p + line->len;
@ -135,81 +135,81 @@ ngx_parse_time(ngx_str_t *line, ngx_uint_t sec)
return NGX_ERROR; return NGX_ERROR;
} }
step = st_year; step = st_year;
max = 68; max = NGX_MAX_INT32_VALUE / (60 * 60 * 24 * 365);
scale = 60 * 60 * 24 * 365; scale = 60 * 60 * 24 * 365;
break; break;
case 'M': case 'M':
if (step > st_year) { if (step >= st_month) {
return NGX_ERROR; return NGX_ERROR;
} }
step = st_month; step = st_month;
max = 828; max = NGX_MAX_INT32_VALUE / (60 * 60 * 24 * 30);
scale = 60 * 60 * 24 * 30; scale = 60 * 60 * 24 * 30;
break; break;
case 'w': case 'w':
if (step > st_month) { if (step >= st_week) {
return NGX_ERROR; return NGX_ERROR;
} }
step = st_week; step = st_week;
max = 3550; max = NGX_MAX_INT32_VALUE / (60 * 60 * 24 * 7);
scale = 60 * 60 * 24 * 7; scale = 60 * 60 * 24 * 7;
break; break;
case 'd': case 'd':
if (step > st_week) { if (step >= st_day) {
return NGX_ERROR; return NGX_ERROR;
} }
step = st_day; step = st_day;
max = 24855; max = NGX_MAX_INT32_VALUE / (60 * 60 * 24);
scale = 60 * 60 * 24; scale = 60 * 60 * 24;
break; break;
case 'h': case 'h':
if (step > st_day) { if (step >= st_hour) {
return NGX_ERROR; return NGX_ERROR;
} }
step = st_hour; step = st_hour;
max = 596523; max = NGX_MAX_INT32_VALUE / (60 * 60);
scale = 60 * 60; scale = 60 * 60;
break; break;
case 'm': case 'm':
if (*p == 's') { if (*p == 's') {
if (sec || step > st_sec) { if (is_sec || step >= st_msec) {
return NGX_ERROR; return NGX_ERROR;
} }
p++; p++;
step = st_msec; step = st_msec;
max = 2147483647; max = NGX_MAX_INT32_VALUE;
scale = 1; scale = 1;
break; break;
} }
if (step > st_hour) { if (step >= st_min) {
return NGX_ERROR; return NGX_ERROR;
} }
step = st_min; step = st_min;
max = 35791394; max = NGX_MAX_INT32_VALUE / 60;
scale = 60; scale = 60;
break; break;
case 's': case 's':
if (step > st_min) { if (step >= st_sec) {
return NGX_ERROR; return NGX_ERROR;
} }
step = st_sec; step = st_sec;
max = 2147483647; max = NGX_MAX_INT32_VALUE;
scale = 1; scale = 1;
break; break;
case ' ': case ' ':
if (step > st_min) { if (step >= st_sec) {
return NGX_ERROR; return NGX_ERROR;
} }
step = st_last; step = st_last;
max = 2147483647; max = NGX_MAX_INT32_VALUE;
scale = 1; scale = 1;
break; break;
@ -217,7 +217,7 @@ ngx_parse_time(ngx_str_t *line, ngx_uint_t sec)
return NGX_ERROR; return NGX_ERROR;
} }
if (step != st_msec && !sec) { if (step != st_msec && !is_sec) {
scale *= 1000; scale *= 1000;
max /= 1000; max /= 1000;
} }
@ -228,12 +228,12 @@ ngx_parse_time(ngx_str_t *line, ngx_uint_t sec)
total += value * scale; total += value * scale;
if ((ngx_uint_t) total > 2147483647) { if ((ngx_uint_t) total > NGX_MAX_INT32_VALUE) {
return NGX_ERROR; return NGX_ERROR;
} }
value = 0; value = 0;
scale = sec ? 1 : 1000; scale = is_sec ? 1 : 1000;
while (p < last && *p == ' ') { while (p < last && *p == ' ') {
p++; p++;

2
src/core/ngx_parse.h
View File

@ -17,7 +17,7 @@
ssize_t ngx_parse_size(ngx_str_t *line); ssize_t ngx_parse_size(ngx_str_t *line);
off_t ngx_parse_offset(ngx_str_t *line); off_t ngx_parse_offset(ngx_str_t *line);
ngx_int_t ngx_parse_time(ngx_str_t *line, ngx_uint_t sec); ngx_int_t ngx_parse_time(ngx_str_t *line, ngx_uint_t is_sec);
#endif /* _NGX_PARSE_H_INCLUDED_ */ #endif /* _NGX_PARSE_H_INCLUDED_ */