diff options
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | Makefile.maint | 12 | ||||
| -rw-r--r-- | src/c99-to-c89.diff | 2 | ||||
| -rw-r--r-- | src/expr.c | 3 | ||||
| -rw-r--r-- | src/md5sum.c | 3 | ||||
| -rw-r--r-- | src/shred.c | 3 |
6 files changed, 25 insertions, 7 deletions
@@ -1,3 +1,12 @@ +2007-06-15 Jim Meyering <jim@meyering.net> + + Don't include "quote.h" when it is not used. + * src/md5sum.c: Remove unnecessary inclusion of "quote.h". + * src/expr.c: Likewise. + * src/shred.c: Likewise. + * Makefile.maint (sc_prohibit_quote_without_use): New rule. + * src/c99-to-c89.diff: Adjust offsets. + 2007-06-14 Paul Eggert <eggert@cs.ucla.edu> Clarify what "cat" documentation means by "blank" lines. diff --git a/Makefile.maint b/Makefile.maint index ba5166b3d..bb666a4ad 100644 --- a/Makefile.maint +++ b/Makefile.maint @@ -179,6 +179,18 @@ sc_prohibit_quotearg_without_use: else :; \ fi +# Don't include quote.h unless you use one of its functions. +sc_prohibit_quote_without_use: + @if $(CVS_LIST_EXCEPT) | grep '\.c$$' > /dev/null; then \ + files=$$(grep -l '# *include "quote\.h"' \ + $$($(CVS_LIST_EXCEPT) | grep '\.c$$')) && \ + grep -LE '\<quote(_n)? \(' $$files \ + | grep . && \ + { echo "$(ME): the above files include "quote.h" but don't use it" \ + 1>&2; exit 1; } || :; \ + else :; \ + fi + sc_obsolete_symbols: @grep -nE '\<(HAVE''_FCNTL_H|O''_NDELAY)\>' \ $$($(CVS_LIST_EXCEPT)) && \ diff --git a/src/c99-to-c89.diff b/src/c99-to-c89.diff index 4e1aa4aa3..e4d2abf72 100644 --- a/src/c99-to-c89.diff +++ b/src/c99-to-c89.diff @@ -106,7 +106,7 @@ retrieving revision 1.130 diff -u -p -r1.130 shred.c --- a/src/shred.c 3 Sep 2006 02:53:16 -0000 1.130 +++ b/src/shred.c 3 Oct 2006 13:48:24 -0000 -@@ -464,7 +464,7 @@ dopass (int fd, char const *qname, off_t +@@ -463,7 +463,7 @@ dopass (int fd, char const *qname, off_t out. Thus, it shouldn't give up on bad blocks. This code works because lim is always a multiple of SECTOR_SIZE, except at the end. */ diff --git a/src/expr.c b/src/expr.c index 57c259144..47f5832f8 100644 --- a/src/expr.c +++ b/src/expr.c @@ -1,5 +1,5 @@ /* expr -- evaluate expressions. - Copyright (C) 86, 1991-1997, 1999-2006 Free Software Foundation, Inc. + Copyright (C) 86, 1991-1997, 1999-2007 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 @@ -37,7 +37,6 @@ #include "long-options.h" #include "error.h" #include "inttostr.h" -#include "quote.h" #include "quotearg.h" #include "strnumcmp.h" #include "xstrtol.h" diff --git a/src/md5sum.c b/src/md5sum.c index f637bae39..4330e85d1 100644 --- a/src/md5sum.c +++ b/src/md5sum.c @@ -1,5 +1,5 @@ /* Compute MD5, SHA1, SHA224, SHA256, SHA384 or SHA512 checksum of files or strings - Copyright (C) 1995-2006 Free Software Foundation, Inc. + Copyright (C) 1995-2007 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 @@ -38,7 +38,6 @@ #endif #include "getline.h" #include "error.h" -#include "quote.h" #include "stdio--.h" /* The official name of this program (e.g., no `g' prefix). */ diff --git a/src/shred.c b/src/shred.c index fc6ad67f1..788f0e707 100644 --- a/src/shred.c +++ b/src/shred.c @@ -1,6 +1,6 @@ /* shred.c - overwrite files and devices to make it harder to recover data - Copyright (C) 1999-2006 Free Software Foundation, Inc. + Copyright (C) 1999-2007 Free Software Foundation, Inc. Copyright (C) 1997, 1998, 1999 Colin Plumb. This program is free software; you can redistribute it and/or modify @@ -101,7 +101,6 @@ #include "human.h" #include "inttostr.h" #include "quotearg.h" /* For quotearg_colon */ -#include "quote.h" /* For quotearg_colon */ #include "randint.h" #include "randread.h" |