# HG changeset patch
# User Igor Sysoev <igor@sysoev.ru>
# Date 1273830933 0
# Node ID 76d252724db5ec9e9bb8d294baacb2452fe917c5
# Parent  58865853f29b0700160157e1ca6a1a00f7f81a38
use ngx_min() and ngx_max()

diff -r 58865853f29b -r 76d252724db5 src/core/ngx_output_chain.c
--- a/src/core/ngx_output_chain.c	Fri May 14 09:22:58 2010 +0000
+++ b/src/core/ngx_output_chain.c	Fri May 14 09:55:33 2010 +0000
@@ -465,10 +465,7 @@
     dst = ctx->buf;
 
     size = ngx_buf_size(src);
-
-    if (size > dst->end - dst->pos) {
-        size = dst->end - dst->pos;
-    }
+    size = ngx_min(size, dst->end - dst->pos);
 
     sendfile = ctx->sendfile & !ctx->directio;
 
diff -r 58865853f29b -r 76d252724db5 src/core/ngx_string.c
--- a/src/core/ngx_string.c	Fri May 14 09:22:58 2010 +0000
+++ b/src/core/ngx_string.c	Fri May 14 09:55:33 2010 +0000
@@ -229,9 +229,7 @@
             case 'V':
                 v = va_arg(args, ngx_str_t *);
 
-                len = v->len;
-                len = (buf + len < last) ? len : (size_t) (last - buf);
-
+                len = ngx_min(((size_t) (last - buf)), v->len);
                 buf = ngx_cpymem(buf, v->data, len);
                 fmt++;
 
@@ -240,9 +238,7 @@
             case 'v':
                 vv = va_arg(args, ngx_variable_value_t *);
 
-                len = vv->len;
-                len = (buf + len < last) ? len : (size_t) (last - buf);
-
+                len = ngx_min(((size_t) (last - buf)), vv->len);
                 buf = ngx_cpymem(buf, vv->data, len);
                 fmt++;
 
@@ -257,8 +253,7 @@
                     }
 
                 } else {
-                    len = (buf + slen < last) ? slen : (size_t) (last - buf);
-
+                    len = ngx_min(((size_t) (last - buf)), slen);
                     buf = ngx_cpymem(buf, p, len);
                 }
 
diff -r 58865853f29b -r 76d252724db5 src/http/modules/ngx_http_log_module.c
--- a/src/http/modules/ngx_http_log_module.c	Fri May 14 09:22:58 2010 +0000
+++ b/src/http/modules/ngx_http_log_module.c	Fri May 14 09:55:33 2010 +0000
@@ -533,7 +533,7 @@
 
     ms = (ngx_msec_int_t)
              ((tp->sec - r->start_sec) * 1000 + (tp->msec - r->start_msec));
-    ms = (ms >= 0) ? ms : 0;
+    ms = ngx_max(ms, 0);
 
     return ngx_sprintf(buf, "%T.%03M", ms / 1000, ms % 1000);
 }
diff -r 58865853f29b -r 76d252724db5 src/http/ngx_http_upstream.c
--- a/src/http/ngx_http_upstream.c	Fri May 14 09:22:58 2010 +0000
+++ b/src/http/ngx_http_upstream.c	Fri May 14 09:55:33 2010 +0000
@@ -3710,7 +3710,7 @@
         if (state[i].status) {
             ms = (ngx_msec_int_t)
                      (state[i].response_sec * 1000 + state[i].response_msec);
-            ms = (ms >= 0) ? ms : 0;
+            ms = ngx_max(ms, 0);
             p = ngx_sprintf(p, "%d.%03d", ms / 1000, ms % 1000);
 
         } else {