From d7b21d511ab371bda7ae5ecb3788b9ac9d5bcb5c Mon Sep 17 00:00:00 2001 From: Eric Blake Date: Wed, 3 Nov 2010 09:56:48 -0600 Subject: [PATCH] avoid compiler warning * sed/sed.c (includes): Supply missing header. --- ChangeLog | 7 +++++++ basicdefs.h | 4 ++-- sed/compile.c | 4 ++-- sed/sed.c | 4 +++- 4 files changed, 14 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index acec48e..6465767 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2010-11-03 Eric Blake + + * basicdefs.h (ISDIGIT): Avoid compiler warning on cygwin. + * sed/compile.c (normalize_text): Avoid undefined behavior. + + * sed/sed.c (includes): Supply missing header. + 2010-11-01 Paolo Bonzini * autoboot.conf: Replace gettext with gettext-h. Suggested by diff --git a/basicdefs.h b/basicdefs.h index 72f7503..2e4fcb4 100644 --- a/basicdefs.h +++ b/basicdefs.h @@ -1,5 +1,5 @@ /* GNU SED, a batch stream editor. - Copyright (C) 1998, 1999, 2002, 2003 Free Software Foundation, Inc. + Copyright (C) 1998, 1999, 2002, 2003, 2010 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -151,7 +151,7 @@ typedef unsigned long countT; #undef ISPRINT #define ISPRINT(c) (ISASCII (c) && isprint (c)) -#define ISDIGIT(c) (ISASCII (c) && isdigit (c)) +#define ISDIGIT(c) (ISASCII (c) && isdigit ((unsigned char) (c))) #define ISALNUM(c) (ISASCII (c) && isalnum (c)) #define ISALPHA(c) (ISASCII (c) && isalpha (c)) #define ISCNTRL(c) (ISASCII (c) && iscntrl (c)) diff --git a/sed/compile.c b/sed/compile.c index b842e1b..b2fb825 100644 --- a/sed/compile.c +++ b/sed/compile.c @@ -1,5 +1,5 @@ /* GNU SED, a batch stream editor. - Copyright (C) 1989,90,91,92,93,94,95,98,99,2002,2003,2004,2005,2006,2008 + Copyright (C) 1989,90,91,92,93,94,95,98,99,2002,2003,2004,2005,2006,2008,2010 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify @@ -1521,7 +1521,7 @@ normalize_text(buf, len, buftype) case 'c': if (++p < bufend) { - *q++ = toupper(*p) ^ 0x40; + *q++ = toupper((unsigned char) *p) ^ 0x40; p++; continue; } diff --git a/sed/sed.c b/sed/sed.c index 3fb71a8..6de1280 100644 --- a/sed/sed.c +++ b/sed/sed.c @@ -1,5 +1,5 @@ /* GNU SED, a batch stream editor. - Copyright (C) 1989,90,91,92,93,94,95,98,99,2002,2003,2006,2008,2009 + Copyright (C) 1989,90,91,92,93,94,95,98,99,2002,2003,2006,2008,2009,2010 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify @@ -44,6 +44,8 @@ #endif #include "getopt.h" +#include "version-etc.h" + #ifndef BOOTSTRAP #ifndef HAVE_STDLIB_H extern char *getenv P_((const char *));