Crank WARNS.

Cast sizeof() to (int), as it's being compared against an int, not a size_t.
If i is changed to a size_t, it means the logic must be slightly changed later
in the flow, where --i is checked to be >= 0.  I am not sure I want to make a
logic change to account for clearing up a warning, when an aesthetic one will
keep from modifying the logic.

Other harmless casts, that I think I've made in the right directions.

Make gpbc() an inline function, rather than an obfuscated macro, make its
scratch space local, rather than global.  The previous macro used a dirty
hack (logical AND in place of a conditional) which would lead GCC to throw
a fit (rightly so) as the logical check, as well as the incrementation of
a variable, were not used for anything.

const'ify a few places where gcc3 yells. xstrdup() some global consts in
places where we xstrdup() when not using consts, but tried to assign them
to non-consts before.

Don't use execv(2) if we don't have the kind of arguments it wants.

Reviewed by:    asmodai obrien tjr
Submitted by:   tjr (a gcc3 build log)

1 files changed, 1 insertions, 5 deletions

diff --git a/usr.bin/m4/mdef.h b/usr.bin/m4/mdef.h
index 46ec643..183f753 100644
--- a/usr.bin/m4/mdef.h
+++ b/usr.bin/m4/mdef.h
@@ -145,7 +145,7 @@ struct ndblock {		/* hastable structure         */
 #define nil     ((ndptr) 0)
  
 struct keyblk {
-        char    *knam;          /* keyword name */
+        const char    *knam;    /* keyword name */
         int     ktyp;           /* keyword type */
 };
 
@@ -166,13 +166,9 @@ struct input_file {
 /*
  * macros for readibility and/or speed
  *
- *      gpbc()  - get a possibly pushed-back character
  *      pushf() - push a call frame entry onto stack
  *      pushs() - push a string pointer onto stack
  */
-#define gpbc()   (bp > bufbase) ? (*--bp ? (*bp & 0xFF) : EOF) : \
-	((chscratch = obtain_char(infile+ilevel)) == '\n' && \
-	++inlineno[ilevel], chscratch)
 #define pushf(x) 			\
 	do {				\
 		if (++sp == STACKMAX) 	\