forked from ariadne/pkgconf
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
parent
b3737a713b
commit
7898b8297e
|
@ -61,7 +61,7 @@ pkgconf_argv_split(const char *src, int *argc, char ***argv)
|
||||||
}
|
}
|
||||||
*dst_iter++ = *src_iter;
|
*dst_iter++ = *src_iter;
|
||||||
}
|
}
|
||||||
else if (isspace(*src_iter))
|
else if (isspace((unsigned int)*src_iter))
|
||||||
{
|
{
|
||||||
if ((*argv)[argc_count] != NULL)
|
if ((*argv)[argc_count] != NULL)
|
||||||
{
|
{
|
||||||
|
|
|
@ -226,14 +226,14 @@ pkgconf_pkg_new_from_file(const char *filename, FILE *f, unsigned int flags)
|
||||||
char op, *p, *key, *value;
|
char op, *p, *key, *value;
|
||||||
|
|
||||||
p = readbuf;
|
p = readbuf;
|
||||||
while (*p && (isalpha(*p) || isdigit(*p) || *p == '_' || *p == '.'))
|
while (*p && (isalpha((unsigned int)*p) || isdigit((unsigned int)*p) || *p == '_' || *p == '.'))
|
||||||
p++;
|
p++;
|
||||||
|
|
||||||
key = readbuf;
|
key = readbuf;
|
||||||
if (!isalpha(*key) && !isdigit(*p))
|
if (!isalpha((unsigned int)*key) && !isdigit((unsigned int)*p))
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
while (*p && isspace(*p)) {
|
while (*p && isspace((unsigned int)*p)) {
|
||||||
/* set to null to avoid trailing spaces in key */
|
/* set to null to avoid trailing spaces in key */
|
||||||
*p = '\0';
|
*p = '\0';
|
||||||
p++;
|
p++;
|
||||||
|
@ -243,7 +243,7 @@ pkgconf_pkg_new_from_file(const char *filename, FILE *f, unsigned int flags)
|
||||||
*p = '\0';
|
*p = '\0';
|
||||||
p++;
|
p++;
|
||||||
|
|
||||||
while (*p && isspace(*p))
|
while (*p && isspace((unsigned int)*p))
|
||||||
p++;
|
p++;
|
||||||
|
|
||||||
value = p;
|
value = p;
|
||||||
|
@ -539,9 +539,9 @@ pkgconf_compare_version(const char *a, const char *b)
|
||||||
|
|
||||||
while (*one || *two)
|
while (*one || *two)
|
||||||
{
|
{
|
||||||
while (*one && !isalnum(*one) && *one != '~')
|
while (*one && !isalnum((unsigned int)*one) && *one != '~')
|
||||||
one++;
|
one++;
|
||||||
while (*two && !isalnum(*two) && *two != '~')
|
while (*two && !isalnum((unsigned int)*two) && *two != '~')
|
||||||
two++;
|
two++;
|
||||||
|
|
||||||
if (*one == '~' || *two == '~')
|
if (*one == '~' || *two == '~')
|
||||||
|
@ -562,22 +562,22 @@ pkgconf_compare_version(const char *a, const char *b)
|
||||||
str1 = one;
|
str1 = one;
|
||||||
str2 = two;
|
str2 = two;
|
||||||
|
|
||||||
if (isdigit(*str1))
|
if (isdigit((unsigned int)*str1))
|
||||||
{
|
{
|
||||||
while (*str1 && isdigit(*str1))
|
while (*str1 && isdigit((unsigned int)*str1))
|
||||||
str1++;
|
str1++;
|
||||||
|
|
||||||
while (*str2 && isdigit(*str2))
|
while (*str2 && isdigit((unsigned int)*str2))
|
||||||
str2++;
|
str2++;
|
||||||
|
|
||||||
isnum = true;
|
isnum = true;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
while (*str1 && isalpha(*str1))
|
while (*str1 && isalpha((unsigned int)*str1))
|
||||||
str1++;
|
str1++;
|
||||||
|
|
||||||
while (*str2 && isalpha(*str2))
|
while (*str2 && isalpha((unsigned int)*str2))
|
||||||
str2++;
|
str2++;
|
||||||
|
|
||||||
isnum = false;
|
isnum = false;
|
||||||
|
|
Loading…
Reference in New Issue