attributes

Author: mcspr

cores/esp8266/core_esp8266_noniso.cpp

@@ -32,15 +32,15 @@
 
 extern "C" {
 
-char* ltoa(long value, char* result, int base) {
+char* ltoa(long value, char* result, int base) noexcept {
     return itoa((int)value, result, base);
 }
 
-char* ultoa(unsigned long value, char* result, int 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) {
+char * dtostrf(double number, signed char width, unsigned char prec, char *s) noexcept {
     bool negative = false;
 
     if (isnan(number)) {
@@ -125,7 +125,7 @@ char * dtostrf(double number, signed char width, unsigned char prec, char *s) {
 
 */
 const char* strrstr(const char*__restrict p_pcString,
-                    const char*__restrict p_pcPattern)
+                    const char*__restrict p_pcPattern) noexcept
 {
     const char* pcResult = 0;
 

cores/esp8266/stdlib_noniso.cpp

@@ -25,7 +25,7 @@
 // but is smaller by ~800B/flash and ~250B/rodata
 
 // ulltoa fills str backwards and can return a pointer different from str
-char* ulltoa(unsigned long long val, char* str, int slen, unsigned int radix)
+char* ulltoa(unsigned long long val, char* str, int slen, unsigned int radix) noexcept
 {
     str += --slen;
     *str = 0;
@@ -39,7 +39,7 @@ char* ulltoa(unsigned long long val, char* str, int slen, unsigned int radix)
 }
 
 // lltoa fills str backwards and can return a pointer different from str
-char* lltoa (long long val, char* str, int slen, unsigned int radix)
+char* lltoa (long long val, char* str, int slen, unsigned int radix) noexcept
 {
     bool neg;
     if (val < 0)

cores/esp8266/stdlib_noniso.h

@@ -26,28 +26,36 @@
 extern "C"{
 #endif
 
-int atoi(const char *s);
+#ifdef __cplusplus
+#define __STDLIB_NONISO_NOEXCEPT noexcept
+#else
+#define __STDLIB_NONISO_NOEXCEPT
+#endif
 
-long atol(const char* s);
+int atoi(const char *s) __STDLIB_NONISO_NOEXCEPT;
 
-double atof(const char* s);
+long atol(const char* s) __STDLIB_NONISO_NOEXCEPT;
 
-char* itoa (int val, char *s, int radix);
+double atof(const char* s) __STDLIB_NONISO_NOEXCEPT;
 
-char* ltoa (long val, char *s, int radix);
+char* itoa (int val, char *s, int radix) __STDLIB_NONISO_NOEXCEPT;
 
-char* lltoa (long long val, char* str, int slen, unsigned int radix);
+char* ltoa (long val, char *s, int radix) __STDLIB_NONISO_NOEXCEPT;
 
-char* utoa (unsigned int val, char *s, int radix);
+char* lltoa (long long val, char* str, int slen, unsigned int radix) __STDLIB_NONISO_NOEXCEPT;
 
-char* ultoa (unsigned long val, char *s, int radix);
+char* utoa (unsigned int val, char *s, int radix) __STDLIB_NONISO_NOEXCEPT;
 
-char* ulltoa (unsigned long long val, char* str, int slen, unsigned int radix);
+char* ultoa (unsigned long val, char *s, int radix) __STDLIB_NONISO_NOEXCEPT;
 
-char* dtostrf (double val, signed char width, unsigned char prec, char *s);
+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);
+                    const char*__restrict p_pcPattern) __STDLIB_NONISO_NOEXCEPT;
+
+#undef __STDLIB_NONISO_NOEXCEPT
 
 #ifdef __cplusplus
 } // extern "C"

tools/sdk/include/ets_sys.h

@@ -208,7 +208,6 @@ void *ets_memset(void *s, int c, size_t n);
 void ets_timer_arm_new(ETSTimer *a, int b, int c, int isMstimer);
 void ets_timer_setfn(ETSTimer *t, ETSTimerFunc *fn, void *parg);
 void ets_timer_disarm(ETSTimer *a);
-int atoi(const char *nptr);
 int ets_strncmp(const char *s1, const char *s2, int len);
 int ets_strcmp(const char *s1, const char *s2);
 int ets_strlen(const char *s);