mirror of
https://github.com/esp8266/Arduino.git
synced 2025-04-21 10:26:06 +03:00
Remove implementations of non-ISO libc functions which are present in newlib
This commit is contained in:
parent
1588b45a8a
commit
6d3109e8c7
@ -29,21 +29,6 @@
|
|||||||
#include <math.h>
|
#include <math.h>
|
||||||
#include "stdlib_noniso.h"
|
#include "stdlib_noniso.h"
|
||||||
|
|
||||||
|
|
||||||
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);
|
|
||||||
}
|
|
||||||
|
|
||||||
void reverse(char* begin, char* end) {
|
void reverse(char* begin, char* end) {
|
||||||
char *is = begin;
|
char *is = begin;
|
||||||
char *ie = end - 1;
|
char *ie = end - 1;
|
||||||
@ -56,31 +41,6 @@ void reverse(char* begin, char* end) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
char* itoa(int value, char* result, int base) {
|
|
||||||
if(base < 2 || base > 16) {
|
|
||||||
*result = 0;
|
|
||||||
return result;
|
|
||||||
}
|
|
||||||
|
|
||||||
char* out = result;
|
|
||||||
int quotient = abs(value);
|
|
||||||
|
|
||||||
do {
|
|
||||||
const int tmp = quotient / base;
|
|
||||||
*out = "0123456789abcdef"[quotient - (tmp * base)];
|
|
||||||
++out;
|
|
||||||
quotient = tmp;
|
|
||||||
} while(quotient);
|
|
||||||
|
|
||||||
// Apply negative sign
|
|
||||||
if(value < 0)
|
|
||||||
*out++ = '-';
|
|
||||||
|
|
||||||
reverse(result, out);
|
|
||||||
*out = 0;
|
|
||||||
return result;
|
|
||||||
}
|
|
||||||
|
|
||||||
char* ltoa(long value, char* result, int base) {
|
char* ltoa(long value, char* result, int base) {
|
||||||
if(base < 2 || base > 16) {
|
if(base < 2 || base > 16) {
|
||||||
*result = 0;
|
*result = 0;
|
||||||
@ -106,27 +66,6 @@ char* ltoa(long value, char* result, int base) {
|
|||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
char* utoa(unsigned value, char* result, int base) {
|
|
||||||
if(base < 2 || base > 16) {
|
|
||||||
*result = 0;
|
|
||||||
return result;
|
|
||||||
}
|
|
||||||
|
|
||||||
char* out = result;
|
|
||||||
unsigned quotient = value;
|
|
||||||
|
|
||||||
do {
|
|
||||||
const unsigned tmp = quotient / base;
|
|
||||||
*out = "0123456789abcdef"[quotient - (tmp * base)];
|
|
||||||
++out;
|
|
||||||
quotient = tmp;
|
|
||||||
} while(quotient);
|
|
||||||
|
|
||||||
reverse(result, out);
|
|
||||||
*out = 0;
|
|
||||||
return result;
|
|
||||||
}
|
|
||||||
|
|
||||||
char* ultoa(unsigned long value, char* result, int base) {
|
char* ultoa(unsigned long value, char* result, int base) {
|
||||||
if(base < 2 || base > 16) {
|
if(base < 2 || base > 16) {
|
||||||
*result = 0;
|
*result = 0;
|
||||||
|
@ -42,6 +42,8 @@ char* ultoa (unsigned long val, char *s, int radix);
|
|||||||
|
|
||||||
char* dtostrf (double val, signed char width, unsigned char prec, char *s);
|
char* dtostrf (double val, signed char width, unsigned char prec, char *s);
|
||||||
|
|
||||||
|
void reverse(char* begin, char* end);
|
||||||
|
|
||||||
#ifdef __cplusplus
|
#ifdef __cplusplus
|
||||||
} // extern "C"
|
} // extern "C"
|
||||||
#endif
|
#endif
|
||||||
|
@ -37,6 +37,7 @@ MOCK_CPP_FILES := $(addprefix common/,\
|
|||||||
|
|
||||||
MOCK_C_FILES := $(addprefix common/,\
|
MOCK_C_FILES := $(addprefix common/,\
|
||||||
md5.c \
|
md5.c \
|
||||||
|
noniso.c \
|
||||||
)
|
)
|
||||||
|
|
||||||
INC_PATHS += $(addprefix -I, \
|
INC_PATHS += $(addprefix -I, \
|
||||||
|
85
tests/host/common/noniso.c
Normal file
85
tests/host/common/noniso.c
Normal file
@ -0,0 +1,85 @@
|
|||||||
|
/*
|
||||||
|
noniso.cpp - replacements for non-ISO functions used by Arduino core
|
||||||
|
Copyright © 2016 Ivan Grokhotkov
|
||||||
|
|
||||||
|
Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||||
|
of this software and associated documentation files (the "Software"), to deal
|
||||||
|
in the Software without restriction, including without limitation the rights
|
||||||
|
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||||
|
copies of the Software, and to permit persons to whom the Software is
|
||||||
|
furnished to do so, subject to the following conditions:
|
||||||
|
|
||||||
|
The above copyright notice and this permission notice shall be included in
|
||||||
|
all copies or substantial portions of the Software.
|
||||||
|
*/
|
||||||
|
|
||||||
|
|
||||||
|
#include <stdlib.h>
|
||||||
|
#include <string.h>
|
||||||
|
#include <stdbool.h>
|
||||||
|
#include <stdint.h>
|
||||||
|
#include <math.h>
|
||||||
|
#include "stdlib_noniso.h"
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
char* utoa(unsigned value, char* result, int base) {
|
||||||
|
if(base < 2 || base > 16) {
|
||||||
|
*result = 0;
|
||||||
|
return result;
|
||||||
|
}
|
||||||
|
|
||||||
|
char* out = result;
|
||||||
|
unsigned quotient = value;
|
||||||
|
|
||||||
|
do {
|
||||||
|
const unsigned tmp = quotient / base;
|
||||||
|
*out = "0123456789abcdef"[quotient - (tmp * base)];
|
||||||
|
++out;
|
||||||
|
quotient = tmp;
|
||||||
|
} while(quotient);
|
||||||
|
|
||||||
|
reverse(result, out);
|
||||||
|
*out = 0;
|
||||||
|
return result;
|
||||||
|
}
|
||||||
|
|
||||||
|
char* itoa(int value, char* result, int base) {
|
||||||
|
if(base < 2 || base > 16) {
|
||||||
|
*result = 0;
|
||||||
|
return result;
|
||||||
|
}
|
||||||
|
|
||||||
|
char* out = result;
|
||||||
|
int quotient = abs(value);
|
||||||
|
|
||||||
|
do {
|
||||||
|
const int tmp = quotient / base;
|
||||||
|
*out = "0123456789abcdef"[quotient - (tmp * base)];
|
||||||
|
++out;
|
||||||
|
quotient = tmp;
|
||||||
|
} while(quotient);
|
||||||
|
|
||||||
|
// Apply negative sign
|
||||||
|
if(value < 0)
|
||||||
|
*out++ = '-';
|
||||||
|
|
||||||
|
reverse(result, out);
|
||||||
|
*out = 0;
|
||||||
|
return result;
|
||||||
|
}
|
||||||
|
|
||||||
|
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);
|
||||||
|
}
|
||||||
|
|
Loading…
x
Reference in New Issue
Block a user