Welcome to mirror list, hosted at ThFree Co, Russian Federation.

cygwin.com/git/newlib-cygwin.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSebastian Huber <sebastian.huber@embedded-brains.de>2017-08-25 20:48:42 +0300
committerCorinna Vinschen <corinna@vinschen.de>2017-08-28 18:31:52 +0300
commitf1863582eda80694f77a90ad21d5b2eb2be9b881 (patch)
tree3abe7fe1fc4c88281ff5df5ff6319bdad3860ed0 /newlib/libc/iconv
parentcf8bf843f8be1771b8ad2489480cfdbbc42a668d (diff)
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>
Diffstat (limited to 'newlib/libc/iconv')
-rw-r--r--newlib/libc/iconv/lib/aliasesi.c43
1 files changed, 0 insertions, 43 deletions
diff --git a/newlib/libc/iconv/lib/aliasesi.c b/newlib/libc/iconv/lib/aliasesi.c
index f94ac8fb9..41497c608 100644
--- a/newlib/libc/iconv/lib/aliasesi.c
+++ b/newlib/libc/iconv/lib/aliasesi.c
@@ -34,49 +34,6 @@
#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'.
*
* PARAMETERS: