From 7eae2aba86e0c774861f881c81ce36b1cb446b38 Mon Sep 17 00:00:00 2001 From: Kevin Easton Date: Sun, 7 Jun 2015 00:30:05 +1000 Subject: [PATCH] Change arguments of my_strnstr() from const unsigned char * to const char * This kills warnings in both ircaux.c and input.c. --- include/ircaux.h | 2 +- include/modval.h | 2 +- source/ircaux.c | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/ircaux.h b/include/ircaux.h index 76fa5e7..38e8bba 100644 --- a/include/ircaux.h +++ b/include/ircaux.h @@ -62,7 +62,7 @@ int BX_my_stricmp (const char *, const char *); int BX_my_strnicmp (const char *, const char *, size_t); #endif -int BX_my_strnstr (const unsigned char *, const unsigned char *, size_t); +int BX_my_strnstr (const char *, const char *, size_t); int BX_scanstr (char *, char *); void really_free (int); char * BX_chop (char *, int); diff --git a/include/modval.h b/include/modval.h index de1dab7..9893e96 100644 --- a/include/modval.h +++ b/include/modval.h @@ -130,7 +130,7 @@ extern Function_ptr *global; #define my_stricmp (*(int (*)(const char *, const char *))global[MY_STRICMP]) #define my_strnicmp (*(int (*)(const char *, const char *, size_t))global[MY_STRNICMP]) -#define my_strnstr (*(int (*)(const unsigned char *, const unsigned char *, size_t))global[MY_STRNSTR]) +#define my_strnstr (*(int (*)(const char *, const char *, size_t))global[MY_STRNSTR]) #define chop (*(char * (*)(char *, int))global[CHOP]) #define strmcpy (*(char * (*)(char *, const char *, int))global[STRMCPY]) #define strmcat (*(char * (*)(char *, const char *, int))global[STRMCAT]) diff --git a/source/ircaux.c b/source/ircaux.c index 9913bb3..137df97 100644 --- a/source/ircaux.c +++ b/source/ircaux.c @@ -768,9 +768,9 @@ int BX_my_strnicmp (const char *str1, const char *str2, size_t n) } /* my_strnstr: case insensitive version of strstr */ -int BX_my_strnstr (register const unsigned char *str1, register const unsigned char *str2, register size_t n) +int BX_my_strnstr (const char *str1, const char *str2, size_t n) { - char *p = (char *)str1; + const char *p = str1; if (!p) return 0; for (; *p; p++) if (!strncasecmp(p, str2, strlen(str2)))