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

small optimization: " == NGX_ERROR" > " != NGX_OK"

Browse Source
This commit is contained in:
Igor Sysoev 2009-02-24 10:42:23 +00:00
parent 9b4a1d0094
commit 1f4220ee86
17 changed files with 42 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/core/nginx.c
View File

@ -388,7 +388,7 @@ ngx_add_inherited_sockets(ngx_cycle_t *cycle)
if (ngx_array_init(&cycle->listening, cycle->pool, 10,
sizeof(ngx_listening_t))
== NGX_ERROR)
!= NGX_OK)
{
return NGX_ERROR;
}
@ -838,7 +838,7 @@ ngx_core_module_init_conf(ngx_cycle_t *cycle, void *conf)
ccf->pid.data = (u_char *) NGX_PID_PATH;
}
if (ngx_conf_full_name(cycle, &ccf->pid, 0) == NGX_ERROR) {
if (ngx_conf_full_name(cycle, &ccf->pid, 0) != NGX_OK) {
return NGX_CONF_ERROR;
}
@ -858,7 +858,7 @@ ngx_core_module_init_conf(ngx_cycle_t *cycle, void *conf)
ccf->lock_file.data = (u_char *) NGX_LOCK_PATH;
}
if (ngx_conf_full_name(cycle, &ccf->lock_file, 0) == NGX_ERROR) {
if (ngx_conf_full_name(cycle, &ccf->lock_file, 0) != NGX_OK) {
return NGX_CONF_ERROR;
}

4
src/core/ngx_conf_file.c
View File

@ -741,7 +741,7 @@ ngx_conf_include(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
ngx_log_debug1(NGX_LOG_DEBUG_CORE, cf->log, 0, "include %s", file.data);
if (ngx_conf_full_name(cf->cycle, &file, 1) == NGX_ERROR) {
if (ngx_conf_full_name(cf->cycle, &file, 1) != NGX_OK) {
return NGX_CONF_ERROR;
}
@ -854,7 +854,7 @@ ngx_conf_open_file(ngx_cycle_t *cycle, ngx_str_t *name)
if (name) {
full = *name;
if (ngx_conf_full_name(cycle, &full, 0) == NGX_ERROR) {
if (ngx_conf_full_name(cycle, &full, 0) != NGX_OK) {
return NULL;
}

4
src/core/ngx_cycle.c
View File

@ -136,7 +136,7 @@ ngx_init_cycle(ngx_cycle_t *old_cycle)
}
if (ngx_list_init(&cycle->open_files, pool, n, sizeof(ngx_open_file_t))
== NGX_ERROR)
!= NGX_OK)
{
ngx_destroy_pool(pool);
return NULL;
@ -155,7 +155,7 @@ ngx_init_cycle(ngx_cycle_t *old_cycle)
}
if (ngx_list_init(&cycle->shared_memory, pool, n, sizeof(ngx_shm_zone_t))
== NGX_ERROR)
!= NGX_OK)
{
ngx_destroy_pool(pool);
return NULL;

2
src/core/ngx_file.c
View File

@ -259,7 +259,7 @@ ngx_conf_set_path_slot(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
path->name.len--;
}
if (ngx_conf_full_name(cf->cycle, &path->name, 0) == NGX_ERROR) {
if (ngx_conf_full_name(cf->cycle, &path->name, 0) != NGX_OK) {
return NULL;
}

2
src/core/ngx_log.c
View File

@ -329,7 +329,7 @@ ngx_set_error_log(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
cf->cycle->new_log->file->name = value[1];
if (ngx_conf_full_name(cf->cycle, &cf->cycle->new_log->file->name, 0)
== NGX_ERROR)
!= NGX_OK)
{
return NGX_CONF_ERROR;
}

8
src/event/ngx_event_openssl.c
View File

@ -189,7 +189,7 @@ ngx_int_t
ngx_ssl_certificate(ngx_conf_t *cf, ngx_ssl_t *ssl, ngx_str_t *cert,
ngx_str_t *key)
{
if (ngx_conf_full_name(cf->cycle, cert, 1) == NGX_ERROR) {
if (ngx_conf_full_name(cf->cycle, cert, 1) != NGX_OK) {
return NGX_ERROR;
}
@ -202,7 +202,7 @@ ngx_ssl_certificate(ngx_conf_t *cf, ngx_ssl_t *ssl, ngx_str_t *cert,
return NGX_ERROR;
}
if (ngx_conf_full_name(cf->cycle, key, 1) == NGX_ERROR) {
if (ngx_conf_full_name(cf->cycle, key, 1) != NGX_OK) {
return NGX_ERROR;
}
@ -233,7 +233,7 @@ ngx_ssl_client_certificate(ngx_conf_t *cf, ngx_ssl_t *ssl, ngx_str_t *cert,
return NGX_OK;
}
if (ngx_conf_full_name(cf->cycle, cert, 1) == NGX_ERROR) {
if (ngx_conf_full_name(cf->cycle, cert, 1) != NGX_OK) {
return NGX_ERROR;
}
@ -391,7 +391,7 @@ ngx_ssl_dhparam(ngx_conf_t *cf, ngx_ssl_t *ssl, ngx_str_t *file)
return NGX_OK;
}
if (ngx_conf_full_name(cf->cycle, file, 1) == NGX_ERROR) {
if (ngx_conf_full_name(cf->cycle, file, 1) != NGX_OK) {
return NGX_ERROR;
}

8
src/http/modules/ngx_http_charset_filter_module.c
View File

@ -1421,19 +1421,21 @@ ngx_http_charset_create_main_conf(ngx_conf_t *cf)
}
if (ngx_array_init(&mcf->charsets, cf->pool, 2, sizeof(ngx_http_charset_t))
== NGX_ERROR)
!= NGX_OK)
{
return NGX_CONF_ERROR;
}
if (ngx_array_init(&mcf->tables, cf->pool, 1,
sizeof(ngx_http_charset_tables_t)) == NGX_ERROR)
sizeof(ngx_http_charset_tables_t))
!= NGX_OK)
{
return NGX_CONF_ERROR;
}
if (ngx_array_init(&mcf->recodes, cf->pool, 2,
sizeof(ngx_http_charset_recode_t)) == NGX_ERROR)
sizeof(ngx_http_charset_recode_t))
!= NGX_OK)
{
return NGX_CONF_ERROR;
}

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

@ -327,7 +327,7 @@ ngx_http_gzip_body_filter(ngx_http_request_t *r, ngx_chain_t *in)
}
if (in) {
if (ngx_chain_add_copy(r->pool, &ctx->in, in) == NGX_ERROR) {
if (ngx_chain_add_copy(r->pool, &ctx->in, in) != NGX_OK) {
goto failed;
}
}

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

@ -863,7 +863,7 @@ ngx_http_log_set_log(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
}
} else {
if (ngx_conf_full_name(cf->cycle, &value[1], 0) == NGX_ERROR) {
if (ngx_conf_full_name(cf->cycle, &value[1], 0) != NGX_OK) {
return NGX_CONF_ERROR;
}

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

@ -374,7 +374,7 @@ ngx_http_map(ngx_conf_t *cf, ngx_command_t *dummy, void *conf)
if (ngx_strcmp(value[0].data, "include") == 0) {
file = value[1];
if (ngx_conf_full_name(cf->cycle, &file, 1) == NGX_ERROR){
if (ngx_conf_full_name(cf->cycle, &file, 1) != NGX_OK){
return NGX_CONF_ERROR;
}

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

@ -187,7 +187,7 @@ ngx_http_range_header_filter(ngx_http_request_t *r)
}
if (ngx_array_init(&ctx->ranges, r->pool, 1, sizeof(ngx_http_range_t))
== NGX_ERROR)
!= NGX_OK)
{
return NGX_ERROR;
}

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

@ -397,7 +397,7 @@ ngx_http_ssi_body_filter(ngx_http_request_t *r, ngx_chain_t *in)
/* add the incoming chain to the chain ctx->in */
if (in) {
if (ngx_chain_add_copy(r->pool, &ctx->in, in) == NGX_ERROR) {
if (ngx_chain_add_copy(r->pool, &ctx->in, in) != NGX_OK) {
return NGX_ERROR;
}
}
@ -2060,7 +2060,7 @@ ngx_http_ssi_stub_output(ngx_http_request_t *r, void *data, ngx_int_t rc)
out = data;
if (!r->header_sent) {
if (ngx_http_set_content_type(r) == NGX_ERROR) {
if (ngx_http_set_content_type(r) != NGX_OK) {
return NGX_ERROR;
}

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

@ -204,7 +204,7 @@ ngx_http_sub_body_filter(ngx_http_request_t *r, ngx_chain_t *in)
/* add the incoming chain to the chain ctx->in */
if (in) {
if (ngx_chain_add_copy(r->pool, &ctx->in, in) == NGX_ERROR) {
if (ngx_chain_add_copy(r->pool, &ctx->in, in) != NGX_OK) {
return NGX_ERROR;
}
}

17
src/http/ngx_http_core_module.c
View File

@ -1555,7 +1555,7 @@ ngx_http_set_content_type(ngx_http_request_t *r)
exten = ngx_pnalloc(r->pool, r->exten.len);
if (exten == NULL) {
return NGX_HTTP_INTERNAL_SERVER_ERROR;
return NGX_ERROR;
}
hash = ngx_hash_strlow(exten, r->exten.data, r->exten.len);
@ -1684,8 +1684,7 @@ ngx_http_map_uri_to_path(ngx_http_request_t *r, ngx_str_t *path,
return NULL;
}
if (ngx_conf_full_name((ngx_cycle_t *) ngx_cycle, path, 0)== NGX_ERROR)
{
if (ngx_conf_full_name((ngx_cycle_t *) ngx_cycle, path, 0) != NGX_OK) {
return NULL;
}
@ -2006,7 +2005,7 @@ ngx_http_subrequest(ngx_http_request_t *r,
if (ngx_list_init(&sr->headers_out.headers, r->pool, 20,
sizeof(ngx_table_elt_t))
== NGX_ERROR)
!= NGX_OK)
{
return NGX_ERROR;
}
@ -2594,7 +2593,7 @@ ngx_http_core_type(ngx_conf_t *cf, ngx_command_t *dummy, void *conf)
if (ngx_strcmp(value[0].data, "include") == 0) {
file = value[1];
if (ngx_conf_full_name(cf->cycle, &file, 1) == NGX_ERROR){
if (ngx_conf_full_name(cf->cycle, &file, 1) != NGX_OK) {
return NGX_CONF_ERROR;
}
@ -2728,14 +2727,14 @@ ngx_http_core_create_srv_conf(ngx_conf_t *cf)
if (ngx_array_init(&cscf->listen, cf->temp_pool, 4,
sizeof(ngx_http_listen_t))
== NGX_ERROR)
!= NGX_OK)
{
return NGX_CONF_ERROR;
}
if (ngx_array_init(&cscf->server_names, cf->temp_pool, 4,
sizeof(ngx_http_server_name_t))
== NGX_ERROR)
!= NGX_OK)
{
return NGX_CONF_ERROR;
}
@ -2954,7 +2953,7 @@ ngx_http_core_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child)
conf->root.len = sizeof("html") - 1;
conf->root.data = (u_char *) "html";
if (ngx_conf_full_name(cf->cycle, &conf->root, 0) == NGX_ERROR) {
if (ngx_conf_full_name(cf->cycle, &conf->root, 0) != NGX_OK) {
return NGX_CONF_ERROR;
}
}
@ -3526,7 +3525,7 @@ ngx_http_core_root(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
}
if (lcf->root.data[0] != '$') {
if (ngx_conf_full_name(cf->cycle, &lcf->root, 0) == NGX_ERROR) {
if (ngx_conf_full_name(cf->cycle, &lcf->root, 0) != NGX_OK) {
return NGX_CONF_ERROR;
}
}

8
src/http/ngx_http_request.c
View File

@ -404,7 +404,7 @@ ngx_http_init_request(ngx_event_t *rev)
}
if (ngx_ssl_create_connection(&sscf->ssl, c, NGX_SSL_BUFFER)
== NGX_ERROR)
!= NGX_OK)
{
ngx_http_close_connection(c);
return;
@ -447,7 +447,7 @@ ngx_http_init_request(ngx_event_t *rev)
if (ngx_list_init(&r->headers_out.headers, r->pool, 20,
sizeof(ngx_table_elt_t))
== NGX_ERROR)
!= NGX_OK)
{
ngx_http_close_request(r, NGX_HTTP_INTERNAL_SERVER_ERROR);
return;
@ -807,7 +807,7 @@ ngx_http_process_request_line(ngx_event_t *rev)
if (ngx_list_init(&r->headers_in.headers, r->pool, 20,
sizeof(ngx_table_elt_t))
== NGX_ERROR)
!= NGX_OK)
{
ngx_http_close_request(r, NGX_HTTP_INTERNAL_SERVER_ERROR);
return;
@ -816,7 +816,7 @@ ngx_http_process_request_line(ngx_event_t *rev)
if (ngx_array_init(&r->headers_in.cookies, r->pool, 2,
sizeof(ngx_table_elt_t *))
== NGX_ERROR)
!= NGX_OK)
{
ngx_http_close_request(r, NGX_HTTP_INTERNAL_SERVER_ERROR);
return;

2
src/http/ngx_http_upstream.c
View File

@ -860,7 +860,7 @@ ngx_http_upstream_ssl_init_connection(ngx_http_request_t *r,
if (ngx_ssl_create_connection(u->conf->ssl, c,
NGX_SSL_BUFFER|NGX_SSL_CLIENT)
== NGX_ERROR)
!= NGX_OK)
{
ngx_http_upstream_finalize_request(r, u,
NGX_HTTP_INTERNAL_SERVER_ERROR);

11
src/http/ngx_http_variables.c
View File

@ -332,7 +332,8 @@ ngx_http_get_variable_index(ngx_conf_t *cf, ngx_str_t *name)
if (v == NULL) {
if (ngx_array_init(&cmcf->variables, cf->pool, 4,
sizeof(ngx_http_variable_t)) == NGX_ERROR)
sizeof(ngx_http_variable_t))
!= NGX_OK)
{
return NGX_ERROR;
}
@ -1072,9 +1073,7 @@ ngx_http_variable_document_root(ngx_http_request_t *r,
return NGX_ERROR;
}
if (ngx_conf_full_name((ngx_cycle_t *) ngx_cycle, &path, 0)
== NGX_ERROR)
{
if (ngx_conf_full_name((ngx_cycle_t *) ngx_cycle, &path, 0) != NGX_OK) {
return NGX_ERROR;
}
@ -1113,9 +1112,7 @@ ngx_http_variable_realpath_root(ngx_http_request_t *r,
path.data[path.len - 1] = '\0';
if (ngx_conf_full_name((ngx_cycle_t *) ngx_cycle, &path, 0)
== NGX_ERROR)
{
if (ngx_conf_full_name((ngx_cycle_t *) ngx_cycle, &path, 0) != NGX_OK) {
return NGX_ERROR;
}
}