build fixed for GCC.

dedok · dedok · commit fb6a1ed7b8e0 · 2018-01-01T21:17:30.000+03:00
diff --git a/src/ngx_http_tnt_module.c b/src/ngx_http_tnt_module.c
@@ -1518,6 +1518,7 @@ ngx_http_tnt_format_prepare(ngx_http_tnt_loc_conf_t *conf,
                     ngx_strncmp(key.data, conf->limit_name.data,
                                 conf->limit_name.len) == 0)
             {
+                prepare_result->limit = conf->select_limit_max;
                 tmp = ngx_atoi(value.data, value.len);
 
                 if (tmp >= 0) {
@@ -1526,9 +1527,8 @@ ngx_http_tnt_format_prepare(ngx_http_tnt_loc_conf_t *conf,
                         goto not_allowed;
                     }
 
-                    prepare_result->limit = (ngx_uint_t)
-                        ((ngx_uint_t) tmp > conf->select_limit_max ?
-                            conf->select_limit_max : tmp);
+                    prepare_result->limit = (ngx_uint_t) tmp;
+
                     expects &= ~EXPECTS_LIMIT;
                 }
             }

Original file line number	Diff line number	Diff line change
`@@ -1518,6 +1518,7 @@ ngx_http_tnt_format_prepare(ngx_http_tnt_loc_conf_t *conf,`
`1518`	`1518`	`ngx_strncmp(key.data, conf->limit_name.data,`
`1519`	`1519`	`conf->limit_name.len) == 0)`
`1520`	`1520`	`{`
	`1521`	`+ prepare_result->limit = conf->select_limit_max;`
`1521`	`1522`	`tmp = ngx_atoi(value.data, value.len);`
`1522`	`1523`
`1523`	`1524`	`if (tmp >= 0) {`
`@@ -1526,9 +1527,8 @@ ngx_http_tnt_format_prepare(ngx_http_tnt_loc_conf_t *conf,`
`1526`	`1527`	`goto not_allowed;`
`1527`	`1528`	`}`
`1528`	`1529`
`1529`		`- prepare_result->limit = (ngx_uint_t)`
`1530`		`- ((ngx_uint_t) tmp > conf->select_limit_max ?`
`1531`		`- conf->select_limit_max : tmp);`
	`1530`	`+ prepare_result->limit = (ngx_uint_t) tmp;`
	`1531`	`+`
`1532`	`1532`	`expects &= ~EXPECTS_LIMIT;`
`1533`	`1533`	`}`
`1534`	`1534`	`}`