djsundog/circuitpython
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

lib/libc/string0.c: Remove include of std.h, replace with string.h.

Browse Source 
Much more portable this way.
This commit is contained in:
Damien George 2015-04-18 14:27:55 +01:00
parent 1c9a499135
commit f53a8e712f
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/libc/string0.c
View File

@ -25,7 +25,7 @@
*/ */
#include <stdint.h> #include <stdint.h>
#include "std.h" #include <string.h>
#define likely(x) __builtin_expect((x), 1) #define likely(x) __builtin_expect((x), 1)
@ -102,10 +102,12 @@ void *memset(void *s, int c, size_t n) {
return s; return s;
} }
int memcmp(const char *s1, const char *s2, size_t n) { int memcmp(const void *s1, const void *s2, size_t n) {
const uint8_t *s1_8 = s1;
const uint8_t *s2_8 = s2;
while (n--) { while (n--) {
char c1 = *s1++; char c1 = *s1_8++;
char c2 = *s2++; char c2 = *s2_8++;
if (c1 < c2) return -1; if (c1 < c2) return -1;
else if (c1 > c2) return 1; else if (c1 > c2) return 1;
} }