Changeset 113 in kStuff

Timestamp:

Jul 12, 2018 11:34:27 AM (7 years ago)

Author:

bird

Message:

kHlpInt2Ascii.c: Try make cppcheck happy.

File:

• trunk/kHlp/Generic/kHlpInt2Ascii.c (modified) (1 diff)

trunk/kHlp/Generic/kHlpInt2Ascii.c

@@ -49 +49 @@
     char *pszRet = psz;
 
-    if (cch >= (lVal < 0 ? 3U : 2U) && psz)
+    if (psz != NULL)
     {
-        /* prefix */
-        if (lVal < 0)
+        if (cch >= (lVal < 0 ? 3U : 2U))
         {
-            *psz++ = '-';
-            cch--;
-            lVal = -lVal;
+            /* prefix */
+            if (lVal < 0)
+            {
+                *psz++ = '-';
+                cch--;
+                lVal = -lVal;
+            }
+
+            /* the digits */
+            do
+            {
+                *psz++ = s_szDigits[lVal % iBase];
+                cch--;
+                lVal /= iBase;
+            } while (lVal && cch > 1);
+
+            /* overflow indicator */
+            if (lVal)
+                psz[-1] = '+';
         }
-
-        /* the digits */
-        do
-        {
-            *psz++ = s_szDigits[lVal % iBase];
-            cch--;
-            lVal /= iBase;
-        } while (lVal && cch > 1);
-
-        /* overflow indicator */
-        if (lVal)
-            psz[-1] = '+';
+        else if (cch > 1)
+            *psz++ = '+';
+        else if (cch < 1)
+            return pszRet;
+        *psz = '\0';
     }
-    else if (!pszRet)
-        return pszRet;
-    else if (cch < 1 || !pszRet)
-        return pszRet;
-    else
-        *psz++ = '+';
-    *psz = '\0';
-
     return pszRet;
 }