optimized away some loop iterations in inet_ntop6()

git-svn-id: http://svn.apache.org/repos/asf/apr/apr/trunk@63361 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 5 insertions, 6 deletions

diff --git a/network_io/unix/inet_ntop.c b/network_io/unix/inet_ntop.c
index c0011deee..15e2c4521 100644
--- a/network_io/unix/inet_ntop.c
+++ b/network_io/unix/inet_ntop.c
@@ -203,13 +203,11 @@ inet_ntop6(const unsigned char *src, char *dst, apr_size_t size)
      * Format the result.
      */
     tp = tmp;
-    for (i = 0; i < (IN6ADDRSZ / INT16SZ); i++) {
+    for (i = 0; i < (IN6ADDRSZ / INT16SZ);) {
         /* Are we inside the best run of 0x00's? */
-        if (best.base != -1 && i >= best.base &&
-            i < (best.base + best.len)) {
-            if (i == best.base) {
-                *tp++ = ':';
-            }
+        if (i == best.base) {
+            *tp++ = ':';
+            i += best.len;
             continue;
         }
         /* Are we following an initial run of 0x00s or any real hex? */
@@ -226,6 +224,7 @@ inet_ntop6(const unsigned char *src, char *dst, apr_size_t size)
             break;
         }
         tp += apr_snprintf(tp, sizeof tmp - (tp - tmp), "%x", words[i]);
+        i++;
     }
     /* Was it a trailing run of 0x00's? */
     if (best.base != -1 && (best.base + best.len) == (IN6ADDRSZ / INT16SZ)) {