svn commit: r187475 - head/usr.bin/make

[Roman Divacky]

Author: rdivacky
Date: Tue Jan 20 17:15:12 2009
New Revision: 187475
URL: http://svn.freebsd.org/changeset/base/187475

Log:
  Remove inlining of functions that are used mostly in different object files.
  This gets rid of gnu89 style inlining. Also silence gcc by assigning two
  variables NULL. This lets use to remove NO_WERROR.
  
  Approved by:	kib (mentor)
  Approved by:	harti

Modified:
  head/usr.bin/make/Makefile
  head/usr.bin/make/buf.c
  head/usr.bin/make/suff.c

Modified: head/usr.bin/make/Makefile
==============================================================================
--- head/usr.bin/make/Makefile	Tue Jan 20 16:35:34 2009	(r187474)
+++ head/usr.bin/make/Makefile	Tue Jan 20 17:15:12 2009	(r187475)
@@ -8,7 +8,6 @@ SRCS=	arch.c buf.c cond.c dir.c for.c ha
 	lst.c main.c make.c parse.c proc.c shell.c str.c suff.c targ.c	\
 	util.c var.c
 
-NO_WERROR=
 WARNS?=	6
 NO_SHARED?=	YES
 

Modified: head/usr.bin/make/buf.c
==============================================================================
--- head/usr.bin/make/buf.c	Tue Jan 20 16:35:34 2009	(r187474)
+++ head/usr.bin/make/buf.c	Tue Jan 20 17:15:12 2009	(r187475)
@@ -58,7 +58,7 @@ __FBSDID("$FreeBSD$");
  * Returns the number of bytes in the buffer.  Doesn't include the
  * null-terminating byte.
  */
-inline size_t
+size_t
 Buf_Size(const Buffer *buf)
 {
 
@@ -70,7 +70,7 @@ Buf_Size(const Buffer *buf)
  *  
  * @note Adding data to the Buffer object may invalidate the reference.
  */
-inline char *
+char *
 Buf_Data(const Buffer *bp)
 {
 
@@ -98,7 +98,7 @@ BufExpand(Buffer *bp, size_t nb)
 /**
  * Add a single byte to the buffer.
  */
-inline void
+void
 Buf_AddByte(Buffer *bp, Byte byte)
 {
 

Modified: head/usr.bin/make/suff.c
==============================================================================
--- head/usr.bin/make/suff.c	Tue Jan 20 16:35:34 2009	(r187474)
+++ head/usr.bin/make/suff.c	Tue Jan 20 17:15:12 2009	(r187475)
@@ -514,6 +514,7 @@ Suff_AddTransform(char *line)
 	Suff	*s;	/* source suffix */
 	Suff	*t;	/* target suffix */
 
+	s = t = NULL;	/* silence gcc */
 	gn = SuffTransFind(line);
 	if (gn == NULL) {
 		/*