Fix compile error due to new strnstr()
Remove local strnstr() implementation to fix compile error: newlib/libc/iconv/lib/aliasesi.c:53:8: error: conflicting types for 'strnstr' _DEFUN(strnstr, (haystack, needle, length), ^ In file included from newlib/libc/iconv/lib/aliasesi.c:29:0: newlib/libc/include/string.h:125:10: note: previous declaration of 'strnstr' was here char *strnstr(const char *, const char *, size_t) __pure; ^~~~~~~ Signed-off-by: Sebastian Huber <sebastian.huber@embedded-brains.de>
This commit is contained in:
parent
cf8bf843f8
commit
f1863582ed
|
@ -33,49 +33,6 @@
|
||||||
#include <sys/iconvnls.h>
|
#include <sys/iconvnls.h>
|
||||||
#include "local.h"
|
#include "local.h"
|
||||||
|
|
||||||
/*
|
|
||||||
* strnstr - locate a substring in a fixed-size string.
|
|
||||||
*
|
|
||||||
* PARAMETERS:
|
|
||||||
* _CONST char *haystack - the string in which to search.
|
|
||||||
* _CONST char *needle - the string which to search.
|
|
||||||
* int length - the maximum 'haystack' string length.
|
|
||||||
*
|
|
||||||
* DESCRIPTION:
|
|
||||||
* The strstr() function finds the first occurrence of the substring
|
|
||||||
* 'needle' in the string 'haystack'. At most 'length' bytes are searched.
|
|
||||||
*
|
|
||||||
* RETURN:
|
|
||||||
* Returns a pointer to the beginning of substring, or NULL if substring
|
|
||||||
* was not found.
|
|
||||||
*/
|
|
||||||
static char *
|
|
||||||
_DEFUN(strnstr, (haystack, needle, length),
|
|
||||||
_CONST char *haystack _AND
|
|
||||||
_CONST char *needle _AND
|
|
||||||
int length)
|
|
||||||
{
|
|
||||||
_CONST char *max = haystack + length;
|
|
||||||
|
|
||||||
if (*haystack == '\0')
|
|
||||||
return *needle == '\0' ? (char *)haystack : (char *)NULL;
|
|
||||||
|
|
||||||
while (haystack < max)
|
|
||||||
{
|
|
||||||
int i = 0;
|
|
||||||
while (1)
|
|
||||||
{
|
|
||||||
if (needle[i] == '\0')
|
|
||||||
return (char *)haystack;
|
|
||||||
if (needle[i] != haystack[i])
|
|
||||||
break;
|
|
||||||
i += 1;
|
|
||||||
}
|
|
||||||
haystack += 1;
|
|
||||||
}
|
|
||||||
return (char *)NULL;
|
|
||||||
}
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* canonical_form - canonize 'str'.
|
* canonical_form - canonize 'str'.
|
||||||
*
|
*
|
||||||
|
|
Loading…
Reference in New Issue