Mercurial > hg > nginx
comparison src/event/ngx_event.c @ 2091:9f15e5f8ff9e stable-0.6
r2007, r2025, r2042 merge:
style fixes
author | Igor Sysoev <igor@sysoev.ru> |
---|---|
date | Mon, 07 Jul 2008 10:18:41 +0000 |
parents | e584e946e198 |
children | 90312b616162 |
comparison
equal
deleted
inserted
replaced
2090:72b09c4dd8f7 | 2091:9f15e5f8ff9e |
---|---|
940 ngx_event_conf_t *ecf = conf; | 940 ngx_event_conf_t *ecf = conf; |
941 | 941 |
942 ngx_str_t *value; | 942 ngx_str_t *value; |
943 | 943 |
944 if (ecf->connections != NGX_CONF_UNSET_UINT) { | 944 if (ecf->connections != NGX_CONF_UNSET_UINT) { |
945 return "is duplicate" ; | 945 return "is duplicate"; |
946 } | 946 } |
947 | 947 |
948 if (ngx_strcmp(cmd->name.data, "connections") == 0) { | 948 if (ngx_strcmp(cmd->name.data, "connections") == 0) { |
949 ngx_conf_log_error(NGX_LOG_WARN, cf, 0, | 949 ngx_conf_log_error(NGX_LOG_WARN, cf, 0, |
950 "the \"connections\" directive is deprecated, " | 950 "the \"connections\" directive is deprecated, " |
975 ngx_str_t *value; | 975 ngx_str_t *value; |
976 ngx_event_conf_t *old_ecf; | 976 ngx_event_conf_t *old_ecf; |
977 ngx_event_module_t *module; | 977 ngx_event_module_t *module; |
978 | 978 |
979 if (ecf->use != NGX_CONF_UNSET_UINT) { | 979 if (ecf->use != NGX_CONF_UNSET_UINT) { |
980 return "is duplicate" ; | 980 return "is duplicate"; |
981 } | 981 } |
982 | 982 |
983 value = cf->args->elts; | 983 value = cf->args->elts; |
984 | 984 |
985 if (cf->cycle->old_cycle->conf_ctx) { | 985 if (cf->cycle->old_cycle->conf_ctx) { |