From 2d075a3d9aa7294425198f1a54898fe0b85c28a6 Mon Sep 17 00:00:00 2001
From: Jeremy Boynes <jeremy@boynes.com>
Date: Fri, 8 Sep 2023 14:48:21 +0100
Subject: [PATCH 1/2] Use itoa from samd core to replace use of deprecated
 sprintf call

---
 test/src/itoa.cpp | 149 +++++++++++++++++++++++++++++++++-------------
 1 file changed, 106 insertions(+), 43 deletions(-)

diff --git a/test/src/itoa.cpp b/test/src/itoa.cpp
index 292d0ef0..fb468dcc 100644
--- a/test/src/itoa.cpp
+++ b/test/src/itoa.cpp
@@ -1,62 +1,125 @@
 /*
- * Copyright (c) 2020 Arduino.  All rights reserved.
- */
+  Copyright (c) 2014 Arduino LLC.  All right reserved.
 
-/**************************************************************************************
- * INCLUDE
- **************************************************************************************/
+  This library is free software; you can redistribute it and/or
+  modify it under the terms of the GNU Lesser General Public
+  License as published by the Free Software Foundation; either
+  version 2.1 of the License, or (at your option) any later version.
 
-#include <api/itoa.h>
+  This library is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+  See the GNU Lesser General Public License for more details.
 
-#include <string>
-#include <stdexcept>
+  You should have received a copy of the GNU Lesser General Public
+  License along with this library; if not, write to the Free Software
+  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+*/
 
-#include <stdio.h>
+#include <string.h>
 
-/**************************************************************************************
- * FUNCTION IMPLEMENTATION
- **************************************************************************************/
+#ifdef __cplusplus
+extern "C" {
+#endif
 
-std::string radixToFmtString(int const radix)
+char* ltoa( long value, char *string, int radix )
 {
-  if      (radix == 8)  return std::string("%o");
-  else if (radix == 10) return std::string("%d");
-  else if (radix == 16) return std::string("%X");
-  else throw std::runtime_error("Invalid radix.");
-}
+  char tmp[33];
+  char *tp = tmp;
+  long i;
+  unsigned long v;
+  int sign;
+  char *sp;
 
-char * itoa(int value, char * str, int radix)
-{
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
-  sprintf(str, radixToFmtString(radix).c_str(), value);
-#pragma GCC diagnostic pop
-  return str;
+  if ( string == NULL )
+  {
+    return 0 ;
+  }
+
+  if (radix > 36 || radix <= 1)
+  {
+    return 0 ;
+  }
+
+  sign = (radix == 10 && value < 0);
+  if (sign)
+  {
+    v = -value;
+  }
+  else
+  {
+    v = (unsigned long)value;
+  }
+
+  while (v || tp == tmp)
+  {
+    i = v % radix;
+    v = v / radix;
+    if (i < 10)
+      *tp++ = i+'0';
+    else
+      *tp++ = i + 'a' - 10;
+  }
+
+  sp = string;
+
+  if (sign)
+    *sp++ = '-';
+  while (tp > tmp)
+    *sp++ = *--tp;
+  *sp = 0;
+
+  return string;
 }
 
-char * ltoa(long value, char * str, int radix)
+char* ultoa( unsigned long value, char *string, int radix )
 {
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
-  sprintf(str, radixToFmtString(radix).c_str(), value);
-#pragma GCC diagnostic pop
-  return str;
+  char tmp[33];
+  char *tp = tmp;
+  long i;
+  unsigned long v = value;
+  char *sp;
+
+  if ( string == NULL )
+  {
+    return 0;
+  }
+
+  if (radix > 36 || radix <= 1)
+  {
+    return 0;
+  }
+
+  while (v || tp == tmp)
+  {
+    i = v % radix;
+    v = v / radix;
+    if (i < 10)
+      *tp++ = i+'0';
+    else
+      *tp++ = i + 'a' - 10;
+  }
+
+  sp = string;
+
+
+  while (tp > tmp)
+    *sp++ = *--tp;
+  *sp = 0;
+
+  return string;
 }
 
-char * utoa(unsigned value, char *str, int radix)
+char* itoa( int value, char *string, int radix )
 {
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
-  sprintf(str, radixToFmtString(radix).c_str(), value);
-#pragma GCC diagnostic pop
-  return str;
+  return ltoa( value, string, radix ) ;
 }
 
-char * ultoa(unsigned long value, char * str, int radix)
+char* utoa( unsigned int value, char *string, int radix )
 {
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
-  sprintf(str, radixToFmtString(radix).c_str(), value);
-#pragma GCC diagnostic pop
-  return str;
+  return ultoa( value, string, radix ) ;
 }
+
+#ifdef __cplusplus
+} // extern "C"
+#endif

From f7912de4b11a82ba10e08ad79fe579747cf7dec1 Mon Sep 17 00:00:00 2001
From: Jeremy Boynes <jeremy@boynes.com>
Date: Fri, 8 Sep 2023 15:24:18 +0100
Subject: [PATCH 2/2] Fix warnings from CLang-tidy

---
 test/src/itoa.cpp | 26 ++++++++++++--------------
 1 file changed, 12 insertions(+), 14 deletions(-)

diff --git a/test/src/itoa.cpp b/test/src/itoa.cpp
index fb468dcc..97e06ffe 100644
--- 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,18 +74,18 @@ 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)
@@ -95,9 +93,9 @@ char* ultoa( unsigned 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;

<!DOCTYPE html PUBLIC '-//W3C//DTD XHTML 1.0 Transitional//EN' 'http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd'>
<html xmlns='http://www.w3.org/1999/xhtml'>
<head>
<title>pFad - Phonifier reborn</title>
<meta http-equiv='Content-Type' content='text/html; charset=utf-8' />
</head>
<body>
<h1>Pfad - The Proxy pFad of &#169; 2024 Garber Painting. All rights reserved.</h1>


<!-- Disclaimer -->
<p>Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.</p>
<br>
<p>Alternative Proxies:</p><p><a href="http://rainy.clevelandohioweatherforecast.com/php-proxy/index.php?q=https://patch-diff.githubusercontent.com/raw/arduino/ArduinoCore-API/pull/211.patch" target="_blank">Alternative Proxy</a></p><p><a href="http://rainy.clevelandohioweatherforecast.com/pFad/index.php?u=https://patch-diff.githubusercontent.com/raw/arduino/ArduinoCore-API/pull/211.patch" target="_blank">pFad Proxy</a></p><p><a href="http://rainy.clevelandohioweatherforecast.com/pFad/v3index.php?u=https://patch-diff.githubusercontent.com/raw/arduino/ArduinoCore-API/pull/211.patch" target="_blank">pFad v3 Proxy</a></p><p><a href="http://rainy.clevelandohioweatherforecast.com/pFad/v4index.php?u=https://patch-diff.githubusercontent.com/raw/arduino/ArduinoCore-API/pull/211.patch" target="_blank">pFad v4 Proxy</a></p></body>
</html>