Mercurial > hg > nginx
comparison src/core/ngx_cycle.c @ 6946:99c87770b81b
Use ngx_array_init() to initialize arrays.
author | Ruslan Ermilov <ru@nginx.com> |
---|---|
date | Tue, 28 Mar 2017 11:28:42 +0300 |
parents | 97c99bb43737 |
children | d48c8cdac201 |
comparison
equal
deleted
inserted
replaced
6945:6e1a0a0d5f04 | 6946:99c87770b81b |
---|---|
113 } | 113 } |
114 | 114 |
115 | 115 |
116 n = old_cycle->paths.nelts ? old_cycle->paths.nelts : 10; | 116 n = old_cycle->paths.nelts ? old_cycle->paths.nelts : 10; |
117 | 117 |
118 cycle->paths.elts = ngx_pcalloc(pool, n * sizeof(ngx_path_t *)); | 118 if (ngx_array_init(&cycle->paths, pool, n, sizeof(ngx_path_t *)) |
119 if (cycle->paths.elts == NULL) { | 119 != NGX_OK) |
120 ngx_destroy_pool(pool); | 120 { |
121 return NULL; | 121 ngx_destroy_pool(pool); |
122 } | 122 return NULL; |
123 | 123 } |
124 cycle->paths.nelts = 0; | 124 |
125 cycle->paths.size = sizeof(ngx_path_t *); | 125 ngx_memzero(cycle->paths.elts, n * sizeof(ngx_path_t *)); |
126 cycle->paths.nalloc = n; | |
127 cycle->paths.pool = pool; | |
128 | 126 |
129 | 127 |
130 if (ngx_array_init(&cycle->config_dump, pool, 1, sizeof(ngx_conf_dump_t)) | 128 if (ngx_array_init(&cycle->config_dump, pool, 1, sizeof(ngx_conf_dump_t)) |
131 != NGX_OK) | 129 != NGX_OK) |
132 { | 130 { |
173 return NULL; | 171 return NULL; |
174 } | 172 } |
175 | 173 |
176 n = old_cycle->listening.nelts ? old_cycle->listening.nelts : 10; | 174 n = old_cycle->listening.nelts ? old_cycle->listening.nelts : 10; |
177 | 175 |
178 cycle->listening.elts = ngx_pcalloc(pool, n * sizeof(ngx_listening_t)); | 176 if (ngx_array_init(&cycle->listening, pool, n, sizeof(ngx_listening_t)) |
179 if (cycle->listening.elts == NULL) { | 177 != NGX_OK) |
180 ngx_destroy_pool(pool); | 178 { |
181 return NULL; | 179 ngx_destroy_pool(pool); |
182 } | 180 return NULL; |
183 | 181 } |
184 cycle->listening.nelts = 0; | 182 |
185 cycle->listening.size = sizeof(ngx_listening_t); | 183 ngx_memzero(cycle->listening.elts, n * sizeof(ngx_listening_t)); |
186 cycle->listening.nalloc = n; | |
187 cycle->listening.pool = pool; | |
188 | 184 |
189 | 185 |
190 ngx_queue_init(&cycle->reusable_connections_queue); | 186 ngx_queue_init(&cycle->reusable_connections_queue); |
191 | 187 |
192 | 188 |
766 "could not create ngx_temp_pool"); | 762 "could not create ngx_temp_pool"); |
767 exit(1); | 763 exit(1); |
768 } | 764 } |
769 | 765 |
770 n = 10; | 766 n = 10; |
771 ngx_old_cycles.elts = ngx_pcalloc(ngx_temp_pool, | 767 |
772 n * sizeof(ngx_cycle_t *)); | 768 if (ngx_array_init(&ngx_old_cycles, ngx_temp_pool, n, |
773 if (ngx_old_cycles.elts == NULL) { | 769 sizeof(ngx_cycle_t *)) |
770 != NGX_OK) | |
771 { | |
774 exit(1); | 772 exit(1); |
775 } | 773 } |
776 ngx_old_cycles.nelts = 0; | 774 |
777 ngx_old_cycles.size = sizeof(ngx_cycle_t *); | 775 ngx_memzero(ngx_old_cycles.elts, n * sizeof(ngx_cycle_t *)); |
778 ngx_old_cycles.nalloc = n; | |
779 ngx_old_cycles.pool = ngx_temp_pool; | |
780 | 776 |
781 ngx_cleaner_event.handler = ngx_clean_old_cycles; | 777 ngx_cleaner_event.handler = ngx_clean_old_cycles; |
782 ngx_cleaner_event.log = cycle->log; | 778 ngx_cleaner_event.log = cycle->log; |
783 ngx_cleaner_event.data = &dumb; | 779 ngx_cleaner_event.data = &dumb; |
784 dumb.fd = (ngx_socket_t) -1; | 780 dumb.fd = (ngx_socket_t) -1; |