Eliminate some -Wall warnings.

1 files changed, 14 insertions, 12 deletions

diff --git a/lib-src/sorted-doc.c b/lib-src/sorted-doc.c
index 129ce9c83b3..0ba419d4907 100644
--- a/lib-src/sorted-doc.c
+++ b/lib-src/sorted-doc.c
@@ -35,17 +35,9 @@ struct docstr			/* Allocated thing for an entry. */
 };
 
 
-/* Print error message and exit.  */
-
-fatal (s1, s2)
-     char *s1, *s2;
-{
-  error (s1, s2);
-  exit (1);
-}
-
 /* Print error message.  `s1' is printf control string, `s2' is arg for it. */
 
+void
 error (s1, s2)
      char *s1, *s2;
 {
@@ -54,6 +46,16 @@ error (s1, s2)
   fprintf (stderr, "\n");
 }
 
+/* Print error message and exit.  */
+
+void
+fatal (s1, s2)
+     char *s1, *s2;
+{
+  error (s1, s2);
+  exit (1);
+}
+
 /* Like malloc but get fatal error if memory is exhausted.  */
 
 char *
@@ -67,7 +69,7 @@ xmalloc (size)
 }
 
 char *
-strsav (str)
+xstrdup (str)
      char * str;
 {
   char *buf = xmalloc (strlen (str) + 1);
@@ -98,12 +100,12 @@ char *states[] =
   "WAITING", "BEG_NAME", "NAME_GET", "BEG_DESC", "DESC_GET"
 };
     
+int
 main ()
 {
   register DOCSTR *dp = NULL;	/* allocated DOCSTR */
   register LINE *lp = NULL;	/* allocated line */
   register char *bp;		/* ptr inside line buffer */
-  int notfirst = 0;		/* set after read something */
   register enum state state = WAITING; /* state at start */
   int cnt = 0;			/* number of DOCSTRs read */
 
@@ -169,7 +171,7 @@ main ()
 	  else			/* saving and changing state */
 	    {
 	      *bp = NUL;
-	      bp = strsav (buf);
+	      bp = xstrdup (buf);
 
 	      if (state == NAME_GET)
 		dp->name = bp;