/* fix-header.c - Make C header file suitable for C++.
- Copyright (C) 1993, 1994, 1995, 1996 Free Software Foundation, Inc.
+ Copyright (C) 1993, 1994, 1995, 1996, 1997, 1998,
+ 1999, 2000 Free Software Foundation, Inc.
This program is free software; you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
/* This program massages a system include file (such as stdio.h),
- into a form more conforming with ANSI/POSIX, and more suitable for C++:
+ into a form that is compatible with GNU C and GNU C++.
* extern "C" { ... } braces are added (inside #ifndef __cplusplus),
if they seem to be needed. These prevent C++ compilers from name
an argument list), and it is a "standard" function listed in
the file sys-protos.h (and with a non-empty argument list), then
the declaration is converted to a complete prototype by replacing
- the empty parameter list with the argument lust from sys-protos.h.
+ the empty parameter list with the argument list from sys-protos.h.
* The program can be given a list of (names of) required standard
functions (such as fclose for stdio.h). If a required function
if anything needs to be done. (e.g. ./include/stdio.h)
* OPTIONS are such as you would pass to cpp.
- Written by Per Bothner <bothner@cygnus.com>, July 1993. */
+ Written by Per Bothner <bothner@cygnus.com>, July 1993. */
-#include <stdio.h>
-#include <ctype.h>
#include "hconfig.h"
+#include "system.h"
#include "obstack.h"
#include "scan.h"
#include "cpplib.h"
-#include "gansidecl.h"
-#ifndef O_RDONLY
-#define O_RDONLY 0
-#endif
+static void v_fatal PARAMS ((const char *, va_list)) ATTRIBUTE_NORETURN;
+static void fatal PARAMS ((const char *, ...)) ATTRIBUTE_PRINTF_1 ATTRIBUTE_NORETURN;
sstring buf;
#include "xsys-protos.h"
#ifdef FIXPROTO_IGNORE_LIST
-/* This is a currently unused feature. */
+/* This is a currently unused feature. */
/* List of files and directories to ignore.
A directory name (ending in '/') means ignore anything in that
enum special_file
{
no_special,
+#ifdef errno_h
+#undef errno_h
+#endif
errno_h,
+#ifdef stdio_h
+#undef stdio_h
+#endif
stdio_h,
+#ifdef stdlib_h
+#undef stdlib_h
+#endif
stdlib_h,
+#ifdef sys_stat_h
+#undef sys_stat_h
+#endif
sys_stat_h
};
/* A NAMELIST is a sequence of names, separated by '\0', and terminated
- by an empty name (i.e. by "\0\0"). */
+ by an empty name (i.e. by "\0\0"). */
-typedef const char* namelist;
+typedef const char *namelist;
-/* The following macros provide the bits for symbol_flags. */
+/* The following macros provide the bits for symbol_flags. */
typedef int symbol_flags;
-/* Used to mark names defined in the ANSI/ISO C standard. */
+/* Used to mark names defined in the ANSI/ISO C standard. */
#define ANSI_SYMBOL 1
-/* Used to mark names defined in the Posix.1 or Posix.2 standard. */
+/* We no longer massage include files for POSIX or XOPEN symbols,
+ as there are now several versions of the POSIX and XOPEN standards,
+ and it would be a maintenance nightmare for us to track them all.
+ Better to be compatible with the system include files. */
+/*#define ADD_MISSING_POSIX 1 */
+/*#define ADD_MISSING_XOPEN 1 */
+
+#if ADD_MISSING_POSIX
+/* Used to mark names defined in the Posix.1 or Posix.2 standard. */
#define POSIX1_SYMBOL 2
#define POSIX2_SYMBOL 4
+#else
+#define POSIX1_SYMBOL 0
+#define POSIX2_SYMBOL 0
+#endif
-/* Used to mark names defined in X/Open Portability Guide. */
+#if ADD_MISSING_XOPEN
+/* Used to mark names defined in X/Open Portability Guide. */
#define XOPEN_SYMBOL 8
-/* Used to mark names defined in X/Open UNIX Extensions. */
+/* Used to mark names defined in X/Open UNIX Extensions. */
#define XOPEN_EXTENDED_SYMBOL 16
+#else
+#define XOPEN_SYMBOL 0
+#define XOPEN_EXTENDED_SYMBOL 0
+#endif
/* Used to indicate names that are not functions */
#define MACRO_SYMBOL 512
struct symbol_list symbol_table[SYMBOL_TABLE_SIZE];
int cur_symbol_table_size;
-void
+static void add_symbols PARAMS ((symbol_flags, namelist));
+static struct fn_decl *lookup_std_proto PARAMS ((const char *, int));
+static void write_lbrac PARAMS ((void));
+static void recognized_macro PARAMS ((const char *));
+static void check_macro_names PARAMS ((cpp_reader *, namelist));
+static void read_scan_file PARAMS ((char *, int, char **));
+static void write_rbrac PARAMS ((void));
+static int inf_skip_spaces PARAMS ((int));
+static int inf_read_upto PARAMS ((sstring *, int));
+static int inf_scan_ident PARAMS ((sstring *, int));
+static int check_protection PARAMS ((int *, int *));
+
+static void
add_symbols (flags, names)
symbol_flags flags;
namelist names;
cur_symbol_table_size++;
if (cur_symbol_table_size >= SYMBOL_TABLE_SIZE)
fatal ("too many calls to add_symbols");
- symbol_table[cur_symbol_table_size].names = NULL; /* Termination. */
+ symbol_table[cur_symbol_table_size].names = NULL; /* Termination. */
}
struct std_include_entry {
namelist names;
};
-const char NONE[] = ""; /* The empty namelist. */
+const char NONE[] = ""; /* The empty namelist. */
-/* Special name to indicate a continuation line in std_include_table. */
+/* Special name to indicate a continuation line in std_include_table. */
const char CONTINUED[] = "";
struct std_include_entry *include_entry;
{ "errno.h", ANSI_SYMBOL|MACRO_SYMBOL, "errno\0" },
- /* ANSI_SYMBOL is wrong, but ... */
+ /* ANSI_SYMBOL is wrong, but ... */
{ "curses.h", ANSI_SYMBOL, "box\0delwin\0endwin\0getcurx\0getcury\0initscr\0\
mvcur\0mvwprintw\0mvwscanw\0newwin\0overlay\0overwrite\0\
scroll\0subwin\0touchwin\0waddstr\0wclear\0wclrtobot\0wclrtoeol\0\
{ "pwd.h", POSIX1_SYMBOL, "getpwnam\0getpwuid\0" },
- /* Left out siglongjmp sigsetjmp - these depend on sigjmp_buf. */
+ /* Left out siglongjmp sigsetjmp - these depend on sigjmp_buf. */
{ "setjmp.h", ANSI_SYMBOL, "longjmp\0setjmp\0" },
/* Left out signal() - its prototype is too complex for us!
Also left out "sigaction sigaddset sigdelset sigemptyset
sigfillset sigismember sigpending sigprocmask sigsuspend"
because these need sigset_t or struct sigaction.
- Most systems that provide them will also declare them. */
+ Most systems that provide them will also declare them. */
{ "signal.h", ANSI_SYMBOL, "kill\0raise\0" },
{ "stdio.h", ANSI_SYMBOL,
"clearerr\0fclose\0feof\0ferror\0fflush\0fgetc\0fgetpos\0\
fgets\0fopen\0fprintf\0fputc\0fputs\0fread\0freopen\0fscanf\0fseek\0\
-fsetpos\0ftell\0fwrite\0getc\0getchar\0gets\00perror\0popen\0\
+fsetpos\0ftell\0fwrite\0getc\0getchar\0gets\0perror\0\
printf\0putc\0putchar\0puts\0remove\0rename\0rewind\0scanf\0setbuf\0\
setvbuf\0sprintf\0sscanf\0vprintf\0vsprintf\0vfprintf\0tmpfile\0\
tmpnam\0ungetc\0" },
{ CONTINUED, POSIX1_SYMBOL, "fdopen\0fileno\0" },
- { CONTINUED, POSIX2_SYMBOL, "pclose\0popen\0" }, /* I think ... */
+ { CONTINUED, POSIX2_SYMBOL, "pclose\0popen\0" }, /* I think ... */
/* Should perhaps also handle NULL, EOF, ... ? */
/* "div ldiv", - ignored because these depend on div_t, ldiv_t
/* Actually, XPG4 does not seem to have <sys/ioctl.h>, but defines
ioctl in <strops.h>. However, many systems have it is sys/ioctl.h,
- and many systems do have <sys/ioctl.h> but not <strops.h>. */
+ and many systems do have <sys/ioctl.h> but not <strops.h>. */
{ "sys/ioctl.h", XOPEN_EXTENDED_SYMBOL, "ioctl\0" },
{ "sys/socket.h", XOPEN_EXTENDED_SYMBOL, "socket\0" },
ttyname\0unlink\0write\0" },
{ CONTINUED, POSIX2_SYMBOL, "getopt\0" },
{ CONTINUED, XOPEN_EXTENDED_SYMBOL,
- "lockf\0gethostid\0gethostname\0readlink\0" },
+ "lockf\0gethostid\0gethostname\0readlink\0symlink\0" },
{ "utime.h", POSIX1_SYMBOL, "utime\0" },
enum special_file special_file_handling = no_special;
-/* They are set if the corresponding macro has been seen. */
+/* They are set if the corresponding macro has been seen. */
/* The following are only used when handling sys/stat.h */
int seen_S_IFBLK = 0, seen_S_ISBLK = 0;
int seen_S_IFCHR = 0, seen_S_ISCHR = 0;
/* The following are only used when handling stdlib.h */
int seen_EXIT_FAILURE = 0, seen_EXIT_SUCCESS = 0;
\f
-/* Wrapper around free, to avoid prototype clashes. */
-
-void
-xfree (ptr)
- char *ptr;
-{
- free (ptr);
-}
-
-/* Avoid error if config defines abort as fancy_abort.
- It's not worth "really" implementing this because ordinary
- compiler users never run fix-header. */
-
-void
-fancy_abort ()
-{
- abort ();
-}
-\f
#define obstack_chunk_alloc xmalloc
-#define obstack_chunk_free xfree
+#define obstack_chunk_free free
struct obstack scan_file_obstack;
/* NOTE: If you edit this, also edit gen-protos.c !! */
-struct fn_decl *
+
+static struct fn_decl *
lookup_std_proto (name, name_length)
const char *name;
int name_length;
{
- int i = hashf (name, name_length, HASH_SIZE);
+ int i = hashstr (name, name_length) % HASH_SIZE;
int i0 = i;
for (;;)
{
if (hash_tab[i] == 0)
return NULL;
fn = &std_protos[hash_tab[i]];
- if (strlen (fn->fname) == name_length
+ if ((int) strlen (fn->fname) == name_length
&& strncmp (fn->fname, name, name_length) == 0)
return fn;
i = (i+1) % HASH_SIZE;
char *inc_filename;
int inc_filename_length;
-char *progname = "fix-header";
+const char *progname = "fix-header";
FILE *outf;
sstring line;
int required_unseen_count = 0;
int required_other = 0;
-void
+static void
write_lbrac ()
{
#define SET_SEEN(FN) ((FN)->partial = &seen_dummy_proto)
#define SEEN(FN) ((FN)->partial == &seen_dummy_proto)
-void
+static void
recognized_macro (fname)
- char *fname;
+ const char *fname;
{
- /* The original include file defines fname as a macro. */
+ /* The original include file defines fname as a macro. */
struct fn_decl *fn = lookup_std_proto (fname, strlen (fname));
- /* Since fname is a macro, don't require a prototype for it. */
+ /* Since fname is a macro, don't require a prototype for it. */
if (fn)
{
if (REQUIRED (fn))
else if (strcmp (fname, "S_IFREG") == 0) seen_S_IFREG++;
else if (strcmp (fname, "S_ISREG") == 0) seen_S_ISREG++;
}
+ break;
+
+ default:
+ break;
}
}
void
recognized_extern (name, name_length, type, type_length)
- char *name;
- char *type;
- int name_length, type_length;
+ const char *name;
+ const char *type ATTRIBUTE_UNUSED;
+ int name_length, type_length ATTRIBUTE_UNUSED;
{
switch (special_file_handling)
{
case errno_h:
- if (strcmp (name, "errno") == 0 && !seen_errno)
+ if (name_length == 5 && strncmp (name, "errno", 5) == 0 && !seen_errno)
seen_errno = 1, required_other--;
break;
+
+ default:
+ break;
}
}
KIND is 'I' for an inline function;
'F' if a normal function declaration preceded by 'extern "C"'
(or nested inside 'extern "C"' braces); or
- 'f' for other function declarations. */
+ 'f' for other function declarations. */
void
recognized_function (fname, fname_length,
kind, rtype, rtype_length,
have_arg_list, file_seen, line_seen)
- char *fname;
+ const char *fname;
int fname_length;
int kind; /* One of 'f' 'F' or 'I' */
- char *rtype;
+ const char *rtype;
int rtype_length;
int have_arg_list;
- char *file_seen;
+ const char *file_seen;
int line_seen;
{
struct partial_proto *partial;
fn = lookup_std_proto (fname, fname_length);
- /* Remove the function from the list of required function. */
+ /* Remove the function from the list of required function. */
if (fn)
{
if (REQUIRED (fn))
SET_SEEN (fn);
}
- /* If we have a full prototype, we're done. */
+ /* If we have a full prototype, we're done. */
if (have_arg_list)
return;
return;
/* If the partial prototype was included from some other file,
- we don't need to patch it up (in this run). */
+ we don't need to patch it up (in this run). */
i = strlen (file_seen);
if (i < inc_filename_length
|| strcmp (inc_filename, file_seen + (i - inc_filename_length)) != 0)
if (fn == NULL)
return;
- if (fn->params[0] == '\0' || strcmp (fn->params, "void") == 0)
+ if (fn->params[0] == '\0')
return;
/* We only have a partial function declaration,
- so remember that we have to add a complete prototype. */
+ so remember that we have to add a complete prototype. */
partial_count++;
- partial = (struct partial_proto*)
+ partial = (struct partial_proto *)
obstack_alloc (&scan_file_obstack, sizeof (struct partial_proto));
partial->fname = obstack_alloc (&scan_file_obstack, fname_length + 1);
bcopy (fname, partial->fname, fname_length);
}
/* For any name in NAMES that is defined as a macro,
- call recognized_macro on it. */
+ call recognized_macro on it. */
-void
+static void
check_macro_names (pfile, names)
- struct parse_file *pfile;
+ cpp_reader *pfile;
namelist names;
{
+ size_t len;
while (*names)
{
- if (cpp_lookup (pfile, names, -1, -1))
+ len = strlen (names);
+ if (cpp_defined (pfile, names, len))
recognized_macro (names);
- names += strlen (names) + 1;
+ names += len + 1;
}
}
-void
+static void
read_scan_file (in_fname, argc, argv)
char *in_fname;
int argc;
char **argv;
{
cpp_reader scan_in;
- cpp_options scan_options;
struct fn_decl *fn;
int i;
register struct symbol_list *cur_symbols;
obstack_init (&scan_file_obstack);
- init_parse_file (&scan_in);
- scan_in.data = &scan_options;
- init_parse_options (&scan_options);
+ cpp_reader_init (&scan_in);
+ /* We are going to be scanning a header file out of its proper context,
+ so ignore warnings and errors. */
+ CPP_OPTION (&scan_in, inhibit_warnings) = 1;
+ CPP_OPTION (&scan_in, inhibit_errors) = 1;
i = cpp_handle_options (&scan_in, argc, argv);
- if (i < argc)
- fatal ("Invalid option `%s'", argv[i]);
- push_parse_file (&scan_in, in_fname);
- CPP_OPTIONS (&scan_in)->no_line_commands = 1;
+ if (i < argc && ! CPP_FATAL_ERRORS (&scan_in))
+ cpp_fatal (&scan_in, "Invalid option `%s'", argv[i]);
+ if (CPP_FATAL_ERRORS (&scan_in))
+ exit (FATAL_EXIT_CODE);
+
+ if (! cpp_start_read (&scan_in, 0, in_fname))
+ exit (FATAL_EXIT_CODE);
+
+ /* We are scanning a system header, so mark it as such. */
+ CPP_BUFFER (&scan_in)->system_header_p = 1;
scan_decls (&scan_in, argc, argv);
for (cur_symbols = &symbol_table[0]; cur_symbols->names; cur_symbols++)
fprintf (stderr, "(%s: %d errors and %d warnings from cpp)\n",
inc_filename, scan_in.errors, warnings);
if (scan_in.errors)
- exit (0);
+ exit (SUCCESS_EXIT_CODE);
/* Traditionally, getc and putc are defined in terms of _filbuf and _flsbuf.
- If so, those functions are also required. */
+ If so, those functions are also required. */
if (special_file_handling == stdio_h
&& (fn = lookup_std_proto ("_filbuf", 7)) != NULL)
{
static char getchar_call[] = "getchar();";
- cpp_buffer *buf =
- cpp_push_buffer (&scan_in, getchar_call, sizeof(getchar_call) - 1);
int old_written = CPP_WRITTEN (&scan_in);
int seen_filbuf = 0;
+ cpp_buffer *buf = CPP_BUFFER (&scan_in);
+ if (cpp_push_buffer (&scan_in, getchar_call,
+ sizeof(getchar_call) - 1) == NULL)
+ return;
- /* Scan the macro expansion of "getchar();". */
+ /* Scan the macro expansion of "getchar();". */
for (;;)
{
- enum cpp_token token = cpp_get_token (&scan_in);
+ enum cpp_ttype token = cpp_get_token (&scan_in);
int length = CPP_WRITTEN (&scan_in) - old_written;
+ unsigned char *id = scan_in.token_buffer + old_written;
+
CPP_SET_WRITTEN (&scan_in, old_written);
- if (token == CPP_EOF) /* Should not happen ... */
+ if (token == CPP_EOF && CPP_BUFFER (&scan_in) == buf)
break;
- if (token == CPP_POP && CPP_BUFFER (&scan_in) == buf)
- {
- cpp_pop_buffer (&scan_in);
- break;
- }
- if (token == CPP_NAME && length == 7
- && strcmp ("_filbuf", scan_in.token_buffer + old_written) == 0)
+ if (token == CPP_NAME && cpp_idcmp (id, length, "_filbuf") == 0)
seen_filbuf++;
}
if (seen_filbuf)
int need_flsbuf
= flsbuf_fn && !SEEN (flsbuf_fn) && !REQUIRED (flsbuf_fn);
- /* Append "_filbuf" and/or "_flsbuf" to the required functions. */
+ /* Append "_filbuf" and/or "_flsbuf" to the required functions. */
if (need_filbuf + need_flsbuf)
{
- char *new_list;
+ const char *new_list;
if (need_filbuf)
SET_REQUIRED (fn);
if (need_flsbuf)
SET_REQUIRED (flsbuf_fn);
- if (need_flsbuf + need_filbuf == 2)
+ if (need_flsbuf && need_filbuf)
new_list = "_filbuf\0_flsbuf\0";
else if (need_flsbuf)
new_list = "_flsbuf\0";
{
if (verbose)
fprintf (stderr, "%s: OK, nothing needs to be done.\n", inc_filename);
- exit (0);
+ exit (SUCCESS_EXIT_CODE);
}
if (!verbose)
fprintf (stderr, "%s: fixing %s\n", progname, inc_filename);
}
}
-void
+static void
write_rbrac ()
{
struct fn_decl *fn;
#endif
}
- /* Now we print out prototypes for those functions that we haven't seen. */
+ /* Now we print out prototypes for those functions that we haven't seen. */
for (cur_symbols = &symbol_table[0]; cur_symbols->names; cur_symbols++)
{
int if_was_emitted = 0;
|| !strcmp (fn->fname, "vprintf")
|| !strcmp (fn->fname, "vfprintf")
|| !strcmp (fn->fname, "vsprintf")
- || !strcmp (fn->fname, "rewinddir"))
+ || !strcmp (fn->fname, "rewinddir")
+ || !strcmp (fn->fname, "abort"))
macro_protect = 1;
if (macro_protect)
fprintf (outf,
"#define S_ISREG(mode) (((mode) & S_IFMT) == S_IFREG)\n");
break;
+
+ default:
+ break;
}
#endif
}
-char *
-xstrdup (str)
- char *str;
-{
- char *copy = (char *) xmalloc (strlen (str) + 1);
- strcpy (copy, str);
- return copy;
-}
-
/* Returns 1 iff the file is properly protected from multiple inclusion:
#ifndef PROTECT_NAME
#define PROTECT_NAME
*/
-#define INF_GET() (inf_ptr < inf_limit ? *(unsigned char*)inf_ptr++ : EOF)
+#define INF_GET() (inf_ptr < inf_limit ? *(unsigned char *) inf_ptr++ : EOF)
#define INF_UNGET(c) ((c)!=EOF && inf_ptr--)
-int
+static int
inf_skip_spaces (c)
int c;
{
c = INF_GET ();
if (c != '*')
{
- INF_UNGET (c);
+ (void) INF_UNGET (c);
return '/';
}
c = INF_GET ();
return c;
}
-/* Read into STR from inf_buffer upto DELIM. */
+/* Read into STR from inf_buffer upto DELIM. */
-int
+static int
inf_read_upto (str, delim)
sstring *str;
int delim;
return ch;
}
-int
+static int
inf_scan_ident (s, c)
register sstring *s;
int c;
{
s->ptr = s->base;
- if (isalpha (c) || c == '_')
+ if (ISALPHA (c) || c == '_')
{
for (;;)
{
SSTRING_PUT (s, c);
c = INF_GET ();
- if (c == EOF || !(isalnum (c) || c == '_'))
+ if (c == EOF || !(ISALNUM (c) || c == '_'))
break;
}
}
/* Returns 1 if the file is correctly protected against multiple
inclusion, setting *ifndef_line to the line number of the initial #ifndef
and setting *endif_line to the final #endif.
- Otherwise return 0. */
+ Otherwise return 0. */
-int
+static int
check_protection (ifndef_line, endif_line)
int *ifndef_line, *endif_line;
{
char *protect_name = NULL; /* Identifier following initial #ifndef */
int define_seen = 0;
- /* Skip initial white space (including comments). */
+ /* Skip initial white space (including comments). */
for (;; lineno++)
{
c = inf_skip_spaces (' ');
if (SSTRING_LENGTH (&buf) == 0 || strcmp (buf.base, "ifndef") != 0)
return 0;
- /* So far so good: We've seen an initial #ifndef. */
+ /* So far so good: We've seen an initial #ifndef. */
*ifndef_line = lineno;
c = inf_scan_ident (&buf, inf_skip_spaces (c));
if (SSTRING_LENGTH (&buf) == 0 || c == EOF)
return 0;
protect_name = xstrdup (buf.base);
- INF_UNGET (c);
+ (void) INF_UNGET (c);
c = inf_read_upto (&buf, '\n');
if (c == EOF)
return 0;
if (!define_seen)
return 0;
*endif_line = lineno;
- /* Skip final white space (including comments). */
+ /* Skip final white space (including comments). */
for (;;)
{
c = inf_skip_spaces (' ');
return 1;
}
+extern int main PARAMS ((int, char **));
+
int
main (argc, argv)
int argc;
int inf_fd;
struct stat sbuf;
int c;
- int i, done;
- const char *cptr, **pptr;
+#ifdef FIXPROTO_IGNORE_LIST
+ int i;
+#endif
+ const char *cptr;
int ifndef_line;
int endif_line;
long to_read;
{
fprintf (stderr, "%s: Usage: foo.h infile.h outfile.h options\n",
progname);
- exit (-1);
+ exit (FATAL_EXIT_CODE);
}
inc_filename = argv[1];
{
if (verbose)
fprintf (stderr, "%s: ignoring %s\n", progname, inc_filename);
- exit (0);
+ exit (SUCCESS_EXIT_CODE);
}
}
special_file_handling = stdio_h;
include_entry = std_include_table;
while (include_entry->name != NULL
- && (include_entry->name == CONTINUED
+ && ((strcmp (include_entry->name, CONTINUED) == 0)
|| strcmp (inc_filename, include_entry->name) != 0))
include_entry++;
cur_symbol_table_size = 0;
for (entry = include_entry; ;)
{
- add_symbols (entry->flags, entry->names);
+ if (entry->flags)
+ add_symbols (entry->flags, entry->names);
entry++;
- if (entry->name != CONTINUED)
+ if (!entry->name || strcmp (entry->name, CONTINUED) != 0)
break;
}
}
else
symbol_table[0].names = NULL;
- /* Count and mark the prototypes required for this include file. */
+ /* Count and mark the prototypes required for this include file. */
for (cur_symbols = &symbol_table[0]; cur_symbols->names; cur_symbols++)
{
int name_len;
fprintf (stderr, "%s: Cannot open '%s' for reading -",
progname, argv[2]);
perror (NULL);
- exit (-1);
+ exit (FATAL_EXIT_CODE);
}
if (fstat (inf_fd, &sbuf) < 0)
{
fprintf (stderr, "%s: Cannot get size of '%s' -", progname, argv[2]);
perror (NULL);
- exit (-1);
+ exit (FATAL_EXIT_CODE);
}
inf_size = sbuf.st_size;
- inf_buffer = (char*) xmalloc (inf_size + 2);
+ inf_buffer = (char *) xmalloc (inf_size + 2);
inf_buffer[inf_size] = '\n';
inf_buffer[inf_size + 1] = '\0';
inf_limit = inf_buffer + inf_size;
{
fprintf (stderr, "%s: Failed to read '%s' -", progname, argv[2]);
perror (NULL);
- exit (-1);
+ exit (FATAL_EXIT_CODE);
}
if (i == 0)
{
close (inf_fd);
- /* If file doesn't end with '\n', add one. */
+ /* If file doesn't end with '\n', add one. */
if (inf_limit > inf_buffer && inf_limit[-1] != '\n')
inf_limit++;
fprintf (stderr, "%s: Cannot open '%s' for writing -",
progname, argv[3]);
perror (NULL);
- exit (-1);
+ exit (FATAL_EXIT_CODE);
}
lineno = 1;
rbrac_line = -1;
}
- /* Reset input file. */
+ /* Reset input file. */
inf_ptr = inf_buffer;
lineno = 1;
c = INF_GET ();
if (c == EOF)
break;
- if (isalpha (c) || c == '_')
+ if (ISALPHA (c) || c == '_')
{
c = inf_scan_ident (&buf, c);
- INF_UNGET (c);
+ (void) INF_UNGET (c);
fputs (buf.base, outf);
fn = lookup_std_proto (buf.base, strlen (buf.base));
/* We only want to edit the declaration matching the one
seen by scan-decls, as there can be multiple
- declarations, selected by #ifdef __STDC__ or whatever. */
+ declarations, selected by #ifdef __STDC__ or whatever. */
if (fn && fn->partial && fn->partial->line_seen == lineno)
{
c = inf_skip_spaces (' ');
else
{
putc ('(', outf);
- INF_UNGET (c);
+ (void) INF_UNGET (c);
}
}
else
return 0;
}
\f
-/* Stub error functions. These replace cpperror.c,
- because we want to suppress error messages. */
-
-void
-cpp_file_line_for_message (pfile, filename, line, column)
- cpp_reader *pfile;
- char *filename;
- int line, column;
-{
- if (!verbose)
- return;
- if (column > 0)
- fprintf (stderr, "%s:%d:%d: ", filename, line, column);
- else
- fprintf (stderr, "%s:%d: ", filename, line);
-}
-
-void
-cpp_print_containing_files (pfile)
- cpp_reader *pfile;
-{
-}
-
-/* IS_ERROR is 1 for error, 0 for warning */
-void cpp_message (pfile, is_error, msg, arg1, arg2, arg3)
- int is_error;
- cpp_reader *pfile;
- char *msg;
- char *arg1, *arg2, *arg3;
-{
- if (is_error)
- pfile->errors++;
- if (!verbose)
- return;
- if (!is_error)
- fprintf (stderr, "warning: ");
- fprintf (stderr, msg, arg1, arg2, arg3);
- fprintf (stderr, "\n");
-}
-void
-fatal (str, arg)
- char *str, *arg;
+static void
+v_fatal (str, ap)
+ const char * str;
+ va_list ap;
{
fprintf (stderr, "%s: %s: ", progname, inc_filename);
- fprintf (stderr, str, arg);
+ vfprintf (stderr, str, ap);
fprintf (stderr, "\n");
+
exit (FATAL_EXIT_CODE);
}
-void
-cpp_pfatal_with_name (pfile, name)
- cpp_reader *pfile;
- char *name;
+static void
+fatal VPARAMS ((const char *str, ...))
{
- cpp_perror_with_name (pfile, name);
- exit (FATAL_EXIT_CODE);
+#ifndef ANSI_PROTOTYPES
+ const char *str;
+#endif
+ va_list ap;
+
+ VA_START(ap, str);
+
+#ifndef ANSI_PROTOTYPES
+ str = va_arg (ap, const char *);
+#endif
+
+ v_fatal(str, ap);
+ va_end(ap);
}
OSDN Git Service
