* src/files.c: Formatting changes.

(tryopen, tryclose, openfiles): Rename as...
(xfopen, xfclose, open_files): this.
(stringappend): static.
* src/files.h: Complete the list of exported symbols.
Propagate its use.

ChangeLog

@@ -1,3 +1,13 @@
+2000-10-02  Akim Demaille  <akim@epita.fr>
+
+	* src/files.c: Formatting changes.
+	(tryopen, tryclose, openfiles): Rename as...
+	(xfopen, xfclose, open_files): this.
+	(stringappend): static.
+	* src/files.h: Complete the list of exported symbols.
+	Propagate its use.
+
+	
 2000-10-02  Akim Demaille  <akim@epita.fr>
 
 	* src/reader.h: New file.

src/files.c

@@ -74,16 +74,12 @@ static char *tmpdefsfile;
 extern char *mktemp ();		/* So the compiler won't complain */
 extern char *getenv ();
 
-extern char *stringappend PARAMS((const char *, int, const char *));
-extern void openfiles PARAMS((void));
-extern void open_extra_files PARAMS((void));
-
 int fixed_outfiles = 0;
 
 extern char *program_name;
 
 
-char *
+static char *
 stringappend (const char *string1, int end1, const char *string2)
 {
   register char *ostring;
@@ -93,7 +89,8 @@ stringappend (const char *string1, int end1, const char *string2)
 
   cp1 = string2;
   i = 0;
-  while (*cp1++) i++;
+  while (*cp1++)
+    i++;
 
   ostring = NEW2 (i + end1 + 1, char);
 
@@ -115,7 +112,7 @@ stringappend (const char *string1, int end1, const char *string2)
 `-----------------------------------------------------------------*/
 
 static FILE *
-tryopen (const char *name, const char *mode)
+xfopen (const char *name, const char *mode)
 {
   FILE *ptr;
 
@@ -131,7 +128,7 @@ tryopen (const char *name, const char *mode)
 `-------------------------------------------------------------*/
 
 static int
-tryclose (FILE *ptr)
+xfclose (FILE *ptr)
 {
   int result;
 
@@ -148,7 +145,7 @@ tryclose (FILE *ptr)
 /* JF this has been hacked to death.  Nowaday it sets up the file names for
    the output files, and opens the tmp files and the parser */
 void
-openfiles (void)
+open_files (void)
 {
   char *name_base;
 #ifdef MSDOS
@@ -258,7 +255,7 @@ openfiles (void)
       base_length = short_base_length + 4;
     }
 
-  finput = tryopen(infile, "r");
+  finput = xfopen (infile, "r");
 
   if (!noparserflag)
     {
@@ -275,7 +272,7 @@ openfiles (void)
 	  strcpy (cp, PFILE);
 	}
 #endif /* MSDOS */
-      fparser = tryopen(filename ? filename : PFILE, "r");
+      fparser = xfopen (filename ? filename : PFILE, "r");
     }
 
   if (verboseflag)
@@ -287,14 +284,14 @@ openfiles (void)
          but that conflicts with Posix.  */
       outfile = stringappend (name_base, short_base_length, ".output");
 #endif
-      foutput = tryopen(outfile, "w");
+      foutput = xfopen (outfile, "w");
     }
 
   if (noparserflag)
     {
       /* use permanent name for actions file */
       actfile = stringappend (name_base, short_base_length, ".act");
-      faction = tryopen(actfile, "w");
+      faction = xfopen (actfile, "w");
     }
 
 #ifdef MSDOS
@@ -312,14 +309,14 @@ openfiles (void)
 #endif /* not MSDOS */
 
   if (!noparserflag)
-    faction = tryopen(actfile, "w+");
+    faction = xfopen (actfile, "w+");
-  fattrs = tryopen(tmpattrsfile,"w+");
+  fattrs = xfopen (tmpattrsfile, "w+");
-  ftable = tryopen(tmptabfile, "w+");
+  ftable = xfopen (tmptabfile, "w+");
 
   if (definesflag)
     {
       defsfile = stringappend (name_base, base_length, ".h");
-      fdefines = tryopen(tmpdefsfile, "w+");
+      fdefines = xfopen (tmpdefsfile, "w+");
     }
 
 #if !(defined (MSDOS) || (defined(_WIN32) && !defined(__CYGWIN32__)))
@@ -367,7 +364,7 @@ open_extra_files (void)
   char *cp;
 #endif
 
-  tryclose(fparser);
+  xfclose (fparser);
 
   if (!noparserflag)
     {
@@ -384,30 +381,30 @@ open_extra_files (void)
 	  strcpy (cp, PFILE1);
 	}
 #endif
-      fparser= tryopen(filename ? filename : PFILE1, "r");
+      fparser = xfopen (filename ? filename : PFILE1, "r");
     }
 
   /* JF change from inline attrs file to separate one */
-  ftmp = tryopen(attrsfile, "w");
+  ftmp = xfopen (attrsfile, "w");
   rewind (fattrs);
   while ((c = getc (fattrs)) != EOF)	/* Thank god for buffering */
     putc (c, ftmp);
-  tryclose(fattrs);
+  xfclose (fattrs);
   fattrs = ftmp;
 
-  fguard = tryopen(guardfile, "w");
+  fguard = xfopen (guardfile, "w");
 
 }
 
 void
 done (void)
 {
-  tryclose(faction);
+  xfclose (faction);
-  tryclose(fattrs);
+  xfclose (fattrs);
-  tryclose(fguard);
+  xfclose (fguard);
-  tryclose(finput);
+  xfclose (finput);
-  tryclose(fparser);
+  xfclose (fparser);
-  tryclose(foutput);
+  xfclose (foutput);
 
   /* JF write out the output file */
   if (!complain_message_count && ftable)
@@ -415,22 +412,22 @@ done (void)
       FILE *ftmp;
       register int c;
 
-      ftmp=tryopen(tabfile, "w");
+      ftmp = xfopen (tabfile, "w");
       rewind (ftable);
       while ((c = getc (ftable)) != EOF)
 	putc (c, ftmp);
-      tryclose(ftmp);
+      xfclose (ftmp);
-      tryclose(ftable);
+      xfclose (ftable);
 
       if (definesflag)
 	{
-          ftmp = tryopen(defsfile, "w");
+	  ftmp = xfopen (defsfile, "w");
 	  fflush (fdefines);
 	  rewind (fdefines);
 	  while ((c = getc (fdefines)) != EOF)
 	    putc (c, ftmp);
-          tryclose(ftmp);
+	  xfclose (ftmp);
-          tryclose(fdefines);
+	  xfclose (fdefines);
 	}
     }
 
@@ -447,10 +444,14 @@ done (void)
   sys$exit(SS$_ABORT); */
 #else
 #if (defined (MSDOS) || (defined(_WIN32) && !defined(__CYGWIN32__)))
-  if (actfile && ! noparserflag) unlink(actfile);
+  if (actfile && !noparserflag)
-  if (tmpattrsfile) unlink(tmpattrsfile);
+    unlink (actfile);
-  if (tmptabfile) unlink(tmptabfile);
+  if (tmpattrsfile)
-  if (tmpdefsfile) unlink(tmpdefsfile);
+    unlink (tmpattrsfile);
+  if (tmptabfile)
+    unlink (tmptabfile);
+  if (tmpdefsfile)
+    unlink (tmpdefsfile);
 #endif /* MSDOS || (_WIN32 && !__CYGWIN32__) */
 /* Don't call exit again, we're in atexit ().
   exit (complain_message_count ? 1 : 0); */

src/files.h

@@ -53,4 +53,7 @@ extern char *attrsfile;
 extern char *guardfile;
 extern char *actfile;
 
-extern void done PARAMS((void));
+void open_files PARAMS((void));
+void open_extra_files PARAMS((void));
+
+void done PARAMS((void));

src/main.c

@@ -41,7 +41,6 @@ extern void berror PARAMS((const char *));
 
 extern char *printable_version PARAMS ((int));
 
-extern void openfiles PARAMS ((void));
 extern void reduce_grammar PARAMS ((void));
 extern void set_nullable PARAMS ((void));
 extern void free_nullable PARAMS ((void));
@@ -68,7 +67,7 @@ main (int argc, char *argv[])
   /* Be ready to clean up if we exit. */
   atexit (done);
 
-  openfiles ();
+  open_files ();
 
   /* Read the input.  Copy some parts of it to FGUARD, FACTION, FTABLE
      and FATTRS.  In file reader.c.  The other parts are recorded in

src/reader.c

@@ -63,7 +63,6 @@ extern int maxtoken;
 
 extern void tabinit PARAMS ((void));
 extern void free_symtab PARAMS ((void));
-extern void open_extra_files PARAMS ((void));
 extern char *printable_version PARAMS ((int));
 
 typedef struct symbol_list