gnue/geas/src/config Makefile.am configuration.c

[Reinhard Mueller]

CVSROOT:        /cvs
Module name:    gnue
Changes by:     Reinhard Mueller <address@hidden>       01/05/29 15:54:42

Modified files:
        geas/src/config: Makefile.am configuration.c 

Log message:
        fixed compiler warnings, removed unnecessary includes

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/geas/src/config/Makefile.am.diff?cvsroot=OldCVS&tr1=1.6&tr2=1.7&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/geas/src/config/configuration.c.diff?cvsroot=OldCVS&tr1=1.10&tr2=1.11&r1=text&r2=text

Patches:
Index: gnue/geas/src/config/Makefile.am
diff -u gnue/geas/src/config/Makefile.am:1.6 
gnue/geas/src/config/Makefile.am:1.7
--- gnue/geas/src/config/Makefile.am:1.6        Fri May 25 16:46:21 2001
+++ gnue/geas/src/config/Makefile.am    Tue May 29 15:54:42 2001
@@ -1,9 +1,7 @@
-## $Id: Makefile.am,v 1.6 2001/05/25 23:46:21 reinhard Exp $
+## $Id: Makefile.am,v 1.7 2001/05/29 22:54:42 reinhard Exp $
 
 noinst_LIBRARIES = libconfig.a
 
-INCLUDES = $(GLIB_CFLAGS) \
-           -I$(top_srcdir)/lib/classdefs \
-           -I$(top_srcdir)/src
+INCLUDES = $(GLIB_CFLAGS)
 
 libconfig_a_SOURCES = configuration.c configuration.h
Index: gnue/geas/src/config/configuration.c
diff -u gnue/geas/src/config/configuration.c:1.10 
gnue/geas/src/config/configuration.c:1.11
--- gnue/geas/src/config/configuration.c:1.10   Tue May 29 15:28:46 2001
+++ gnue/geas/src/config/configuration.c        Tue May 29 15:54:42 2001
@@ -19,7 +19,7 @@
    along with GEAS; if not, write to the Free Software Foundation, Inc.,
    59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
-   $Id: configuration.c,v 1.10 2001/05/29 22:28:46 reinhard Exp $
+   $Id: configuration.c,v 1.11 2001/05/29 22:54:42 reinhard Exp $
 */
 
 /*
@@ -48,9 +48,9 @@
 #include "configuration.h"
 #include <stdio.h>
 #include <stdlib.h>
+#include <ctype.h>
 #include <string.h>
 #include <glib.h>
-#include "geas-server.h"
 
 /* ========================================================================= *\
  * Private structures
@@ -151,7 +151,8 @@
 alloc_config_item (const char *key, const char *value)
 {
   config_item *i = (config_item *) g_malloc0 (sizeof (config_item));
-  char *p, tmp;
+  char *p;
+  char tmp = '\0';
 
   if (i)
     {
@@ -263,7 +264,7 @@
 {
   const char *adminuser = get_global_option (c, "adminuser");
   int errdone = 0;
-  char *p, *q, *r;
+  char *p, *q;
 
   char buf[256];
   FILE *fp = fopen (shadowpwfile, "r");
@@ -342,7 +343,7 @@
        }
       else
        {
-         printf ("Section: <unknown>\n", c->name);
+         printf ("Section: <unknown>\n");
          for (loop = 0; loop < indent; loop++)
            printf (" ");
          printf ("--------\n");
@@ -381,8 +382,6 @@
   char buf[1024];
   char *p, *q, *retval;
 
-  int onespace = 1;
-
   buf[1023] = '\0';
   while (1)
     {
@@ -446,8 +445,6 @@
 read_main_configuration (configuration_data * c, const char *filename)
 {
   int mode = MODE_GLOBAL;
-  const char *adminuser = get_global_option (c, "adminuser");
-  int errdone = 0;
   char *p, *q, *tmp;
   FILE *fp = fopen (filename, "r");
   int done = 0;