more clean-up

Author: mcspr

cores/esp8266/core_esp8266_noniso.cpp

@@ -28,19 +28,12 @@
 #include <stdint.h>
 #include <math.h>
 #include <limits>
+
 #include "stdlib_noniso.h"
 
 extern "C" {
 
-char* ltoa(long value, char* result, int base) noexcept {
-    return itoa((int)value, result, base);
-}
-
-char* ultoa(unsigned long value, char* result, int base) noexcept {
-    return utoa((unsigned int)value, result, base);
-}
-
-char * dtostrf(double number, signed char width, unsigned char prec, char *s) noexcept {
+char* dtostrf(double number, signed char width, unsigned char prec, char *s) noexcept {
     bool negative = false;
 
     if (isnan(number)) {
@@ -149,4 +142,4 @@ const char* strrstr(const char*__restrict p_pcString,
     return pcResult;
 }
 
-};
+} // extern "C"

cores/esp8266/stdlib_noniso.cpp

@@ -21,6 +21,8 @@
 
 #include "stdlib_noniso.h"
 
+extern "C" {
+
 // ulltoa() is slower than std::to_char() (1.6 times)
 // but is smaller by ~800B/flash and ~250B/rodata
 
@@ -39,7 +41,7 @@ char* ulltoa(unsigned long long val, char* str, int slen, unsigned int radix) no
 }
 
 // lltoa fills str backwards and can return a pointer different from str
-char* lltoa (long long val, char* str, int slen, unsigned int radix) noexcept
+char* lltoa(long long val, char* str, int slen, unsigned int radix) noexcept
 {
     bool neg;
     if (val < 0)
@@ -60,3 +62,13 @@ char* lltoa (long long val, char* str, int slen, unsigned int radix) noexcept
     }
     return ret;
 }
+
+char* ltoa(long value, char* result, int base) noexcept {
+    return itoa((int)value, result, base);
+}
+
+char* ultoa(unsigned long value, char* result, int base) noexcept {
+    return utoa((unsigned int)value, result, base);
+}
+
+} // extern "C"

cores/esp8266/stdlib_noniso.h

@@ -22,8 +22,10 @@
 #ifndef STDLIB_NONISO_H
 #define STDLIB_NONISO_H
 
+#include <stdlib.h>
+
 #ifdef __cplusplus
-extern "C"{
+extern "C" {
 #endif
 
 #ifdef __cplusplus
@@ -32,34 +34,23 @@ extern "C"{
 #define __STDLIB_NONISO_NOEXCEPT
 #endif
 
-int atoi(const char *s) __STDLIB_NONISO_NOEXCEPT;
-
-long atol(const char* s) __STDLIB_NONISO_NOEXCEPT;
-
-double atof(const char* s) __STDLIB_NONISO_NOEXCEPT;
-
-char* itoa (int val, char *s, int radix) __STDLIB_NONISO_NOEXCEPT;
-
 char* ltoa (long val, char *s, int radix) __STDLIB_NONISO_NOEXCEPT;
 
 char* lltoa (long long val, char* str, int slen, unsigned int radix) __STDLIB_NONISO_NOEXCEPT;
 
-char* utoa (unsigned int val, char *s, int radix) __STDLIB_NONISO_NOEXCEPT;
-
 char* ultoa (unsigned long val, char *s, int radix) __STDLIB_NONISO_NOEXCEPT;
 
 char* ulltoa (unsigned long long val, char* str, int slen, unsigned int radix) __STDLIB_NONISO_NOEXCEPT;
 
 char* dtostrf (double val, signed char width, unsigned char prec, char *s) __STDLIB_NONISO_NOEXCEPT;
 
-const char* strrstr(const char*__restrict p_pcString,
-                    const char*__restrict p_pcPattern) __STDLIB_NONISO_NOEXCEPT;
+const char* strrstr (const char*__restrict p_pcString,
+                     const char*__restrict p_pcPattern) __STDLIB_NONISO_NOEXCEPT;
 
 #undef __STDLIB_NONISO_NOEXCEPT
 
 #ifdef __cplusplus
 } // extern "C"
 #endif
 
-
 #endif

tests/host/common/mock.h

@@ -65,6 +65,8 @@
 extern "C"
 {
 #endif
+    char* utoa(unsigned value, char* result, int base);
+    char* itoa(int value, char* result, int base);
     size_t strlcat(char* dst, const char* src, size_t size);
     size_t strlcpy(char* dst, const char* src, size_t size);
 #ifdef __cplusplus

tests/host/common/noniso.c

@@ -19,7 +19,7 @@
 #include <stdint.h>
 #include <math.h>
 
-#include "stdlib_noniso.h"
+#include <stdlib_noniso.h>
 
 static void reverse(char* begin, char* end)
 {
@@ -85,20 +85,3 @@ char* itoa(int value, char* result, int base)
     utoa(uvalue, result, base);
     return out;
 }
-
-int atoi(const char* s)
-{
-    return (int)atol(s);
-}
-
-long atol(const char* s)
-{
-    char* tmp;
-    return strtol(s, &tmp, 10);
-}
-
-double atof(const char* s)
-{
-    char* tmp;
-    return strtod(s, &tmp);
-}