Fijxu
/
nginx-quic
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

r2007, r2025, r2042 merge: 

style fixes
This commit is contained in:
Igor Sysoev 2008-07-07 10:18:41 +00:00
parent 9657de8e13
commit f8f26bfe3f
14 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/core/nginx.c
View File

@ -1078,7 +1078,7 @@ ngx_set_cpu_affinity(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
"invalid character \"%c\" in \"worker_cpu_affinity\"",
ch);
return NGX_CONF_ERROR ;
return NGX_CONF_ERROR;
}
}

2
src/core/ngx_connection.c
View File

@ -229,7 +229,7 @@ ngx_open_listening_sockets(ngx_cycle_t *cycle)
/* TODO: configurable try number */
for (tries = 5 ; tries; tries--) {
for (tries = 5; tries; tries--) {
failed = 0;
/* for each listening socket */

12
src/core/ngx_open_file_cache.c
View File

@ -413,13 +413,13 @@ failed:
if (file->count == 0) {
if (file->fd != NGX_INVALID_FILE) {
if (ngx_close_file(file->fd) == NGX_FILE_ERROR) {
ngx_log_error(NGX_LOG_ALERT, pool->log, ngx_errno,
ngx_close_file_n " \"%s\" failed",
if (file->fd != NGX_INVALID_FILE) {
if (ngx_close_file(file->fd) == NGX_FILE_ERROR) {
ngx_log_error(NGX_LOG_ALERT, pool->log, ngx_errno,
ngx_close_file_n " \"%s\" failed",
file->name);
}
}
}
}
ngx_free(file->name);
ngx_free(file);

2
src/core/ngx_resolver.c
View File

@ -202,7 +202,7 @@ ngx_resolver_cleanup_tree(ngx_resolver_t *r, ngx_rbtree_t *tree)
ngx_queue_remove(&rn->queue);
for (ctx = rn->waiting; ctx; ctx = next) {
next = ctx->next;
next = ctx->next;
if (ctx->event) {
ngx_resolver_free(r, ctx->event);

2
src/event/modules/ngx_kqueue_module.c
View File

@ -446,7 +446,7 @@ ngx_kqueue_set_event(ngx_event_t *ev, ngx_int_t filter, ngx_uint_t flags)
|| __FreeBSD_version >= 500018
|NOTE_REVOKE
#endif
;
;
kev->data = 0;
} else {

4
src/event/ngx_event.c
View File

@ -942,7 +942,7 @@ ngx_event_connections(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
ngx_str_t *value;
if (ecf->connections != NGX_CONF_UNSET_UINT) {
return "is duplicate" ;
return "is duplicate";
}
if (ngx_strcmp(cmd->name.data, "connections") == 0) {
@ -977,7 +977,7 @@ ngx_event_use(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
ngx_event_module_t *module;
if (ecf->use != NGX_CONF_UNSET_UINT) {
return "is duplicate" ;
return "is duplicate";
}
value = cf->args->elts;

2
src/event/ngx_event_pipe.c
View File

@ -880,7 +880,7 @@ ngx_event_pipe_free_shadow_raw_buf(ngx_chain_t **free, ngx_buf_t *buf)
ll = free;
for (cl = *free ; cl; cl = cl->next) {
for (cl = *free; cl; cl = cl->next) {
if (cl->buf == s) {
*ll = cl->next;
break;

2
src/http/modules/ngx_http_proxy_module.c
View File

@ -1224,7 +1224,7 @@ ngx_http_proxy_process_header(ngx_http_request_t *r)
umcf = ngx_http_get_module_main_conf(r, ngx_http_upstream_module);
for ( ;; ) {
for ( ;; ) {
rc = ngx_http_parse_header_line(r, &r->upstream->buffer);

6
src/http/modules/ngx_http_ssi_filter_module.c
View File

@ -100,7 +100,7 @@ static ngx_int_t ngx_http_ssi_endblock(ngx_http_request_t *r,
ngx_http_ssi_ctx_t *ctx, ngx_str_t **params);
static ngx_int_t ngx_http_ssi_date_gmt_local_variable(ngx_http_request_t *r,
ngx_http_variable_value_t *v, uintptr_t gmt);
ngx_http_variable_value_t *v, uintptr_t gmt);
static char *ngx_http_ssi_types(ngx_conf_t *cf, ngx_command_t *cmd, void *conf);
@ -1637,7 +1637,7 @@ ngx_http_ssi_evaluate_string(ngx_http_request_t *r, ngx_http_ssi_ctx_t *ctx,
quoted = 0;
for (i = 0 ; i < text->len; i++) {
for (i = 0; i < text->len; i++) {
ch = text->data[i];
if (!quoted) {
@ -2647,7 +2647,7 @@ ngx_http_ssi_endblock(ngx_http_request_t *r, ngx_http_ssi_ctx_t *ctx,
static ngx_int_t
ngx_http_ssi_date_gmt_local_variable(ngx_http_request_t *r,
ngx_http_variable_value_t *v, uintptr_t gmt)
ngx_http_variable_value_t *v, uintptr_t gmt)
{
ngx_http_ssi_ctx_t *ctx;
ngx_time_t *tp;

2
src/http/ngx_http_core_module.c
View File

@ -2922,7 +2922,7 @@ ngx_http_core_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child)
return NGX_CONF_ERROR;
}
}
conf->resolver = prev->resolver;
}

6
src/http/ngx_http_core_module.h
View File

@ -255,10 +255,10 @@ struct ngx_http_core_loc_conf_s {
ngx_array_t *locations;
/* pointer to the modules' loc_conf */
void **loc_conf ;
void **loc_conf;
uint32_t limit_except;
void **limit_except_loc_conf ;
void **limit_except_loc_conf;
ngx_http_handler_pt handler;
@ -401,7 +401,7 @@ extern ngx_uint_t ngx_http_max_module;
\
r->allow_ranges = 0; \
if (r->headers_out.accept_ranges) { \
r->headers_out.accept_ranges->hash = 0 ; \
r->headers_out.accept_ranges->hash = 0; \
r->headers_out.accept_ranges = NULL; \
}

2
src/http/ngx_http_header_filter_module.c
View File

@ -537,7 +537,7 @@ ngx_http_header_filter(ngx_http_request_t *r)
}
b->last = ngx_copy(b->last, header[i].key.data, header[i].key.len);
*b->last++ = ':' ; *b->last++ = ' ' ;
*b->last++ = ':'; *b->last++ = ' ';
b->last = ngx_copy(b->last, header[i].value.data, header[i].value.len);
*b->last++ = CR; *b->last++ = LF;

4
src/http/ngx_http_special_response.c
View File

@ -619,7 +619,7 @@ ngx_http_send_special_response(ngx_http_request_t *r,
b->last = tail + len;
out[1].buf = b;
out[1].next = NULL;;
out[1].next = NULL;
if (msie_padding) {
b = ngx_calloc_buf(r->pool);
@ -633,7 +633,7 @@ ngx_http_send_special_response(ngx_http_request_t *r,
out[1].next = &out[2];
out[2].buf = b;
out[2].next = NULL;;
out[2].next = NULL;
}
if (r == r->main) {

2
src/os/unix/ngx_posix_config.h
View File

@ -110,7 +110,7 @@
#include <sys/param.h> /* ALIGN() */
/*
/*
* FreeBSD 3.x has no CMSG_SPACE() and CMSG_LEN() and has the broken CMSG_DATA()
*/