Firebee/FireBee_SVN
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Reverse merge from trunk in pci_BaS_gcc branch

Browse Source
This commit is contained in:
David Gálvez
2014-07-10 13:20:14 +00:00
parent 818cb2bcd7
commit b0617246e2
54 changed files with 1006 additions and 3653 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
util/bas_string.c
View File

@@ -55,14 +55,14 @@ void *memset(void *s, int c, size_t n)
}
int memcmp(const void *s1, const void *s2, size_t max)
int memcmp(const char *s1, const char *s2, size_t max)
{
int i;
int cmp;
for (i = 0; i < max; i++)
{
cmp = (* (const char *) s1 - * (const char *) s2);
cmp = (*s1 - *s2);
if (cmp != 0) return cmp;
}
return cmp;
@@ -75,7 +75,7 @@ int strcmp(const char *s1, const char *s2)
for (i = 0; *s1++ && *s2++; i++)
{
cmp = (*s1 - *s2);
cmp * (*s1 - *s2);
if (cmp != 0) return cmp;
}
return cmp;