Fix warnings from CLang-tidy

jboynes · jboynes · commit f7912de4b11a · 2023-09-08T15:24:18.000+01:00
diff --git a/test/src/itoa.cpp b/test/src/itoa.cpp
@@ -16,8 +16,6 @@
   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */
 
-#include <string.h>
-
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -26,19 +24,19 @@ char* ltoa( long value, char *string, int radix )
 {
   char tmp[33];
   char *tp = tmp;
-  long i;
+  unsigned long i;
   unsigned long v;
   int sign;
   char *sp;
 
-  if ( string == NULL )
+  if ( string == nullptr )
   {
-    return 0 ;
+    return nullptr ;
   }
 
   if (radix > 36 || radix <= 1)
   {
-    return 0 ;
+    return nullptr ;
   }
 
   sign = (radix == 10 && value < 0);
@@ -56,9 +54,9 @@ char* ltoa( long value, char *string, int radix )
     i = v % radix;
     v = v / radix;
     if (i < 10)
-      *tp++ = i+'0';
+      *tp++ = static_cast<char>(i+'0');
     else
-      *tp++ = i + 'a' - 10;
+      *tp++ = static_cast<char>(i + 'a' - 10);
   }
 
   sp = string;
@@ -76,28 +74,28 @@ char* ultoa( unsigned long value, char *string, int radix )
 {
   char tmp[33];
   char *tp = tmp;
-  long i;
+  unsigned long i;
   unsigned long v = value;
   char *sp;
 
-  if ( string == NULL )
+  if ( string == nullptr )
   {
-    return 0;
+    return nullptr;
   }
 
   if (radix > 36 || radix <= 1)
   {
-    return 0;
+    return nullptr;
   }
 
   while (v || tp == tmp)
   {
     i = v % radix;
     v = v / radix;
     if (i < 10)
-      *tp++ = i+'0';
+      *tp++ = static_cast<char>(i+'0');
     else
-      *tp++ = i + 'a' - 10;
+      *tp++ = static_cast<char>(i + 'a' - 10);
   }
 
   sp = string;

Original file line number	Diff line number	Diff line change
`@@ -16,8 +16,6 @@`
`16`	`16`	`Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA`
`17`	`17`	`*/`
`18`	`18`
`19`		`-#include <string.h>`
`20`		`-`
`21`	`19`	`#ifdef __cplusplus`
`22`	`20`	`extern "C" {`
`23`	`21`	`#endif`
`@@ -26,19 +24,19 @@ char* ltoa( long value, char *string, int radix )`
`26`	`24`	`{`
`27`	`25`	`char tmp[33];`
`28`	`26`	`char *tp = tmp;`
`29`		`- long i;`
	`27`	`+ unsigned long i;`
`30`	`28`	`unsigned long v;`
`31`	`29`	`int sign;`
`32`	`30`	`char *sp;`
`33`	`31`
`34`		`- if ( string == NULL )`
	`32`	`+ if ( string == nullptr )`
`35`	`33`	`{`
`36`		`- return 0 ;`
	`34`	`+ return nullptr ;`
`37`	`35`	`}`
`38`	`36`
`39`	`37`	`if (radix > 36 \|\| radix <= 1)`
`40`	`38`	`{`
`41`		`- return 0 ;`
	`39`	`+ return nullptr ;`
`42`	`40`	`}`
`43`	`41`
`44`	`42`	`sign = (radix == 10 && value < 0);`
`@@ -56,9 +54,9 @@ char* ltoa( long value, char *string, int radix )`
`56`	`54`	`i = v % radix;`
`57`	`55`	`v = v / radix;`
`58`	`56`	`if (i < 10)`
`59`		`- *tp++ = i+'0';`
	`57`	`+ *tp++ = static_cast<char>(i+'0');`
`60`	`58`	`else`
`61`		`- *tp++ = i + 'a' - 10;`
	`59`	`+ *tp++ = static_cast<char>(i + 'a' - 10);`
`62`	`60`	`}`
`63`	`61`
`64`	`62`	`sp = string;`
`@@ -76,28 +74,28 @@ char* ultoa( unsigned long value, char *string, int radix )`
`76`	`74`	`{`
`77`	`75`	`char tmp[33];`
`78`	`76`	`char *tp = tmp;`
`79`		`- long i;`
	`77`	`+ unsigned long i;`
`80`	`78`	`unsigned long v = value;`
`81`	`79`	`char *sp;`
`82`	`80`
`83`		`- if ( string == NULL )`
	`81`	`+ if ( string == nullptr )`
`84`	`82`	`{`
`85`		`- return 0;`
	`83`	`+ return nullptr;`
`86`	`84`	`}`
`87`	`85`
`88`	`86`	`if (radix > 36 \|\| radix <= 1)`
`89`	`87`	`{`
`90`		`- return 0;`
	`88`	`+ return nullptr;`
`91`	`89`	`}`
`92`	`90`
`93`	`91`	`while (v \|\| tp == tmp)`
`94`	`92`	`{`
`95`	`93`	`i = v % radix;`
`96`	`94`	`v = v / radix;`
`97`	`95`	`if (i < 10)`
`98`		`- *tp++ = i+'0';`
	`96`	`+ *tp++ = static_cast<char>(i+'0');`
`99`	`97`	`else`
`100`		`- *tp++ = i + 'a' - 10;`
	`98`	`+ *tp++ = static_cast<char>(i + 'a' - 10);`
`101`	`99`	`}`
`102`	`100`
`103`	`101`	`sp = string;`