tachi
/
pkgconf
forked from ariadne/pkgconf
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Correctly cast ctypes function input to unsigned int 

This fixes issues found by building on NetBSD which is more pedantic
about thoses cases.

Reported by: Thomas Klausner (wiz at NetBSD)
feature/tap-sh
Baptiste Daroussin 2015-12-02 12:50:04 +01:00
parent b3737a713b
commit 7898b8297e
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libpkgconf/argvsplit.c
View File

@ -61,7 +61,7 @@ pkgconf_argv_split(const char *src, int *argc, char ***argv)
}
*dst_iter++ = *src_iter;
}
else if (isspace(*src_iter))
else if (isspace((unsigned int)*src_iter))
{
if ((*argv)[argc_count] != NULL)
{

22
libpkgconf/pkg.c
View File

@ -226,14 +226,14 @@ pkgconf_pkg_new_from_file(const char *filename, FILE *f, unsigned int flags)
char op, *p, *key, *value;
p = readbuf;
while (*p && (isalpha(*p) || isdigit(*p) || *p == '_' || *p == '.'))
while (*p && (isalpha((unsigned int)*p) || isdigit((unsigned int)*p) || *p == '_' || *p == '.'))
p++;
key = readbuf;
if (!isalpha(*key) && !isdigit(*p))
if (!isalpha((unsigned int)*key) && !isdigit((unsigned int)*p))
continue;
while (*p && isspace(*p)) {
while (*p && isspace((unsigned int)*p)) {
/* set to null to avoid trailing spaces in key */
*p = '\0';
p++;
@ -243,7 +243,7 @@ pkgconf_pkg_new_from_file(const char *filename, FILE *f, unsigned int flags)
*p = '\0';
p++;
while (*p && isspace(*p))
while (*p && isspace((unsigned int)*p))
p++;
value = p;
@ -539,9 +539,9 @@ pkgconf_compare_version(const char *a, const char *b)
while (*one || *two)
{
while (*one && !isalnum(*one) && *one != '~')
while (*one && !isalnum((unsigned int)*one) && *one != '~')
one++;
while (*two && !isalnum(*two) && *two != '~')
while (*two && !isalnum((unsigned int)*two) && *two != '~')
two++;
if (*one == '~' || *two == '~')
@ -562,22 +562,22 @@ pkgconf_compare_version(const char *a, const char *b)
str1 = one;
str2 = two;
if (isdigit(*str1))
if (isdigit((unsigned int)*str1))
{
while (*str1 && isdigit(*str1))
while (*str1 && isdigit((unsigned int)*str1))
str1++;
while (*str2 && isdigit(*str2))
while (*str2 && isdigit((unsigned int)*str2))
str2++;
isnum = true;
}
else
{
while (*str1 && isalpha(*str1))
while (*str1 && isalpha((unsigned int)*str1))
str1++;
while (*str2 && isalpha(*str2))
while (*str2 && isalpha((unsigned int)*str2))
str2++;
isnum = false;