bugfix: fixed compiler warnings "comparison between signed and unsigned integer expressions" on Windows.

agentzh · agentzh · commit f54438b6aaf5 · 2015-12-12T10:36:21.000-08:00
diff --git a/src/ngx_http_lua_args.c b/src/ngx_http_lua_args.c
@@ -389,7 +389,7 @@ ngx_http_lua_ffi_req_get_uri_args_count(ngx_http_request_t *r, int max)
     int                      count;
     u_char                  *p, *last;
 
-    if (r->connection->fd == -1) {
+    if (r->connection->fd == (ngx_socket_t) -1) {
         return NGX_HTTP_LUA_FFI_BAD_CONTEXT;
     }
 
diff --git a/src/ngx_http_lua_headers.c b/src/ngx_http_lua_headers.c
@@ -989,7 +989,7 @@ ngx_http_lua_ffi_req_get_headers_count(ngx_http_request_t *r, int max)
     int                           count;
     ngx_list_part_t              *part;
 
-    if (r->connection->fd == -1) {
+    if (r->connection->fd == (ngx_socket_t) -1) {
         return NGX_HTTP_LUA_FFI_BAD_CONTEXT;
     }
 
@@ -1082,7 +1082,7 @@ ngx_http_lua_ffi_set_resp_header(ngx_http_request_t *r, const u_char *key_data,
         return NGX_HTTP_LUA_FFI_NO_REQ_CTX;
     }
 
-    if (r->connection->fd == -1) {
+    if (r->connection->fd == (ngx_socket_t) -1) {
         return NGX_HTTP_LUA_FFI_BAD_CONTEXT;
     }
 
@@ -1198,7 +1198,7 @@ ngx_http_lua_ffi_req_header_set_single_value(ngx_http_request_t *r,
     ngx_str_t                    k;
     ngx_str_t                    v;
 
-    if (r->connection->fd == -1) {  /* fake request */
+    if (r->connection->fd == (ngx_socket_t) -1) {  /* fake request */
         return NGX_HTTP_LUA_FFI_BAD_CONTEXT;
     }
 
@@ -1253,7 +1253,7 @@ ngx_http_lua_ffi_get_resp_header(ngx_http_request_t *r,
 
     ngx_http_lua_loc_conf_t     *llcf;
 
-    if (r->connection->fd == -1) {
+    if (r->connection->fd == (ngx_socket_t) -1) {
         return NGX_HTTP_LUA_FFI_BAD_CONTEXT;
     }
 
diff --git a/src/ngx_http_lua_misc.c b/src/ngx_http_lua_misc.c
@@ -200,7 +200,7 @@ ngx_http_lua_ngx_set(lua_State *L)
 int
 ngx_http_lua_ffi_get_resp_status(ngx_http_request_t *r)
 {
-    if (r->connection->fd == -1) {
+    if (r->connection->fd == (ngx_socket_t) -1) {
         return NGX_HTTP_LUA_FFI_BAD_CONTEXT;
     }
 
@@ -222,7 +222,7 @@ ngx_http_lua_ffi_get_resp_status(ngx_http_request_t *r)
 int
 ngx_http_lua_ffi_set_resp_status(ngx_http_request_t *r, int status)
 {
-    if (r->connection->fd == -1) {
+    if (r->connection->fd == (ngx_socket_t) -1) {
         return NGX_HTTP_LUA_FFI_BAD_CONTEXT;
     }
 
@@ -254,7 +254,7 @@ ngx_http_lua_ffi_set_resp_status(ngx_http_request_t *r, int status)
 int
 ngx_http_lua_ffi_is_subrequest(ngx_http_request_t *r)
 {
-    if (r->connection->fd == -1) {
+    if (r->connection->fd == (ngx_socket_t) -1) {
         return NGX_HTTP_LUA_FFI_BAD_CONTEXT;
     }
 
@@ -272,7 +272,7 @@ ngx_http_lua_ffi_headers_sent(ngx_http_request_t *r)
         return NGX_HTTP_LUA_FFI_NO_REQ_CTX;
     }
 
-    if (r->connection->fd == -1) {
+    if (r->connection->fd == (ngx_socket_t) -1) {
         return NGX_HTTP_LUA_FFI_BAD_CONTEXT;
     }
 
diff --git a/src/ngx_http_lua_req_method.c b/src/ngx_http_lua_req_method.c
@@ -149,7 +149,7 @@ ngx_http_lua_ngx_req_set_method(lua_State *L)
 int
 ngx_http_lua_ffi_req_get_method(ngx_http_request_t *r)
 {
-    if (r->connection->fd == -1) {
+    if (r->connection->fd == (ngx_socket_t) -1) {
         return NGX_HTTP_LUA_FFI_BAD_CONTEXT;
     }
 
@@ -161,7 +161,7 @@ int
 ngx_http_lua_ffi_req_get_method_name(ngx_http_request_t *r, char *buf,
     size_t *len)
 {
-    if (r->connection->fd == -1) {
+    if (r->connection->fd == (ngx_socket_t) -1) {
         return NGX_HTTP_LUA_FFI_BAD_CONTEXT;
     }
 
@@ -174,7 +174,7 @@ ngx_http_lua_ffi_req_get_method_name(ngx_http_request_t *r, char *buf,
 int
 ngx_http_lua_ffi_req_set_method(ngx_http_request_t *r, int method)
 {
-    if (r->connection->fd == -1) {
+    if (r->connection->fd == (ngx_socket_t) -1) {
         return NGX_HTTP_LUA_FFI_BAD_CONTEXT;
     }
 
diff --git a/src/ngx_http_lua_sleep.c b/src/ngx_http_lua_sleep.c
@@ -102,7 +102,7 @@ ngx_http_lua_sleep_handler(ngx_event_t *ev)
         return;
     }
 
-    if (c->fd != -1) {  /* not a fake connection */
+    if (c->fd != (ngx_socket_t) -1) {  /* not a fake connection */
         log_ctx = c->log->data;
         log_ctx->current_request = r;
     }
diff --git a/src/ngx_http_lua_socket_tcp.c b/src/ngx_http_lua_socket_tcp.c
@@ -2689,7 +2689,7 @@ ngx_http_lua_socket_tcp_handler(ngx_event_t *ev)
     r = u->request;
     c = r->connection;
 
-    if (c->fd != -1) {  /* not a fake connection */
+    if (c->fd != (ngx_socket_t) -1) {  /* not a fake connection */
         ctx = c->log->data;
         ctx->current_request = r;
     }
diff --git a/src/ngx_http_lua_socket_udp.c b/src/ngx_http_lua_socket_udp.c
@@ -1299,7 +1299,7 @@ ngx_http_lua_socket_udp_handler(ngx_event_t *ev)
     r = u->request;
     c = r->connection;
 
-    if (c->fd != -1) {  /* not a fake connection */
+    if (c->fd != (ngx_socket_t) -1) {  /* not a fake connection */
         ctx = c->log->data;
         ctx->current_request = r;
     }
diff --git a/src/ngx_http_lua_util.c b/src/ngx_http_lua_util.c
@@ -926,7 +926,7 @@ ngx_http_lua_request_cleanup(ngx_http_lua_ctx_t *ctx, int forcible)
     lmcf = ngx_http_get_module_main_conf(r, ngx_http_lua_module);
 
 #if 1
-    if (r->connection->fd == -1) {
+    if (r->connection->fd == (ngx_socket_t) -1) {
         /* being a fake request */
         lmcf->running_timers--;
     }
@@ -1480,7 +1480,9 @@ ngx_http_lua_run_thread(lua_State *L, ngx_http_request_t *r,
 
 done:
 
-    if (ctx->entered_content_phase && r->connection->fd != -1) {
+    if (ctx->entered_content_phase
+        && r->connection->fd != (ngx_socket_t) -1)
+    {
         rc = ngx_http_lua_send_chain_link(r, ctx,
                                           NULL /* last_buf */);
 
@@ -3524,7 +3526,7 @@ ngx_http_lua_finalize_request(ngx_http_request_t *r, ngx_int_t rc)
         ngx_http_lua_cleanup_pending_operation(ctx->cur_co_ctx);
     }
 
-    if (r->connection->fd != -1) {
+    if (r->connection->fd != (ngx_socket_t) -1) {
         ngx_http_finalize_request(r, rc);
         return;
     }
diff --git a/src/ngx_http_lua_util.h b/src/ngx_http_lua_util.h
@@ -114,13 +114,13 @@ ngx_http_lua_ffi_check_context(ngx_http_lua_ctx_t *ctx, unsigned flags,
 
 
 #define ngx_http_lua_check_fake_request(L, r)                                \
-    if ((r)->connection->fd == -1) {                                         \
+    if ((r)->connection->fd == (ngx_socket_t) -1) {                          \
         return luaL_error(L, "API disabled in the current context");         \
     }
 
 
 #define ngx_http_lua_check_fake_request2(L, r, ctx)                          \
-    if ((r)->connection->fd == -1) {                                         \
+    if ((r)->connection->fd == (ngx_socket_t) -1) {                          \
         return luaL_error(L, "API disabled in the context of %s",            \
                           ngx_http_lua_context_name((ctx)->context));        \
     }
@@ -272,7 +272,7 @@ ngx_http_lua_create_ctx(ngx_http_request_t *r)
     ngx_http_set_ctx(r, ctx, ngx_http_lua_module);
 
     llcf = ngx_http_get_module_loc_conf(r, ngx_http_lua_module);
-    if (!llcf->enable_code_cache && r->connection->fd != -1) {
+    if (!llcf->enable_code_cache && r->connection->fd != (ngx_socket_t) -1) {
         lmcf = ngx_http_get_module_main_conf(r, ngx_http_lua_module);
 
         dd("lmcf: %p", lmcf);
diff --git a/src/ngx_http_lua_variable.c b/src/ngx_http_lua_variable.c
@@ -307,7 +307,7 @@ ngx_http_lua_ffi_var_get(ngx_http_request_t *r, u_char *name_data,
         return NGX_ERROR;
     }
 
-    if ((r)->connection->fd == -1) {
+    if ((r)->connection->fd == (ngx_socket_t) -1) {
         *err = "API disabled in the current context";
         return NGX_ERROR;
     }
@@ -377,7 +377,7 @@ ngx_http_lua_ffi_var_set(ngx_http_request_t *r, u_char *name_data,
         return NGX_ERROR;
     }
 
-    if ((r)->connection->fd == -1) {
+    if ((r)->connection->fd == (ngx_socket_t) -1) {
         ngx_snprintf(errbuf, errlen, "API disabled in the current context");
         return NGX_ERROR;
     }

Original file line number	Diff line number	Diff line change
`@@ -389,7 +389,7 @@ ngx_http_lua_ffi_req_get_uri_args_count(ngx_http_request_t *r, int max)`
`389`	`389`	`int count;`
`390`	`390`	`u_char p, last;`
`391`	`391`
`392`		`- if (r->connection->fd == -1) {`
	`392`	`+ if (r->connection->fd == (ngx_socket_t) -1) {`
`393`	`393`	`return NGX_HTTP_LUA_FFI_BAD_CONTEXT;`
`394`	`394`	`}`
`395`	`395`
Original file line number	Diff line number	Diff line change
`@@ -989,7 +989,7 @@ ngx_http_lua_ffi_req_get_headers_count(ngx_http_request_t *r, int max)`
`989`	`989`	`int count;`
`990`	`990`	`ngx_list_part_t *part;`
`991`	`991`
`992`		`- if (r->connection->fd == -1) {`
	`992`	`+ if (r->connection->fd == (ngx_socket_t) -1) {`
`993`	`993`	`return NGX_HTTP_LUA_FFI_BAD_CONTEXT;`
`994`	`994`	`}`
`995`	`995`
`@@ -1082,7 +1082,7 @@ ngx_http_lua_ffi_set_resp_header(ngx_http_request_t r, const u_char key_data,`
`1082`	`1082`	`return NGX_HTTP_LUA_FFI_NO_REQ_CTX;`
`1083`	`1083`	`}`
`1084`	`1084`
`1085`		`- if (r->connection->fd == -1) {`
	`1085`	`+ if (r->connection->fd == (ngx_socket_t) -1) {`
`1086`	`1086`	`return NGX_HTTP_LUA_FFI_BAD_CONTEXT;`
`1087`	`1087`	`}`
`1088`	`1088`
`@@ -1198,7 +1198,7 @@ ngx_http_lua_ffi_req_header_set_single_value(ngx_http_request_t *r,`
`1198`	`1198`	`ngx_str_t k;`
`1199`	`1199`	`ngx_str_t v;`
`1200`	`1200`
`1201`		`- if (r->connection->fd == -1) { /* fake request */`
	`1201`	`+ if (r->connection->fd == (ngx_socket_t) -1) { /* fake request */`
`1202`	`1202`	`return NGX_HTTP_LUA_FFI_BAD_CONTEXT;`
`1203`	`1203`	`}`
`1204`	`1204`
`@@ -1253,7 +1253,7 @@ ngx_http_lua_ffi_get_resp_header(ngx_http_request_t *r,`
`1253`	`1253`
`1254`	`1254`	`ngx_http_lua_loc_conf_t *llcf;`
`1255`	`1255`
`1256`		`- if (r->connection->fd == -1) {`
	`1256`	`+ if (r->connection->fd == (ngx_socket_t) -1) {`
`1257`	`1257`	`return NGX_HTTP_LUA_FFI_BAD_CONTEXT;`
`1258`	`1258`	`}`
`1259`	`1259`
Original file line number	Diff line number	Diff line change
`@@ -200,7 +200,7 @@ ngx_http_lua_ngx_set(lua_State *L)`
`200`	`200`	`int`
`201`	`201`	`ngx_http_lua_ffi_get_resp_status(ngx_http_request_t *r)`
`202`	`202`	`{`
`203`		`- if (r->connection->fd == -1) {`
	`203`	`+ if (r->connection->fd == (ngx_socket_t) -1) {`
`204`	`204`	`return NGX_HTTP_LUA_FFI_BAD_CONTEXT;`
`205`	`205`	`}`
`206`	`206`
`@@ -222,7 +222,7 @@ ngx_http_lua_ffi_get_resp_status(ngx_http_request_t *r)`
`222`	`222`	`int`
`223`	`223`	`ngx_http_lua_ffi_set_resp_status(ngx_http_request_t *r, int status)`
`224`	`224`	`{`
`225`		`- if (r->connection->fd == -1) {`
	`225`	`+ if (r->connection->fd == (ngx_socket_t) -1) {`
`226`	`226`	`return NGX_HTTP_LUA_FFI_BAD_CONTEXT;`
`227`	`227`	`}`
`228`	`228`
`@@ -254,7 +254,7 @@ ngx_http_lua_ffi_set_resp_status(ngx_http_request_t *r, int status)`
`254`	`254`	`int`
`255`	`255`	`ngx_http_lua_ffi_is_subrequest(ngx_http_request_t *r)`
`256`	`256`	`{`
`257`		`- if (r->connection->fd == -1) {`
	`257`	`+ if (r->connection->fd == (ngx_socket_t) -1) {`
`258`	`258`	`return NGX_HTTP_LUA_FFI_BAD_CONTEXT;`
`259`	`259`	`}`
`260`	`260`
`@@ -272,7 +272,7 @@ ngx_http_lua_ffi_headers_sent(ngx_http_request_t *r)`
`272`	`272`	`return NGX_HTTP_LUA_FFI_NO_REQ_CTX;`
`273`	`273`	`}`
`274`	`274`
`275`		`- if (r->connection->fd == -1) {`
	`275`	`+ if (r->connection->fd == (ngx_socket_t) -1) {`
`276`	`276`	`return NGX_HTTP_LUA_FFI_BAD_CONTEXT;`
`277`	`277`	`}`
`278`	`278`
Original file line number	Diff line number	Diff line change
`@@ -149,7 +149,7 @@ ngx_http_lua_ngx_req_set_method(lua_State *L)`
`149`	`149`	`int`
`150`	`150`	`ngx_http_lua_ffi_req_get_method(ngx_http_request_t *r)`
`151`	`151`	`{`
`152`		`- if (r->connection->fd == -1) {`
	`152`	`+ if (r->connection->fd == (ngx_socket_t) -1) {`
`153`	`153`	`return NGX_HTTP_LUA_FFI_BAD_CONTEXT;`
`154`	`154`	`}`
`155`	`155`
`@@ -161,7 +161,7 @@ int`
`161`	`161`	`ngx_http_lua_ffi_req_get_method_name(ngx_http_request_t r, char buf,`
`162`	`162`	`size_t *len)`
`163`	`163`	`{`
`164`		`- if (r->connection->fd == -1) {`
	`164`	`+ if (r->connection->fd == (ngx_socket_t) -1) {`
`165`	`165`	`return NGX_HTTP_LUA_FFI_BAD_CONTEXT;`
`166`	`166`	`}`
`167`	`167`
`@@ -174,7 +174,7 @@ ngx_http_lua_ffi_req_get_method_name(ngx_http_request_t r, char buf,`
`174`	`174`	`int`
`175`	`175`	`ngx_http_lua_ffi_req_set_method(ngx_http_request_t *r, int method)`
`176`	`176`	`{`
`177`		`- if (r->connection->fd == -1) {`
	`177`	`+ if (r->connection->fd == (ngx_socket_t) -1) {`
`178`	`178`	`return NGX_HTTP_LUA_FFI_BAD_CONTEXT;`
`179`	`179`	`}`
`180`	`180`
Original file line number	Diff line number	Diff line change
`@@ -102,7 +102,7 @@ ngx_http_lua_sleep_handler(ngx_event_t *ev)`
`102`	`102`	`return;`
`103`	`103`	`}`
`104`	`104`
`105`		`- if (c->fd != -1) { /* not a fake connection */`
	`105`	`+ if (c->fd != (ngx_socket_t) -1) { /* not a fake connection */`
`106`	`106`	`log_ctx = c->log->data;`
`107`	`107`	`log_ctx->current_request = r;`
`108`	`108`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2689,7 +2689,7 @@ ngx_http_lua_socket_tcp_handler(ngx_event_t *ev)`
`2689`	`2689`	`r = u->request;`
`2690`	`2690`	`c = r->connection;`
`2691`	`2691`
`2692`		`- if (c->fd != -1) { /* not a fake connection */`
	`2692`	`+ if (c->fd != (ngx_socket_t) -1) { /* not a fake connection */`
`2693`	`2693`	`ctx = c->log->data;`
`2694`	`2694`	`ctx->current_request = r;`
`2695`	`2695`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1299,7 +1299,7 @@ ngx_http_lua_socket_udp_handler(ngx_event_t *ev)`
`1299`	`1299`	`r = u->request;`
`1300`	`1300`	`c = r->connection;`
`1301`	`1301`
`1302`		`- if (c->fd != -1) { /* not a fake connection */`
	`1302`	`+ if (c->fd != (ngx_socket_t) -1) { /* not a fake connection */`
`1303`	`1303`	`ctx = c->log->data;`
`1304`	`1304`	`ctx->current_request = r;`
`1305`	`1305`	`}`
Original file line number	Diff line number	Diff line change
`@@ -307,7 +307,7 @@ ngx_http_lua_ffi_var_get(ngx_http_request_t r, u_char name_data,`
`307`	`307`	`return NGX_ERROR;`
`308`	`308`	`}`
`309`	`309`
`310`		`- if ((r)->connection->fd == -1) {`
	`310`	`+ if ((r)->connection->fd == (ngx_socket_t) -1) {`
`311`	`311`	`*err = "API disabled in the current context";`
`312`	`312`	`return NGX_ERROR;`
`313`	`313`	`}`
`@@ -377,7 +377,7 @@ ngx_http_lua_ffi_var_set(ngx_http_request_t r, u_char name_data,`
`377`	`377`	`return NGX_ERROR;`
`378`	`378`	`}`
`379`	`379`
`380`		`- if ((r)->connection->fd == -1) {`
	`380`	`+ if ((r)->connection->fd == (ngx_socket_t) -1) {`
`381`	`381`	`ngx_snprintf(errbuf, errlen, "API disabled in the current context");`
`382`	`382`	`return NGX_ERROR;`
`383`	`383`	`}`