Warning fixes throughout. Use $(WERROR) in Makefiles to get -Werror.

* Warning fixes throughout.
* Use $(WERROR) in Makefiles to get -Werror.

ChangeLog-20000414

+1999-12-15  Elliot Lee  <sopwith@redhat.com>
+
+	* Warning fixes throughout.
+	* Use $(WERROR) in Makefiles to get -Werror.
+
 1999-12-15  Darin Adler  <darin@eazel.com>
 
 	* components/help/.cvsignore: Ignore more generated files.

components/help/hyperbola-filefmt.c

@@ -257,7 +257,7 @@ static char **
 fmt_map_entry(HyperbolaDocTree *tree, const char *name, char section)
 {
   TreeInfo *tinfo;
-  GSList *cur;
+  GSList *cur_slist;
 
   tinfo = tree->user_data;
   if(!tinfo)
@@ -285,9 +285,9 @@ fmt_map_entry(HyperbolaDocTree *tree, const char *name, char section)
       g_list_free(langlist);
     }
 
-  for(cur = tinfo->mappings[(int)section]; cur; cur = cur->next)
+  for(cur_slist = tinfo->mappings[(int)section]; cur_slist; cur_slist = cur_slist->next)
     {
-      ManpageMapping *mapent = cur->data;
+      ManpageMapping *mapent = cur_slist->data;
 
       if(!regexec(&mapent->regex_comp, name, 0, NULL, 0))
 	return mapent->path;

components/history/Makefile.am

 bin_PROGRAMS=ntl-history-view
 
-INCLUDES=-I$(top_srcdir) -I$(top_builddir) $(GNOMEUI_CFLAGS) $(BONOBO_CFLAGS)
+INCLUDES=-I$(top_srcdir) -I$(top_builddir) $(GNOMEUI_CFLAGS) $(BONOBO_CFLAGS) $(WERROR)
 LDADD=$(top_builddir)/libnautilus/libnautilus.la $(BONOBO_LIBS) $(GNOMEUI_LIBS)
 
 ntl_history_view_SOURCES=ntl-history-view.c

configure.in

@@ -24,10 +24,6 @@ AC_ARG_ENABLE(more-warnings,
 [--enable-more-warnings	Maximum compiler warnings],
 set_more_warnings="$enableval", set_more_warnings=yes)
 
-AC_ARG_ENABLE(fatal-warnings,
-[--enable-fatal-warnings	Make warnings fatal],
-set_fatal_warnings="$enableval", set_fatal_warnings=yes)
-
 # Arg is enabled
 if test "$GCC" = "yes" -a "$set_more_warnings" != "no"; then
 	echo "enable compile warnings = $set_more_warnings"
@@ -36,10 +32,10 @@ if test "$GCC" = "yes" -a "$set_more_warnings" != "no"; then
 	-Wnested-externs -Wpointer-arith \
 	-Wno-sign-compare -Wsign-promo"
 fi
-if test "$GCC" = "yes" -a "$set_fatal_warnings" != "no"; then
-	echo "enable fatal warnings = $set_fatal_warnings"
-	CFLAGS="$CFLAGS -Werror"
+if test "$GCC" = "yes"; then
+	WERROR="-Werror"
 fi
+AC_SUBST(WERROR)
 
 dnl Checks for libraries.
 AM_PATH_GLIB(1.2.0,,

src/Makefile.am

@@ -5,8 +5,9 @@ bin_PROGRAMS=nautilus
 INCLUDES=-I$(top_srcdir) -I$(top_builddir) \
 	$(BONOBO_CFLAGS) $(GNORBA_CFLAGS) \
 	$(GNOMEUI_CFLAGS) $(GDK_PIXBUF_CFLAGS) \
-	$(VFS_CFLAGS)	\
-	-DVERSION="\"$(VERSION)\""
+	$(VFS_CFLAGS) \
+	-DVERSION="\"$(VERSION)\"" \
+	$(WERROR)
 
 LDADD=	file-manager/libntl-file-manager.la \
 	../libnautilus/libnautilus.la \

src/file-manager/Makefile.am

@@ -3,7 +3,9 @@ noinst_LTLIBRARIES=libntl-file-manager.la
 INCLUDES=-I$(top_srcdir) -I$(top_builddir) \
 	$(BONOBO_CFLAGS) $(GNORBA_CFLAGS) \
 	$(GNOMEUI_CFLAGS) -DVERSION="\"$(VERSION)\"" \
-	$(GDK_PIXBUF_CFLAGS)
+	$(GDK_PIXBUF_CFLAGS)				\
+	$(WERROR)
+
 dfos_corba_srcs=					\
 	GNOME_Desktop_FileOperationService.h		\
 	GNOME_Desktop_FileOperationService-stubs.c	\

src/nautilus-window-manage-views.c

@@ -83,8 +83,6 @@ nautilus_window_request_location_change(NautilusWindow *window,
 static void
 nautilus_window_change_location_internal(NautilusWindow *window, NautilusNavigationInfo *loci, gboolean is_back)
 {
-  char *old_location;
-
   CORBA_free(window->si); window->si = NULL;
 
   /* Maintain history lists. */

src/nautilus-window-state.c

-#include "ntl-window-state.h"
+#include "nautilus.h"
 
 void
 nautilus_window_set_initial_state(NautilusWindow *window)

src/ntl-window-msgs.c

@@ -83,8 +83,6 @@ nautilus_window_request_location_change(NautilusWindow *window,
 static void
 nautilus_window_change_location_internal(NautilusWindow *window, NautilusNavigationInfo *loci, gboolean is_back)
 {
-  char *old_location;
-
   CORBA_free(window->si); window->si = NULL;
 
   /* Maintain history lists. */

src/ntl-window-state.c

-#include "ntl-window-state.h"
+#include "nautilus.h"
 
 void
 nautilus_window_set_initial_state(NautilusWindow *window)