Future/bison
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/bison.git synced 2026-03-16 15:53:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

* src/files.c (tryopen, tryclose): Move to the top.

Browse Source 
Be static.
This commit is contained in:
Akim Demaille
2000-03-31 14:56:00 +00:00
parent cb7db13e45
commit cfe5fbc0a1
2 changed files with 40 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@@ -1,3 +1,8 @@
2000-03-31 Akim Demaille <akim@epita.fr>
* src/files.c (tryopen, tryclose): Move to the top.
Be static.
2000-03-31 Akim Demaille <akim@epita.fr> 2000-03-31 Akim Demaille <akim@epita.fr>
* src/main.c (main): Don't call `done', exit does it. * src/main.c (main): Don't call `done', exit does it.

66
src/files.c
View File

@@ -83,8 +83,6 @@ extern char *getenv();
char *stringappend PARAMS((char *, int, char *)); char *stringappend PARAMS((char *, int, char *));
void openfiles PARAMS((void)); void openfiles PARAMS((void));
void open_extra_files PARAMS((void)); void open_extra_files PARAMS((void));
FILE *tryopen PARAMS((char *, char *)); /* This might be a good idea */
int tryclose PARAMS((FILE *));
extern char *program_name; extern char *program_name;
extern int verboseflag; extern int verboseflag;
@@ -116,7 +114,42 @@ stringappend (char *string1, int end1, char *string2)
return ostring; return ostring;
} }
/*-----------------------------------------------------------------.
| Try to open file NAME with mode MODE, and print an error message |
| if fails. |
`-----------------------------------------------------------------*/
static FILE *
tryopen (char *name, char *mode)
{
FILE *ptr;
ptr = fopen (name, mode);
if (!ptr)
error (2, errno, _("cannot open file `%s'"), name);
return ptr;
}
/*-------------------------------------------------------------.
| Try to close file PTR, and print an error message if fails. |
`-------------------------------------------------------------*/
static int
tryclose (FILE *ptr)
{
int result;
if (ptr == NULL)
return 0;
result = fclose (ptr);
if (result == EOF)
error (2, errno, _("cannot close file"));
return result;
}
/* JF this has been hacked to death. Nowaday it sets up the file names for /* 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 */ the output files, and opens the tmp files and the parser */
void void
@@ -367,35 +400,6 @@ open_extra_files (void)
} }
/* JF to make file opening easier. This func tries to open file
NAME with mode MODE, and prints an error message if it fails. */
FILE *
tryopen (char *name, char *mode)
{
FILE *ptr;
ptr = fopen (name, mode);
if (!ptr)
error (2, errno, _("cannot open file `%s'"), name);
return ptr;
}
int
tryclose (FILE *ptr)
{
int result;
if (ptr == NULL)
return 0;
result = fclose (ptr);
if (result == EOF)
error (2, errno, _("cannot close file"));
return result;
}
void void
done (void) done (void)
{ {