head - cleanup warnings

[Eric Blake]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

gcc doesn't like /* /* */ when in warnings mode.  I also noticed that some
of the DEBUG macros were misspelled.  I have not yet tried compiling with
- -DDEBUG defined, but we should at least compile when it is undefined.

2006-07-22  Eric Blake  <address@hidden>

        * m4/m4private.h (DEBUG_MODULES, DEBUG_STKOVF) [DEBUG]: Fix
        spelling.
        (DEBUG_SYNTAX) [DEBUG]: Turn on more debug.
        (DEBUG_MACRO): Remove unused macro.
        * src/stackovf.c: Avoid compiler warnings.
        * m4/input.c: Likewise.
        * m4/module.c: Likewise.
        * m4/output.c: Likewise.
        * m4/path.c: Likewise.
        * m4/symtab.c: Likewise.
        * m4/syntax.c: Likewise.

- --
Life is short - so eat dessert first!

Eric Blake             address@hidden
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.2.1 (Cygwin)
Comment: Public key at home.comcast.net/~ericblake/eblake.gpg
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iD8DBQFEwnre84KuGfSFAYARAnWLAKCvZNJr66t8Wgic6pthKdpOR+d8YwCfftNL
ApHQB/0ih8vPfWzZitF9QfY=
=0NvP
-----END PGP SIGNATURE-----

Index: m4/input.c
===================================================================
RCS file: /sources/m4/m4/m4/input.c,v
retrieving revision 1.40
diff -u -p -r1.40 input.c
--- m4/input.c  17 Jul 2006 12:37:21 -0000      1.40
+++ m4/input.c  22 Jul 2006 19:16:40 -0000
@@ -24,7 +24,8 @@
 
 #include "m4private.h"
 
-/*#define DEBUG_INPUT  /* Define this to see runtime debug info.  */
+/* Define this to see runtime debug info.  Implied by DEBUG.  */
+/*#define DEBUG_INPUT */
 
 /*
    Unread input can be either files, that should be read (eg. included
@@ -761,7 +762,7 @@ m4__next_token (m4 *context, m4_symbol_v
        if (ch != CHAR_EOF)
          obstack_1grow (&token_stack, ch);
        type = m4_get_discard_comments_opt (context)
-               ? M4_TOKEN_NONE : M4_TOKEN_STRING;
+               ? M4_TOKEN_NONE : M4_TOKEN_STRING;
       }
     else if (!m4_is_syntax_single_comments (M4SYNTAX)
             && MATCH (context, ch, context->syntax->bcomm.string))
@@ -775,7 +776,7 @@ m4__next_token (m4 *context, m4_symbol_v
          obstack_grow (&token_stack, context->syntax->ecomm.string,
                        context->syntax->ecomm.length);
        type = m4_get_discard_comments_opt (context)
-               ? M4_TOKEN_NONE : M4_TOKEN_STRING;
+               ? M4_TOKEN_NONE : M4_TOKEN_STRING;
       }
     else if (m4_has_syntax (M4SYNTAX, ch, M4_SYNTAX_ESCAPE))
       {                                        /* ESCAPED WORD */
@@ -820,7 +821,7 @@ m4__next_token (m4 *context, m4_symbol_v
          unget_input(ch);
 
        type = m4_is_syntax_macro_escaped (M4SYNTAX)
-               ? M4_TOKEN_STRING : M4_TOKEN_WORD;
+               ? M4_TOKEN_STRING : M4_TOKEN_WORD;
       }
     else if (m4_has_syntax (M4SYNTAX, ch, M4_SYNTAX_LQUOTE))
       {                                        /* QUOTED STRING, SINGLE QUOTES 
*/
Index: m4/m4private.h
===================================================================
RCS file: /sources/m4/m4/m4/m4private.h,v
retrieving revision 1.50
diff -u -p -r1.50 m4private.h
--- m4/m4private.h      17 Jul 2006 12:37:21 -0000      1.50
+++ m4/m4private.h      22 Jul 2006 19:16:40 -0000
@@ -352,10 +352,11 @@ struct m4__search_path_info {
 # define DEBUG_INCL
 # define DEBUG_INPUT
 # define DEBUG_MACRO
-# define DEBUG_MODULE
+# define DEBUG_MODULES
 # define DEBUG_OUTPUT
-# define DEBUG_STACKOVF
+# define DEBUG_STKOVF
 # define DEBUG_SYM
+# define DEBUG_SYNTAX
 #endif
 
 #endif /* m4private.h */
Index: m4/module.c
===================================================================
RCS file: /sources/m4/m4/m4/module.c,v
retrieving revision 1.37
diff -u -p -r1.37 module.c
--- m4/module.c 17 Jul 2006 12:37:21 -0000      1.37
+++ m4/module.c 22 Jul 2006 19:16:41 -0000
@@ -22,7 +22,8 @@
 #include "ltdl.h"
 #include "m4private.h"
 
-/*#define DEBUG_MODULES  /* Define this to see runtime debug info. */
+/* Define this to see runtime debug info.  Implied by DEBUG.  */
+/*#define DEBUG_MODULES */
 
 /*
  * This file implements dynamic modules in GNU M4.  A module is a
Index: m4/output.c
===================================================================
RCS file: /sources/m4/m4/m4/output.c,v
retrieving revision 1.24
diff -u -p -r1.24 output.c
--- m4/output.c 17 Jul 2006 12:37:21 -0000      1.24
+++ m4/output.c 22 Jul 2006 19:16:41 -0000
@@ -38,7 +38,8 @@ extern int errno;
 
 #include "m4private.h"
 
-/*#define DEBUG_OUTPUT /* Define this to see runtime debug output.  */
+/* Define this to see runtime debug output.  Implied by DEBUG.  */
+/*#define DEBUG_OUTPUT */
 
 /* Size of initial in-memory buffer size for diversions.  Small diversions
    would usually fit in.  */
Index: m4/path.c
===================================================================
RCS file: /sources/m4/m4/m4/path.c,v
retrieving revision 1.15
diff -u -p -r1.15 path.c
--- m4/path.c   17 Jul 2006 12:37:21 -0000      1.15
+++ m4/path.c   22 Jul 2006 19:16:41 -0000
@@ -1,6 +1,6 @@
 /* GNU m4 -- A simple macro processor
 
-   Copyright (C) 1989, 1990, 1991, 1992, 1993, 1998, 2004
+   Copyright (C) 1989, 1990, 1991, 1992, 1993, 1998, 2004, 2006
    Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
@@ -41,7 +41,8 @@
 #include "m4module.h"
 #include "m4private.h"
 
-/*#define DEBUG_INCL   /* Define this to see runtime debug info.  */
+/* Define this to see runtime debug info.  Implied by DEBUG.  */
+/*#define DEBUG_INCL */
 
 static void search_path_add (m4__search_path_info *, const char *);
 static void search_path_env_init (m4__search_path_info *, char *, bool);
Index: m4/symtab.c
===================================================================
RCS file: /sources/m4/m4/m4/symtab.c,v
retrieving revision 1.53
diff -u -p -r1.53 symtab.c
--- m4/symtab.c 17 Jul 2006 12:37:21 -0000      1.53
+++ m4/symtab.c 22 Jul 2006 19:16:41 -0000
@@ -1,5 +1,5 @@
 /* GNU m4 -- A simple macro processor
-   Copyright (C) 1989, 1990, 1991, 1992, 1993, 1994, 2001, 2005
+   Copyright (C) 1989, 1990, 1991, 1992, 1993, 1994, 2001, 2005, 2006
    Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
@@ -20,7 +20,8 @@
 
 #include "m4private.h"
 
-/*#define DEBUG_SYM    /* Define this to see runtime debug info.  */
+/* Define this to see runtime debug info.  Implied by DEBUG.  */
+/*#define DEBUG_SYM */
 
 /* This file handles all the low level work around the symbol table.  The
    symbol table is an abstract hash table type implemented in hash.c.  Each
@@ -227,7 +228,7 @@ m4_symbol_pushdef (m4_symbol_table *symt
   assert (name);
   assert (value);
 
-  symbol               = symtab_fetch (symtab, name);
+  symbol               = symtab_fetch (symtab, name);
   VALUE_NEXT (value)   = m4_get_symbol_value (symbol);
   symbol->value                = value;
 
Index: m4/syntax.c
===================================================================
RCS file: /sources/m4/m4/m4/syntax.c,v
retrieving revision 1.15
diff -u -p -r1.15 syntax.c
--- m4/syntax.c 17 Jul 2006 12:37:21 -0000      1.15
+++ m4/syntax.c 22 Jul 2006 19:16:41 -0000
@@ -1,5 +1,6 @@
 /* GNU m4 -- A simple macro processor
-   Copyright (C) 1989, 90, 91, 92, 93, 94, 2002, 2004 Free Software 
Foundation, Inc.
+   Copyright (C) 1989, 1990, 1991, 1992, 1993, 1994, 2002, 2004, 2006 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
@@ -19,7 +20,8 @@
 
 #include "m4private.h"
 
-/*#define DEBUG_SYNTAX /* Define this to see runtime debug info.  */
+/* Define this to see runtime debug info.  Implied by DEBUG.  */
+/*#define DEBUG_SYNTAX */
 
 /* THE SYNTAX TABLE
 
Index: src/stackovf.c
===================================================================
RCS file: /sources/m4/m4/src/stackovf.c,v
retrieving revision 1.17
diff -u -p -r1.17 stackovf.c
--- src/stackovf.c      17 Jul 2006 12:37:21 -0000      1.17
+++ src/stackovf.c      22 Jul 2006 19:16:41 -0000
@@ -75,7 +75,8 @@
       dump in the usual way.  It seems important (to me) that internal m4
       bugs not be reported as user recursion errors, or vice-versa."  */
 
-/*#define DEBUG_STACKOVF       /* Define this to see runtime debug info.  */
+/* Define this to see runtime debug info.  Implied by DEBUG.  */
+/*#define DEBUG_STKOVF */
 
 #include "m4.h"
 #include "m4private.h"                 /* stdlib.h, xmalloc() */