/* fix-header.c - Make C header file suitable for C++.
- Copyright (C) 1993, 94-98, 1999 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
#include "obstack.h"
#include "scan.h"
#include "cpplib.h"
-#include "cpphash.h"
-static void v_fatal PROTO ((const char *, va_list)) ATTRIBUTE_NORETURN;
-void fatal PVPROTO ((const char *, ...)) ATTRIBUTE_PRINTF_1 ATTRIBUTE_NORETURN;
+static void v_fatal PARAMS ((const char *, va_list)) ATTRIBUTE_NORETURN;
+static void fatal PARAMS ((const char *, ...)) ATTRIBUTE_PRINTF_1 ATTRIBUTE_NORETURN;
sstring buf;
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;
/* 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);
-}
-
#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 (;;)
{
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. */
struct fn_decl *fn = lookup_std_proto (fname, strlen (fname));
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)
{
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;
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,
/* For any name in NAMES that is defined as a macro,
call recognized_macro on it. */
-void
+static void
check_macro_names (pfile, names)
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);
cpp_reader_init (&scan_in);
- scan_in.opts = &scan_options;
- cpp_options_init (&scan_options);
+ /* 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 && ! 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, in_fname))
+ if (! cpp_start_read (&scan_in, 0, in_fname))
exit (FATAL_EXIT_CODE);
- CPP_OPTIONS (&scan_in)->no_line_commands = 1;
+
+ /* 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++)
&& (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();". */
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)
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";
}
}
-void
+static void
write_rbrac ()
{
struct fn_decl *fn;
#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;
{
/* 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;
and setting *endif_line to the final #endif.
Otherwise return 0. */
-int
+static int
check_protection (ifndef_line, endif_line)
int *ifndef_line, *endif_line;
{
return 1;
}
+extern int main PARAMS ((int, char **));
+
int
main (argc, argv)
int argc;
exit (FATAL_EXIT_CODE);
}
-void
-fatal VPROTO ((const char *str, ...))
+static void
+fatal VPARAMS ((const char *str, ...))
{
#ifndef ANSI_PROTOTYPES
const char *str;
OSDN Git Service
