philippelh/bitchx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Change arguments of my_strnstr() from const unsigned char * to const char *

Browse Source 
This kills warnings in both ircaux.c and input.c.
This commit is contained in:
Kevin Easton
2015-06-07 00:30:05 +10:00
parent c0c7cdbdcc
commit 7eae2aba86
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/ircaux.h
View File

@@ -62,7 +62,7 @@ int BX_my_stricmp (const char *, const char *);
int BX_my_strnicmp (const char *, const char *, size_t); int BX_my_strnicmp (const char *, const char *, size_t);
#endif #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 *); int BX_scanstr (char *, char *);
void really_free (int); void really_free (int);
char * BX_chop (char *, int); char * BX_chop (char *, int);

2
include/modval.h
View File

@@ -130,7 +130,7 @@ extern Function_ptr *global;
#define my_stricmp (*(int (*)(const char *, const char *))global[MY_STRICMP]) #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_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 chop (*(char * (*)(char *, int))global[CHOP])
#define strmcpy (*(char * (*)(char *, const char *, int))global[STRMCPY]) #define strmcpy (*(char * (*)(char *, const char *, int))global[STRMCPY])
#define strmcat (*(char * (*)(char *, const char *, int))global[STRMCAT]) #define strmcat (*(char * (*)(char *, const char *, int))global[STRMCAT])

4
source/ircaux.c
View File

@@ -768,9 +768,9 @@ int BX_my_strnicmp (const char *str1, const char *str2, size_t n)
} }
/* my_strnstr: case insensitive version of strstr */ /* 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; if (!p) return 0;
for (; *p; p++) for (; *p; p++)
if (!strncasecmp(p, str2, strlen(str2))) if (!strncasecmp(p, str2, strlen(str2)))