diff options
Diffstat (limited to 'lib/driver')
-rwxr-xr-x[-rw-r--r--] | lib/driver/MSWindows/aspi32.c | 9 | ||||
-rwxr-xr-x[-rw-r--r--] | lib/driver/MSWindows/win32.c | 4 | ||||
-rwxr-xr-x[-rw-r--r--] | lib/driver/image/bincue.c | 2 | ||||
-rwxr-xr-x[-rw-r--r--] | lib/driver/image/cdrdao.c | 2 | ||||
-rwxr-xr-x[-rw-r--r--] | lib/driver/sector.c | 4 | ||||
-rwxr-xr-x[-rw-r--r--] | lib/driver/util.c | 2 |
6 files changed, 12 insertions, 11 deletions
diff --git a/lib/driver/MSWindows/aspi32.c b/lib/driver/MSWindows/aspi32.c index e710d9b8..f8e94cf4 100644..100755 --- a/lib/driver/MSWindows/aspi32.c +++ b/lib/driver/MSWindows/aspi32.c @@ -296,7 +296,7 @@ is_cdrom_aspi(const char drive_letter) return NULL; } - c_drive = toupper(drive_letter) - 'A'; + c_drive = toupper((unsigned char) drive_letter) - 'A'; for( i_adapter = 0; i_adapter < i_hostadapters; i_adapter++ ) { struct SRB_GetDiskInfo srbDiskInfo; @@ -363,14 +363,15 @@ init_aspi (_img_private_t *env) long (*lpSendCommand)( void* ) = NULL; DWORD dwSupportInfo; int i_adapter, i_hostadapters; - char c_drive; + unsigned char c_drive; int i_rc; - if (2 == strlen(env->gen.source_name) && isalpha(env->gen.source_name[0]) ) + if (2 == strlen(env->gen.source_name) && + isalpha((unsigned char) env->gen.source_name[0]) ) { c_drive = env->gen.source_name[0]; } else if ( 6 == strlen(env->gen.source_name) - && isalpha(env->gen.source_name[4] )) { + && isalpha((unsigned char) env->gen.source_name[4] )) { c_drive = env->gen.source_name[4]; } else { c_drive = 'C'; diff --git a/lib/driver/MSWindows/win32.c b/lib/driver/MSWindows/win32.c index b15afef6..e3b03d27 100644..100755 --- a/lib/driver/MSWindows/win32.c +++ b/lib/driver/MSWindows/win32.c @@ -876,7 +876,7 @@ cdio_is_device_win32(const char *source_name) if (NULL == source_name) return false; len = strlen(source_name); - if ((len == 2) && isalpha(source_name[0]) + if ((len == 2) && isalpha((unsigned char) source_name[0]) && (source_name[len-1] == ':')) return true; @@ -886,7 +886,7 @@ cdio_is_device_win32(const char *source_name) return ( (len == 6) && source_name[0] == '\\' && source_name[1] == '\\' && source_name[2] == '.' && source_name[3] == '\\' - && isalpha(source_name[len-2]) + && isalpha((unsigned char) source_name[len-2]) && (source_name[len-1] == ':') ); #else return false; diff --git a/lib/driver/image/bincue.c b/lib/driver/image/bincue.c index 59af27de..31ad96d2 100644..100755 --- a/lib/driver/image/bincue.c +++ b/lib/driver/image/bincue.c @@ -332,7 +332,7 @@ parse_cuefile (_img_private_t *cd, const char *psz_cue_name) /* Check that we have all digits*/ unsigned int i; for (i=0; i<13; i++) { - if (!isdigit(psz_field[i])) { + if (!isdigit((unsigned char) psz_field[i])) { cdio_log(log_level, "%s line %d after word CATALOG:", psz_cue_name, i_line); diff --git a/lib/driver/image/cdrdao.c b/lib/driver/image/cdrdao.c index 644d8750..4cadb031 100644..100755 --- a/lib/driver/image/cdrdao.c +++ b/lib/driver/image/cdrdao.c @@ -359,7 +359,7 @@ parse_tocfile (_img_private_t *cd, const char *psz_cue_name) /* Check that we have all digits*/ unsigned int i; for (i=0; i<13; i++) { - if (!isdigit(psz_field[i])) { + if (!isdigit((unsigned char) psz_field[i])) { cdio_log(log_level, "%s line %d after word CATALOG:", psz_cue_name, i_line); diff --git a/lib/driver/sector.c b/lib/driver/sector.c index 930b8b21..d24a7511 100644..100755 --- a/lib/driver/sector.c +++ b/lib/driver/sector.c @@ -1,5 +1,5 @@ /* - Copyright (C) 2004, 2005, 2011 Rocky Bernstein <rocky@gnu.org> + Copyright (C) 2004, 2005, 2011, 2012 Rocky Bernstein <rocky@gnu.org> Copyright (C) 2000 Herbert Valerio Riedel <hvr@gnu.org> This program is free software; you can redistribute it and/or modify @@ -195,7 +195,7 @@ cdio_mmssff_to_lba (const char *psz_mmssff) { int psz_field; lba_t ret; - char c; + unsigned char c; if (0 == strcmp (psz_mmssff, "0")) return 0; diff --git a/lib/driver/util.c b/lib/driver/util.c index bb170792..39d4b8fe 100644..100755 --- a/lib/driver/util.c +++ b/lib/driver/util.c @@ -130,7 +130,7 @@ _cdio_strdup_upper (const char str[]) while (*p) { - *p = toupper (*p); + *p = toupper ((unsigned char) *p); p++; } } |