Mercurial > hg > nginx
comparison src/core/ngx_string.c @ 3515:76d252724db5
use ngx_min() and ngx_max()
author | Igor Sysoev <igor@sysoev.ru> |
---|---|
date | Fri, 14 May 2010 09:55:33 +0000 |
parents | 098100f5f54b |
children | 6802ba529ec4 |
comparison
equal
deleted
inserted
replaced
3514:58865853f29b | 3515:76d252724db5 |
---|---|
227 switch (*fmt) { | 227 switch (*fmt) { |
228 | 228 |
229 case 'V': | 229 case 'V': |
230 v = va_arg(args, ngx_str_t *); | 230 v = va_arg(args, ngx_str_t *); |
231 | 231 |
232 len = v->len; | 232 len = ngx_min(((size_t) (last - buf)), v->len); |
233 len = (buf + len < last) ? len : (size_t) (last - buf); | |
234 | |
235 buf = ngx_cpymem(buf, v->data, len); | 233 buf = ngx_cpymem(buf, v->data, len); |
236 fmt++; | 234 fmt++; |
237 | 235 |
238 continue; | 236 continue; |
239 | 237 |
240 case 'v': | 238 case 'v': |
241 vv = va_arg(args, ngx_variable_value_t *); | 239 vv = va_arg(args, ngx_variable_value_t *); |
242 | 240 |
243 len = vv->len; | 241 len = ngx_min(((size_t) (last - buf)), vv->len); |
244 len = (buf + len < last) ? len : (size_t) (last - buf); | |
245 | |
246 buf = ngx_cpymem(buf, vv->data, len); | 242 buf = ngx_cpymem(buf, vv->data, len); |
247 fmt++; | 243 fmt++; |
248 | 244 |
249 continue; | 245 continue; |
250 | 246 |
255 while (*p && buf < last) { | 251 while (*p && buf < last) { |
256 *buf++ = *p++; | 252 *buf++ = *p++; |
257 } | 253 } |
258 | 254 |
259 } else { | 255 } else { |
260 len = (buf + slen < last) ? slen : (size_t) (last - buf); | 256 len = ngx_min(((size_t) (last - buf)), slen); |
261 | |
262 buf = ngx_cpymem(buf, p, len); | 257 buf = ngx_cpymem(buf, p, len); |
263 } | 258 } |
264 | 259 |
265 fmt++; | 260 fmt++; |
266 | 261 |