Skip to content

R
riscv-gcc-1
Commit ed35cf6e by Kaveh R. Ghazi Committed by Kaveh Ghazi
Options

gcc.c (xstrerror): Renamed from my_strerror. 

        * gcc.c (xstrerror): Renamed from my_strerror.  All callers
        changed.  Remove prototype since we get that from libiberty.h.
        * protoize.c (xstrerror): Likewise.

From-SVN: r24605
parent 22d9f2cf
Showing with 37 additions and 34 deletions
gcc/ChangeLog
Sat Jan 9 23:54:09 1999 Kaveh R. Ghazi <ghazi@caip.rutgers.edu>
* gcc.c (xstrerror): Renamed from my_strerror. All callers
changed. Remove prototype since we get that from libiberty.h.
* protoize.c (xstrerror): Likewise.
Sat Jan 9 23:22:04 1999 Kaveh R. Ghazi <ghazi@caip.rutgers.edu> Sat Jan 9 23:22:04 1999 Kaveh R. Ghazi <ghazi@caip.rutgers.edu>
* gcc.c (read_specs): Ensure format specifiers match their arguments. * gcc.c (read_specs): Ensure format specifiers match their arguments.
......
gcc/gcc.c
...@@ -74,8 +74,6 @@ static char dir_separator_str[] = {DIR_SEPARATOR, 0}; ...@@ -74,8 +74,6 @@ static char dir_separator_str[] = {DIR_SEPARATOR, 0};
#define GET_ENV_PATH_LIST(VAR,NAME) do { (VAR) = getenv (NAME); } while (0) #define GET_ENV_PATH_LIST(VAR,NAME) do { (VAR) = getenv (NAME); } while (0)
#endif #endif
extern char *my_strerror PROTO((int));
#ifndef HAVE_KILL #ifndef HAVE_KILL
#define kill(p,s) raise(s) #define kill(p,s) raise(s)
#endif #endif
...@@ -1032,7 +1030,7 @@ translate_options (argcp, argvp) ...@@ -1032,7 +1030,7 @@ translate_options (argcp, argvp)
} }
char * char *
my_strerror(e) xstrerror(e)
int e; int e;
{ {
#ifdef HAVE_STRERROR #ifdef HAVE_STRERROR
...@@ -5247,14 +5245,14 @@ static void ...@@ -5247,14 +5245,14 @@ static void
pfatal_with_name (name) pfatal_with_name (name)
char *name; char *name;
{ {
fatal ("%s: %s", name, my_strerror (errno)); fatal ("%s: %s", name, xstrerror (errno));
} }
static void static void
perror_with_name (name) perror_with_name (name)
char *name; char *name;
{ {
error ("%s: %s", name, my_strerror (errno)); error ("%s: %s", name, xstrerror (errno));
} }
static void static void
...@@ -5272,7 +5270,7 @@ pfatal_pexecute (errmsg_fmt, errmsg_arg) ...@@ -5272,7 +5270,7 @@ pfatal_pexecute (errmsg_fmt, errmsg_arg)
errmsg_fmt = msg; errmsg_fmt = msg;
} }
fatal ("%s: %s", errmsg_fmt, my_strerror (save_errno)); fatal ("%s: %s", errmsg_fmt, xstrerror (save_errno));
} }
/* More 'friendly' abort that prints the line and file. /* More 'friendly' abort that prints the line and file.
......
gcc/protoize.c
...@@ -108,8 +108,6 @@ extern char *version_string; ...@@ -108,8 +108,6 @@ extern char *version_string;
extern char *getpwd (); extern char *getpwd ();
extern char * my_strerror PROTO ((int));
static void usage PROTO ((void)) ATTRIBUTE_NORETURN; static void usage PROTO ((void)) ATTRIBUTE_NORETURN;
static void aux_info_corrupted PROTO ((void)) ATTRIBUTE_NORETURN; static void aux_info_corrupted PROTO ((void)) ATTRIBUTE_NORETURN;
static void declare_source_confusing PROTO ((const char *)) ATTRIBUTE_NORETURN; static void declare_source_confusing PROTO ((const char *)) ATTRIBUTE_NORETURN;
...@@ -566,8 +564,8 @@ static char * saved_repl_write_ptr; ...@@ -566,8 +564,8 @@ static char * saved_repl_write_ptr;
static const char *shortpath (); static const char *shortpath ();
char * char *
my_strerror(e) xstrerror(e)
int e; int e;
{ {
#ifdef HAVE_STRERROR #ifdef HAVE_STRERROR
...@@ -755,7 +753,7 @@ safe_write (desc, ptr, len, out_fname) ...@@ -755,7 +753,7 @@ safe_write (desc, ptr, len, out_fname)
continue; continue;
#endif #endif
fprintf (stderr, "%s: error writing file `%s': %s\n", fprintf (stderr, "%s: error writing file `%s': %s\n",
pname, shortpath (NULL, out_fname), my_strerror (errno_val)); pname, shortpath (NULL, out_fname), xstrerror (errno_val));
return; return;
} }
ptr += written; ptr += written;
...@@ -1449,7 +1447,7 @@ find_file (filename, do_not_stat) ...@@ -1449,7 +1447,7 @@ find_file (filename, do_not_stat)
int errno_val = errno; int errno_val = errno;
fprintf (stderr, "%s: %s: can't get status: %s\n", fprintf (stderr, "%s: %s: can't get status: %s\n",
pname, shortpath (NULL, filename), pname, shortpath (NULL, filename),
my_strerror (errno_val)); xstrerror (errno_val));
stat_buf.st_mtime = (time_t) -1; stat_buf.st_mtime = (time_t) -1;
} }
} }
...@@ -2060,14 +2058,14 @@ gen_aux_info_file (base_filename) ...@@ -2060,14 +2058,14 @@ gen_aux_info_file (base_filename)
int errno_val = errno; int errno_val = errno;
fprintf (stderr, "%s: ", pname); fprintf (stderr, "%s: ", pname);
fprintf (stderr, errmsg_fmt, errmsg_arg); fprintf (stderr, errmsg_fmt, errmsg_arg);
fprintf (stderr, ": %s\n", my_strerror (errno_val)); fprintf (stderr, ": %s\n", xstrerror (errno_val));
return 0; return 0;
} }
pid = pwait (pid, &wait_status, 0); pid = pwait (pid, &wait_status, 0);
if (pid == -1) if (pid == -1)
{ {
fprintf (stderr, "%s: wait: %s\n", pname, my_strerror (errno)); fprintf (stderr, "%s: wait: %s\n", pname, xstrerror (errno));
return 0; return 0;
} }
if (WIFSIGNALED (wait_status)) if (WIFSIGNALED (wait_status))
...@@ -2143,7 +2141,7 @@ start_over: ; ...@@ -2143,7 +2141,7 @@ start_over: ;
int errno_val = errno; int errno_val = errno;
fprintf (stderr, "%s: can't read aux info file `%s': %s\n", fprintf (stderr, "%s: can't read aux info file `%s': %s\n",
pname, shortpath (NULL, aux_info_filename), pname, shortpath (NULL, aux_info_filename),
my_strerror (errno_val)); xstrerror (errno_val));
errors++; errors++;
return; return;
} }
...@@ -2172,7 +2170,7 @@ start_over: ; ...@@ -2172,7 +2170,7 @@ start_over: ;
int errno_val = errno; int errno_val = errno;
fprintf (stderr, "%s: can't read aux info file `%s': %s\n", fprintf (stderr, "%s: can't read aux info file `%s': %s\n",
pname, shortpath (NULL, aux_info_filename), pname, shortpath (NULL, aux_info_filename),
my_strerror (errno_val)); xstrerror (errno_val));
errors++; errors++;
return; return;
} }
...@@ -2188,7 +2186,7 @@ start_over: ; ...@@ -2188,7 +2186,7 @@ start_over: ;
int errno_val = errno; int errno_val = errno;
fprintf (stderr, "%s: can't get status of aux info file `%s': %s\n", fprintf (stderr, "%s: can't get status of aux info file `%s': %s\n",
pname, shortpath (NULL, aux_info_filename), pname, shortpath (NULL, aux_info_filename),
my_strerror (errno_val)); xstrerror (errno_val));
errors++; errors++;
return; return;
} }
...@@ -2216,7 +2214,7 @@ start_over: ; ...@@ -2216,7 +2214,7 @@ start_over: ;
int errno_val = errno; int errno_val = errno;
fprintf (stderr, "%s: can't get status of aux info file `%s': %s\n", fprintf (stderr, "%s: can't get status of aux info file `%s': %s\n",
pname, shortpath (NULL, base_source_filename), pname, shortpath (NULL, base_source_filename),
my_strerror (errno_val)); xstrerror (errno_val));
errors++; errors++;
return; return;
} }
...@@ -2238,7 +2236,7 @@ start_over: ; ...@@ -2238,7 +2236,7 @@ start_over: ;
int errno_val = errno; int errno_val = errno;
fprintf (stderr, "%s: can't open aux info file `%s' for reading: %s\n", fprintf (stderr, "%s: can't open aux info file `%s' for reading: %s\n",
pname, shortpath (NULL, aux_info_filename), pname, shortpath (NULL, aux_info_filename),
my_strerror (errno_val)); xstrerror (errno_val));
return; return;
} }
...@@ -2256,7 +2254,7 @@ start_over: ; ...@@ -2256,7 +2254,7 @@ start_over: ;
int errno_val = errno; int errno_val = errno;
fprintf (stderr, "%s: error reading aux info file `%s': %s\n", fprintf (stderr, "%s: error reading aux info file `%s': %s\n",
pname, shortpath (NULL, aux_info_filename), pname, shortpath (NULL, aux_info_filename),
my_strerror (errno_val)); xstrerror (errno_val));
free (aux_info_base); free (aux_info_base);
close (aux_info_file); close (aux_info_file);
return; return;
...@@ -2269,7 +2267,7 @@ start_over: ; ...@@ -2269,7 +2267,7 @@ start_over: ;
int errno_val = errno; int errno_val = errno;
fprintf (stderr, "%s: error closing aux info file `%s': %s\n", fprintf (stderr, "%s: error closing aux info file `%s': %s\n",
pname, shortpath (NULL, aux_info_filename), pname, shortpath (NULL, aux_info_filename),
my_strerror (errno_val)); xstrerror (errno_val));
free (aux_info_base); free (aux_info_base);
close (aux_info_file); close (aux_info_file);
return; return;
...@@ -2285,7 +2283,7 @@ start_over: ; ...@@ -2285,7 +2283,7 @@ start_over: ;
int errno_val = errno; int errno_val = errno;
fprintf (stderr, "%s: can't delete aux info file `%s': %s\n", fprintf (stderr, "%s: can't delete aux info file `%s': %s\n",
pname, shortpath (NULL, aux_info_filename), pname, shortpath (NULL, aux_info_filename),
my_strerror (errno_val)); xstrerror (errno_val));
} }
/* Save a pointer into the first line of the aux_info file which /* Save a pointer into the first line of the aux_info file which
...@@ -2353,7 +2351,7 @@ start_over: ; ...@@ -2353,7 +2351,7 @@ start_over: ;
int errno_val = errno; int errno_val = errno;
fprintf (stderr, "%s: can't delete file `%s': %s\n", fprintf (stderr, "%s: can't delete file `%s': %s\n",
pname, shortpath (NULL, aux_info_filename), pname, shortpath (NULL, aux_info_filename),
my_strerror (errno_val)); xstrerror (errno_val));
return; return;
} }
must_create = 1; must_create = 1;
...@@ -2430,7 +2428,7 @@ rename_c_file (hp) ...@@ -2430,7 +2428,7 @@ rename_c_file (hp)
int errno_val = errno; int errno_val = errno;
fprintf (stderr, "%s: warning: can't link file `%s' to `%s': %s\n", fprintf (stderr, "%s: warning: can't link file `%s' to `%s': %s\n",
pname, shortpath (NULL, filename), pname, shortpath (NULL, filename),
shortpath (NULL, new_filename), my_strerror (errno_val)); shortpath (NULL, new_filename), xstrerror (errno_val));
errors++; errors++;
return; return;
} }
...@@ -2439,7 +2437,7 @@ rename_c_file (hp) ...@@ -2439,7 +2437,7 @@ rename_c_file (hp)
{ {
int errno_val = errno; int errno_val = errno;
fprintf (stderr, "%s: warning: can't delete file `%s': %s\n", fprintf (stderr, "%s: warning: can't delete file `%s': %s\n",
pname, shortpath (NULL, filename), my_strerror (errno_val)); pname, shortpath (NULL, filename), xstrerror (errno_val));
errors++; errors++;
return; return;
} }
...@@ -4144,7 +4142,7 @@ edit_file (hp) ...@@ -4144,7 +4142,7 @@ edit_file (hp)
int errno_val = errno; int errno_val = errno;
fprintf (stderr, "%s: can't get status for file `%s': %s\n", fprintf (stderr, "%s: can't get status for file `%s': %s\n",
pname, shortpath (NULL, convert_filename), pname, shortpath (NULL, convert_filename),
my_strerror (errno_val)); xstrerror (errno_val));
return; return;
} }
orig_size = stat_buf.st_size; orig_size = stat_buf.st_size;
...@@ -4180,7 +4178,7 @@ edit_file (hp) ...@@ -4180,7 +4178,7 @@ edit_file (hp)
int errno_val = errno; int errno_val = errno;
fprintf (stderr, "%s: can't open file `%s' for reading: %s\n", fprintf (stderr, "%s: can't open file `%s' for reading: %s\n",
pname, shortpath (NULL, convert_filename), pname, shortpath (NULL, convert_filename),
my_strerror (errno_val)); xstrerror (errno_val));
return; return;
} }
...@@ -4195,7 +4193,7 @@ edit_file (hp) ...@@ -4195,7 +4193,7 @@ edit_file (hp)
close (input_file); close (input_file);
fprintf (stderr, "\n%s: error reading input file `%s': %s\n", fprintf (stderr, "\n%s: error reading input file `%s': %s\n",
pname, shortpath (NULL, convert_filename), pname, shortpath (NULL, convert_filename),
my_strerror (errno_val)); xstrerror (errno_val));
return; return;
} }
...@@ -4229,7 +4227,7 @@ edit_file (hp) ...@@ -4229,7 +4227,7 @@ edit_file (hp)
int errno_val = errno; int errno_val = errno;
fprintf (stderr, "%s: can't create/open clean file `%s': %s\n", fprintf (stderr, "%s: can't create/open clean file `%s': %s\n",
pname, shortpath (NULL, clean_filename), pname, shortpath (NULL, clean_filename),
my_strerror (errno_val)); xstrerror (errno_val));
return; return;
} }
...@@ -4339,7 +4337,7 @@ edit_file (hp) ...@@ -4339,7 +4337,7 @@ edit_file (hp)
pname, pname,
shortpath (NULL, convert_filename), shortpath (NULL, convert_filename),
shortpath (NULL, new_filename), shortpath (NULL, new_filename),
my_strerror (errno_val)); xstrerror (errno_val));
return; return;
} }
} }
...@@ -4350,7 +4348,7 @@ edit_file (hp) ...@@ -4350,7 +4348,7 @@ edit_file (hp)
int errno_val = errno; int errno_val = errno;
fprintf (stderr, "%s: can't delete file `%s': %s\n", fprintf (stderr, "%s: can't delete file `%s': %s\n",
pname, shortpath (NULL, convert_filename), pname, shortpath (NULL, convert_filename),
my_strerror (errno_val)); xstrerror (errno_val));
return; return;
} }
...@@ -4364,7 +4362,7 @@ edit_file (hp) ...@@ -4364,7 +4362,7 @@ edit_file (hp)
int errno_val = errno; int errno_val = errno;
fprintf (stderr, "%s: can't create/open output file `%s': %s\n", fprintf (stderr, "%s: can't create/open output file `%s': %s\n",
pname, shortpath (NULL, convert_filename), pname, shortpath (NULL, convert_filename),
my_strerror (errno_val)); xstrerror (errno_val));
return; return;
} }
...@@ -4393,7 +4391,7 @@ edit_file (hp) ...@@ -4393,7 +4391,7 @@ edit_file (hp)
int errno_val = errno; int errno_val = errno;
fprintf (stderr, "%s: can't change mode of file `%s': %s\n", fprintf (stderr, "%s: can't change mode of file `%s': %s\n",
pname, shortpath (NULL, convert_filename), pname, shortpath (NULL, convert_filename),
my_strerror (errno_val)); xstrerror (errno_val));
} }
/* Note: We would try to change the owner and group of the output file /* Note: We would try to change the owner and group of the output file
...@@ -4537,7 +4535,7 @@ main (argc, argv) ...@@ -4537,7 +4535,7 @@ main (argc, argv)
if (!cwd_buffer) if (!cwd_buffer)
{ {
fprintf (stderr, "%s: cannot get working directory: %s\n", fprintf (stderr, "%s: cannot get working directory: %s\n",
pname, my_strerror(errno)); pname, xstrerror(errno));
exit (FATAL_EXIT_CODE); exit (FATAL_EXIT_CODE);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment