From: Andre Noll Date: Fri, 23 Nov 2007 09:32:00 +0000 (+0100) Subject: Add wrapper for isspace(). X-Git-Tag: v0.3.0~103^2~9 X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=commitdiff_plain;h=2bb11d7d5ee7f515287d5ac5ea09d80bc5d6780f;hp=90ceda2e5bac25611e7a754db93cd552f3140012 Add wrapper for isspace(). This avoids warning: subscript has type `char' on netbsd. --- diff --git a/audiod.c b/audiod.c index b8c072d5..3bac70ad 100644 --- a/audiod.c +++ b/audiod.c @@ -119,7 +119,7 @@ int get_audio_format_num(char *name) { int i; - while (isspace(*name)) + while (para_isspace(*name)) name++; FOR_EACH_AUDIO_FORMAT(i) if (!strcmp(name, audio_formats[i])) diff --git a/mp3_afh.c b/mp3_afh.c index fe174ea8..f5fc7113 100644 --- a/mp3_afh.c +++ b/mp3_afh.c @@ -163,7 +163,7 @@ static void write_info_str(struct afh_info *afhi) static char *unpad(char *string) { char *pos = string + strlen(string) - 1; - while (isspace(pos[0])) + while (para_isspace(pos[0])) (pos--)[0] = 0; return string; } diff --git a/para.h b/para.h index 9ee318e5..0cb1538d 100644 --- a/para.h +++ b/para.h @@ -217,3 +217,18 @@ static inline long int para_random(unsigned max) /** Get the size of an array */ #define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0])) + +/** + * Wrapper for isspace. + * NetBSD needs this. + */ +/* + * The values should be cast to an unsigned char first, then to int. + * Why? Because the isdigit (as do all other is/to functions/macros) + * expect a number from 0 upto and including 255 as their (int) argument. + * Because char is signed on most systems, casting it to int immediately + * gives the functions an argument between -128 and 127 (inclusive), + * which they will use as an array index, and which will thus fail + * horribly for characters which have their most significant bit set. + */ +#define para_isspace(c) isspace((int)(unsigned char)(c))