Deleted
Added
nxt_application.c (678:f05d36cbe461) | nxt_application.c (703:2d536dde84d2) |
---|---|
1 2/* 3 * Copyright (C) Max Romanov 4 * Copyright (C) Igor Sysoev 5 * Copyright (C) Valentin V. Bartenev 6 * Copyright (C) NGINX, Inc. 7 */ 8 --- 124 unchanged lines hidden (view full) --- 133 name = glb.gl_pathv[i]; 134 135 ret = nxt_discovery_module(task, mp, modules, name); 136 if (ret != NXT_OK) { 137 goto fail; 138 } 139 } 140 | 1 2/* 3 * Copyright (C) Max Romanov 4 * Copyright (C) Igor Sysoev 5 * Copyright (C) Valentin V. Bartenev 6 * Copyright (C) NGINX, Inc. 7 */ 8 --- 124 unchanged lines hidden (view full) --- 133 name = glb.gl_pathv[i]; 134 135 ret = nxt_discovery_module(task, mp, modules, name); 136 if (ret != NXT_OK) { 137 goto fail; 138 } 139 } 140 |
141 size = sizeof("[]") - 1; | 141 size = nxt_length("[]"); |
142 module = modules->elts; 143 n = modules->nelts; 144 145 for (i = 0; i < n; i++) { 146 nxt_debug(task, "module: %d %V %V", 147 module[i].type, &module[i].version, &module[i].file); 148 | 142 module = modules->elts; 143 n = modules->nelts; 144 145 for (i = 0; i < n; i++) { 146 nxt_debug(task, "module: %d %V %V", 147 module[i].type, &module[i].version, &module[i].file); 148 |
149 size += sizeof("{\"type\": ,") - 1; 150 size += sizeof(" \"version\": \"\",") - 1; 151 size += sizeof(" \"file\": \"\"},") - 1; | 149 size += nxt_length("{\"type\": ,"); 150 size += nxt_length(" \"version\": \"\","); 151 size += nxt_length(" \"file\": \"\"},"); |
152 153 size += NXT_INT_T_LEN 154 + module[i].version.length 155 + module[i].file.length; 156 } 157 158 b = nxt_buf_mem_alloc(mp, size, 0); 159 if (b == NULL) { --- 787 unchanged lines hidden --- | 152 153 size += NXT_INT_T_LEN 154 + module[i].version.length 155 + module[i].file.length; 156 } 157 158 b = nxt_buf_mem_alloc(mp, size, 0); 159 if (b == NULL) { --- 787 unchanged lines hidden --- |