From: Robert Varga <robert.varga@pantheon.sk>
Date: Thu, 25 Feb 2016 11:07:45 +0000 (+0100)
Subject: BUG-2825: rename have_xdigit
X-Git-Tag: release/boron~183
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=a2b089098feff819855c90e5843b0540188a470e;p=mdsal.git

BUG-2825: rename have_xdigit

Do not use an underscore and make sure the name relates to the fact that
the contents of 'val' are valid and need to be propagated to the byte
array.

Change-Id: I4596a679b9c8e871ba57aaae1a59d8df01383803
Signed-off-by: Robert Varga <robert.varga@pantheon.sk>
---

diff --git a/model/ietf/ietf-type-util/src/main/java/org/opendaylight/mdsal/model/ietf/util/Ipv6Utils.java b/model/ietf/ietf-type-util/src/main/java/org/opendaylight/mdsal/model/ietf/util/Ipv6Utils.java
index ce35e41349..72c8bf9c12 100644
--- a/model/ietf/ietf-type-util/src/main/java/org/opendaylight/mdsal/model/ietf/util/Ipv6Utils.java
+++ b/model/ietf/ietf-type-util/src/main/java/org/opendaylight/mdsal/model/ietf/util/Ipv6Utils.java
@@ -70,7 +70,7 @@ final class Ipv6Utils {
 
        final byte[] dst = new byte[INADDR6SZ];
 
-       boolean saw_xdigit = false;
+       boolean haveVal = false;
        int val = 0;
        int colonp = -1;
        int j = 0;
@@ -81,18 +81,17 @@ final class Ipv6Utils {
            // v6 separator
            if (ch == ':') {
                curtok = i;
-               if (!saw_xdigit) {
+               if (haveVal) {
+                   // removed overrun check - the regexp checks for valid data
+                   dst[j++] = (byte) ((val >>> 8) & 0xff);
+                   dst[j++] = (byte) (val & 0xff);
+                   haveVal = false;
+                   val = 0;
+               } else {
                    // no need to check separator position validity - regexp does that
                    colonp = j;
-                   continue;
                }
 
-               // removed overrun check - the regexp checks for valid data
-
-               dst[j++] = (byte) ((val >>> 8) & 0xff);
-               dst[j++] = (byte) (val & 0xff);
-               saw_xdigit = false;
-               val = 0;
                continue;
            }
 
@@ -104,7 +103,7 @@ final class Ipv6Utils {
                 */
                Ipv4Utils.fillIpv4Bytes(dst, j, addrStr, curtok, addrStrLen);
                j += INADDR4SZ;
-               saw_xdigit = false;
+               haveVal = false;
                break;
            }
 
@@ -116,10 +115,10 @@ final class Ipv6Utils {
             */
            final int chval = AbstractIetfYangUtil.hexValue(ch);
            val = (val << 4) | chval;
-           saw_xdigit = true;
+           haveVal = true;
        }
 
-       if (saw_xdigit) {
+       if (haveVal) {
            Verify.verify(j + INT16SZ <= INADDR6SZ, "Overrun in parsing of '%s', should not occur", addrStr);
            dst[j++] = (byte) ((val >> 8) & 0xff);
            dst[j++] = (byte) (val & 0xff);