summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXavier Chantry <shiningxc@gmail.com>2009-09-26 00:58:42 +0200
committerDan McGee <dan@archlinux.org>2009-10-11 15:12:20 -0500
commitcaea098c2191a2d94a28e90bfef958c34473a5a4 (patch)
treef27ec0455b22930ae74ee6eb4386eef6e2d9a447
parent35bbc96b99a8f9c8534b20d0ff7a30526b7d957d (diff)
downloadpacman-caea098c2191a2d94a28e90bfef958c34473a5a4.tar.xz
cygwin fix : use unsigned char for ctype function
See http://www.nabble.com/-PATCH-RFA--Distinguish-between-EOF-and-character-with-value-0xff-td23161772.html#a23188494 cygwin 1.7 actually displays a warning when using signed char with the ctype function, so that compilation fails when using -Wall -Werror. So we just cast all arguments to unsigned char. Signed-off-by: Xavier Chantry <shiningxc@gmail.com> Signed-off-by: Dan McGee <dan@archlinux.org>
-rw-r--r--lib/libalpm/be_files.c4
-rw-r--r--lib/libalpm/be_package.c2
-rw-r--r--lib/libalpm/util.c4
-rw-r--r--src/pacman/util.c6
4 files changed, 8 insertions, 8 deletions
diff --git a/lib/libalpm/be_files.c b/lib/libalpm/be_files.c
index 21533ef2..51492d52 100644
--- a/lib/libalpm/be_files.c
+++ b/lib/libalpm/be_files.c
@@ -495,7 +495,7 @@ int _alpm_db_read(pmdb_t *db, pmpkg_t *info, pmdbinfrq_t inforeq)
}
_alpm_strtrim(line);
- char first = tolower(line[0]);
+ char first = tolower((unsigned char)line[0]);
if(first > 'a' && first < 'z') {
struct tm tmp_tm = {0}; /* initialize to null in case of failure */
setlocale(LC_TIME, "C");
@@ -511,7 +511,7 @@ int _alpm_db_read(pmdb_t *db, pmpkg_t *info, pmdbinfrq_t inforeq)
}
_alpm_strtrim(line);
- char first = tolower(line[0]);
+ char first = tolower((unsigned char)line[0]);
if(first > 'a' && first < 'z') {
struct tm tmp_tm = {0}; /* initialize to null in case of failure */
setlocale(LC_TIME, "C");
diff --git a/lib/libalpm/be_package.c b/lib/libalpm/be_package.c
index 1cd30c28..c1a43438 100644
--- a/lib/libalpm/be_package.c
+++ b/lib/libalpm/be_package.c
@@ -82,7 +82,7 @@ static int parse_descfile(struct archive *a, pmpkg_t *newpkg)
} else if(!strcmp(key, "license")) {
newpkg->licenses = alpm_list_add(newpkg->licenses, strdup(ptr));
} else if(!strcmp(key, "builddate")) {
- char first = tolower(ptr[0]);
+ char first = tolower((unsigned char)ptr[0]);
if(first > 'a' && first < 'z') {
struct tm tmp_tm = {0}; /* initialize to null in case of failure */
setlocale(LC_TIME, "C");
diff --git a/lib/libalpm/util.c b/lib/libalpm/util.c
index c5485925..c44da4f3 100644
--- a/lib/libalpm/util.c
+++ b/lib/libalpm/util.c
@@ -175,7 +175,7 @@ char *_alpm_strtrim(char *str)
return(str);
}
- while(isspace((int)*pch)) {
+ while(isspace((unsigned char)*pch)) {
pch++;
}
if(pch != str) {
@@ -188,7 +188,7 @@ char *_alpm_strtrim(char *str)
}
pch = (str + (strlen(str) - 1));
- while(isspace((int)*pch)) {
+ while(isspace((unsigned char)*pch)) {
pch--;
}
*++pch = '\0';
diff --git a/src/pacman/util.c b/src/pacman/util.c
index 0351556e..da2000ea 100644
--- a/src/pacman/util.c
+++ b/src/pacman/util.c
@@ -297,7 +297,7 @@ char *strtoupper(char *str)
char *ptr = str;
while(*ptr) {
- (*ptr) = toupper(*ptr);
+ (*ptr) = toupper((unsigned char)*ptr);
ptr++;
}
return str;
@@ -314,7 +314,7 @@ char *strtrim(char *str)
return(str);
}
- while(isspace(*pch)) {
+ while(isspace((unsigned char)*pch)) {
pch++;
}
if(pch != str) {
@@ -327,7 +327,7 @@ char *strtrim(char *str)
}
pch = (str + (strlen(str) - 1));
- while(isspace(*pch)) {
+ while(isspace((unsigned char)*pch)) {
pch--;
}
*++pch = '\0';