Skip to content

R
riscv-gcc-1
Commit 9486db4f by Gabriel Dos Reis Committed by Gabriel Dos Reis
Options

demangle.h: Remove uses of PARAMS. 

include/
2005-03-26  Gabriel Dos Reis  <gdr@integrable-solutions.net>

        * demangle.h: Remove uses of PARAMS.

        * libiberty.h (ANSI_PROTOTYPES): Remove guard since
        ANSI_PROTOTYPES is always assumed.
        Remove uses of PARAMS throughout.

libiberty/
2005-03-26  Gabriel Dos Reis  <gdr@integrable-solutions.net>

        Convert libiberty to use ISO C prototype style 2/n.
        * cp-demangle.h: Remove uses of PARAMS.
        * cp-demangle.c: Likewise.
        (d_dump, cplus_demangle_fill_name,
        cplus_demangle_fill_extended_operator,
        cplus_demangle_fill_ctor,
        cplus_demangle_fill_dtor, d_make_empty, d_make_comp,
        d_make_name,
        d_make_builtin_type, d_make_operator,
        d_make_extended_operator,
        d_make_ctor, d_make_dtor, d_make_template_param, d_make_sub,
        cplus_demangle_mangled_name, has_return_type,
        is_ctor_dtor_or_conversion, d_encoding, d_name, d_nested_name,
        d_prefix, d_unqualified_name, d_source_name, d_number,
        d_identifier, d_operator_name, d_special_name, d_call_offset,
        d_ctor_dtor_name, cplus_demangle_type, d_cv_qualifiers,
        d_function_type, d_bare_function_type, d_class_enum_type,
        d_array_type, d_pointer_to_member_type, d_template_param,
        d_template_args, d_template_arg, d_expression, d_expr_primary,
        d_local_name, d_discriminator, d_add_substitution,
        d_substitution, d_print_resize, d_print_append_char,
        d_print_append_buffer, d_print_error, cplus_demangle_print,
        d_print_comp, d_print_java_identifier, d_print_mod_list,
        d_print_mod, d_print_function_type, d_print_array_type,
        d_print_expr_op, d_print_cast, cplus_demangle_init_info,
        d_demangle, __cxa_demangle, cplus_demangle_v3,
        java_demangle_v3,
        is_ctor_or_dtor, is_gnu_v3_mangled_ctor,
        is_gnu_v3_mangled_dtor,
        print_usage, main):

2005-03-26  Gabriel Dos Reis  <gdr@integrable-solutions.net>

        Convert libiberty to ISO C prototype style 1/n.
        * _doprnt.c: Remove conditional #include <varargs.h> on
        ANSI_PROTOTYPES as the latter is always assumed.
        (_doprnt, checkit, main): Use ISO C prototype.
        * alloca.c (find_stack_direction, C_alloca): Use ISO C
        prototype.
        * argv.c: Remove conditional #includes on ANSI_PROTOTYPES.
        (dupargv, freeargv, buildargv, main): Use ISO C prototype.
        * atexit.c (atexit): Likewise
        * asprintf.c: Remove conditional include on ANSI_PROTOTYPES.
        (asprintf): Use ISO C prototype.
        * basename.c (basename): Likewise
        * bcmp.c (bcmp): Likewise.
        * bcopy.c (bcopy): Likewise.
        * bzero.c (bzero): Likewise.
        * bsearch.c (bsearch): Likewise.  Improve const-correctness.
        * choose-temp.c (choose_temp_base): Likewise.
        * calloc.c: Remove conditional #include on ANSI_PROTOTYPES.
        (calloc): Use ISO C prototype.
        * clock.c (clock): Likewise.
        * concat.c: Remove conditional #include on ANSI_PROTOTYPES.
        (vconcat_length, vconcat_copy, concat_length, concat_copy,
        concat_copy2, concat, reconcat, main): Use ISO C prototype.
        * copysign.c (copysign): Likewise.

From-SVN: r97085
parent 6a8c79d5
Showing with 358 additions and 500 deletions
include/ChangeLog
2005-03-26 Gabriel Dos Reis <gdr@integrable-solutions.net>
* demangle.h: Remove uses of PARAMS.
* libiberty.h (ANSI_PROTOTYPES): Remove guard since
ANSI_PROTOTYPES is always assumed.
Remove uses of PARAMS throughout.
2005-03-24 Kaveh R. Ghazi <ghazi@caip.rutgers.edu>
* libiberty.h (xstrndup): Declare.
......
include/demangle.h
......@@ -110,31 +110,31 @@ extern const struct demangler_engine
} libiberty_demanglers[];
extern char *
cplus_demangle PARAMS ((const char *mangled, int options));
cplus_demangle (const char *mangled, int options);
extern int
cplus_demangle_opname PARAMS ((const char *opname, char *result, int options));
cplus_demangle_opname (const char *opname, char *result, int options);
extern const char *
cplus_mangle_opname PARAMS ((const char *opname, int options));
cplus_mangle_opname (const char *opname, int options);
/* Note: This sets global state. FIXME if you care about multi-threading. */
extern void
set_cplus_marker_for_demangling PARAMS ((int ch));
set_cplus_marker_for_demangling (int ch);
extern enum demangling_styles
cplus_demangle_set_style PARAMS ((enum demangling_styles style));
cplus_demangle_set_style (enum demangling_styles style);
extern enum demangling_styles
cplus_demangle_name_to_style PARAMS ((const char *name));
cplus_demangle_name_to_style (const char *name);
/* V3 ABI demangling entry points, defined in cp-demangle.c. */
extern char*
cplus_demangle_v3 PARAMS ((const char* mangled, int options));
cplus_demangle_v3 (const char* mangled, int options);
extern char*
java_demangle_v3 PARAMS ((const char* mangled));
java_demangle_v3 (const char* mangled);
enum gnu_v3_ctor_kinds {
......@@ -148,7 +148,7 @@ enum gnu_v3_ctor_kinds {
gnu_v3_ctor_kinds' value indicating what kind of constructor
it is. */
extern enum gnu_v3_ctor_kinds
is_gnu_v3_mangled_ctor PARAMS ((const char *name));
is_gnu_v3_mangled_ctor (const char *name);
enum gnu_v3_dtor_kinds {
......@@ -162,7 +162,7 @@ enum gnu_v3_dtor_kinds {
gnu_v3_dtor_kinds' value, indicating what kind of destructor
it is. */
extern enum gnu_v3_dtor_kinds
is_gnu_v3_mangled_dtor PARAMS ((const char *name));
is_gnu_v3_mangled_dtor (const char *name);
/* The V3 demangler works in two passes. The first pass builds a tree
representation of the mangled name, and the second pass turns the
......@@ -440,25 +440,25 @@ struct demangle_component
unrecognized or inappropriate component type. */
extern int
cplus_demangle_fill_component PARAMS ((struct demangle_component *fill,
enum demangle_component_type,
struct demangle_component *left,
struct demangle_component *right));
cplus_demangle_fill_component (struct demangle_component *fill,
enum demangle_component_type,
struct demangle_component *left,
struct demangle_component *right);
/* Fill in a DEMANGLE_COMPONENT_NAME. Returns non-zero on success,
zero for bad arguments. */
extern int
cplus_demangle_fill_name PARAMS ((struct demangle_component *fill,
const char *, int));
cplus_demangle_fill_name (struct demangle_component *fill,
const char *, int);
/* Fill in a DEMANGLE_COMPONENT_BUILTIN_TYPE, using the name of the
builtin type (e.g., "int", etc.). Returns non-zero on success,
zero if the type is not recognized. */
extern int
cplus_demangle_fill_builtin_type PARAMS ((struct demangle_component *fill,
const char *type_name));
cplus_demangle_fill_builtin_type (struct demangle_component *fill,
const char *type_name);
/* Fill in a DEMANGLE_COMPONENT_OPERATOR, using the name of the
operator and the number of arguments which it takes (the latter is
......@@ -467,33 +467,33 @@ cplus_demangle_fill_builtin_type PARAMS ((struct demangle_component *fill,
not recognized. */
extern int
cplus_demangle_fill_operator PARAMS ((struct demangle_component *fill,
const char *opname, int args));
cplus_demangle_fill_operator (struct demangle_component *fill,
const char *opname, int args);
/* Fill in a DEMANGLE_COMPONENT_EXTENDED_OPERATOR, providing the
number of arguments and the name. Returns non-zero on success,
zero for bad arguments. */
extern int
cplus_demangle_fill_extended_operator PARAMS ((struct demangle_component *fill,
int numargs,
struct demangle_component *nm));
cplus_demangle_fill_extended_operator (struct demangle_component *fill,
int numargs,
struct demangle_component *nm);
/* Fill in a DEMANGLE_COMPONENT_CTOR. Returns non-zero on success,
zero for bad arguments. */
extern int
cplus_demangle_fill_ctor PARAMS ((struct demangle_component *fill,
enum gnu_v3_ctor_kinds kind,
struct demangle_component *name));
cplus_demangle_fill_ctor (struct demangle_component *fill,
enum gnu_v3_ctor_kinds kind,
struct demangle_component *name);
/* Fill in a DEMANGLE_COMPONENT_DTOR. Returns non-zero on success,
zero for bad arguments. */
extern int
cplus_demangle_fill_dtor PARAMS ((struct demangle_component *fill,
enum gnu_v3_dtor_kinds kind,
struct demangle_component *name));
cplus_demangle_fill_dtor (struct demangle_component *fill,
enum gnu_v3_dtor_kinds kind,
struct demangle_component *name);
/* This function translates a mangled name into a struct
demangle_component tree. The first argument is the mangled name.
......@@ -504,9 +504,7 @@ cplus_demangle_fill_dtor PARAMS ((struct demangle_component *fill,
needed. */
extern struct demangle_component *
cplus_demangle_v3_components PARAMS ((const char *mangled,
int options,
void **mem));
cplus_demangle_v3_components (const char *mangled, int options, void **mem);
/* This function takes a struct demangle_component tree and returns
the corresponding demangled string. The first argument is DMGL_*
......@@ -521,10 +519,10 @@ cplus_demangle_v3_components PARAMS ((const char *mangled,
memory allocation error. */
extern char *
cplus_demangle_print PARAMS ((int options,
const struct demangle_component *tree,
int estimated_length,
size_t *p_allocated_size));
cplus_demangle_print (int options,
const struct demangle_component *tree,
int estimated_length,
size_t *p_allocated_size);
#ifdef __cplusplus
}
......
include/libiberty.h
......@@ -41,26 +41,24 @@ extern "C" {
#include "ansidecl.h"
#ifdef ANSI_PROTOTYPES
/* Get a definition for size_t. */
#include <stddef.h>
/* Get a definition for va_list. */
#include <stdarg.h>
#endif
/* Build an argument vector from a string. Allocates memory using
malloc. Use freeargv to free the vector. */
extern char **buildargv PARAMS ((const char *)) ATTRIBUTE_MALLOC;
extern char **buildargv (const char *) ATTRIBUTE_MALLOC;
/* Free a vector returned by buildargv. */
extern void freeargv PARAMS ((char **));
extern void freeargv (char **);
/* Duplicate an argument vector. Allocates memory using malloc. Use
freeargv to free the vector. */
extern char **dupargv PARAMS ((char **)) ATTRIBUTE_MALLOC;
extern char **dupargv (char **) ATTRIBUTE_MALLOC;
/* Return the last component of a path name. Note that we can't use a
......@@ -75,7 +73,7 @@ extern char **dupargv PARAMS ((char **)) ATTRIBUTE_MALLOC;
is 1, we found it so don't provide any declaration at all. */
#if !HAVE_DECL_BASENAME
#if defined (__GNU_LIBRARY__ ) || defined (__linux__) || defined (__FreeBSD__) || defined (__OpenBSD__) || defined(__NetBSD__) || defined (__CYGWIN__) || defined (__CYGWIN32__) || defined (__MINGW32__) || defined (HAVE_DECL_BASENAME)
extern char *basename PARAMS ((const char *));
extern char *basename (const char *);
#else
extern char *basename ();
#endif
......@@ -83,17 +81,17 @@ extern char *basename ();
/* A well-defined basename () that is always compiled in. */
extern const char *lbasename PARAMS ((const char *));
extern const char *lbasename (const char *);
/* A well-defined realpath () that is always compiled in. */
extern char *lrealpath PARAMS ((const char *));
extern char *lrealpath (const char *);
/* Concatenate an arbitrary number of strings. You must pass NULL as
the last argument of this function, to terminate the list of
strings. Allocates memory using xmalloc. */
extern char *concat PARAMS ((const char *, ...)) ATTRIBUTE_MALLOC ATTRIBUTE_SENTINEL;
extern char *concat (const char *, ...) ATTRIBUTE_MALLOC ATTRIBUTE_SENTINEL;
/* Concatenate an arbitrary number of strings. You must pass NULL as
the last argument of this function, to terminate the list of
......@@ -102,27 +100,27 @@ extern char *concat PARAMS ((const char *, ...)) ATTRIBUTE_MALLOC ATTRIBUTE_SENT
pointer to be freed after the new string is created, similar to the
way xrealloc works. */
extern char *reconcat PARAMS ((char *, const char *, ...)) ATTRIBUTE_MALLOC ATTRIBUTE_SENTINEL;
extern char *reconcat (char *, const char *, ...) ATTRIBUTE_MALLOC ATTRIBUTE_SENTINEL;
/* Determine the length of concatenating an arbitrary number of
strings. You must pass NULL as the last argument of this function,
to terminate the list of strings. */
extern unsigned long concat_length PARAMS ((const char *, ...)) ATTRIBUTE_SENTINEL;
extern unsigned long concat_length (const char *, ...) ATTRIBUTE_SENTINEL;
/* Concatenate an arbitrary number of strings into a SUPPLIED area of
memory. You must pass NULL as the last argument of this function,
to terminate the list of strings. The supplied memory is assumed
to be large enough. */
extern char *concat_copy PARAMS ((char *, const char *, ...)) ATTRIBUTE_SENTINEL;
extern char *concat_copy (char *, const char *, ...) ATTRIBUTE_SENTINEL;
/* Concatenate an arbitrary number of strings into a GLOBAL area of
memory. You must pass NULL as the last argument of this function,
to terminate the list of strings. The supplied memory is assumed
to be large enough. */
extern char *concat_copy2 PARAMS ((const char *, ...)) ATTRIBUTE_SENTINEL;
extern char *concat_copy2 (const char *, ...) ATTRIBUTE_SENTINEL;
/* This is the global area used by concat_copy2. */
......@@ -138,12 +136,12 @@ extern char *libiberty_concat_ptr;
/* Check whether two file descriptors refer to the same file. */
extern int fdmatch PARAMS ((int fd1, int fd2));
extern int fdmatch (int fd1, int fd2);
/* Get the working directory. The result is cached, so don't call
chdir() between calls to getpwd(). */
extern char * getpwd PARAMS ((void));
extern char * getpwd (void);
/* Get the current time. */
/* Prototypes vary from system to system, so we only provide a
......@@ -151,121 +149,121 @@ extern char * getpwd PARAMS ((void));
#ifdef __MINGW32__
/* Forward declaration to avoid #include <sys/time.h>. */
struct timeval;
extern int gettimeofday PARAMS ((struct timeval *, void *));
extern int gettimeofday (struct timeval *, void *);
#endif
/* Get the amount of time the process has run, in microseconds. */
extern long get_run_time PARAMS ((void));
extern long get_run_time (void);
/* Generate a relocated path to some installation directory. Allocates
return value using malloc. */
extern char *make_relative_prefix PARAMS ((const char *, const char *,
const char *)) ATTRIBUTE_MALLOC;
extern char *make_relative_prefix (const char *, const char *,
const char *) ATTRIBUTE_MALLOC;
/* Choose a temporary directory to use for scratch files. */
extern char *choose_temp_base PARAMS ((void)) ATTRIBUTE_MALLOC;
extern char *choose_temp_base (void) ATTRIBUTE_MALLOC;
/* Return a temporary file name or NULL if unable to create one. */
extern char *make_temp_file PARAMS ((const char *)) ATTRIBUTE_MALLOC;
extern char *make_temp_file (const char *) ATTRIBUTE_MALLOC;
/* Remove a link to a file unless it is special. */
extern int unlink_if_ordinary PARAMS((const char *));
extern int unlink_if_ordinary (const char *);
/* Allocate memory filled with spaces. Allocates using malloc. */
extern const char *spaces PARAMS ((int count));
extern const char *spaces (int count);
/* Return the maximum error number for which strerror will return a
string. */
extern int errno_max PARAMS ((void));
extern int errno_max (void);
/* Return the name of an errno value (e.g., strerrno (EINVAL) returns
"EINVAL"). */
extern const char *strerrno PARAMS ((int));
extern const char *strerrno (int);
/* Given the name of an errno value, return the value. */
extern int strtoerrno PARAMS ((const char *));
extern int strtoerrno (const char *);
/* ANSI's strerror(), but more robust. */
extern char *xstrerror PARAMS ((int));
extern char *xstrerror (int);
/* Return the maximum signal number for which strsignal will return a
string. */
extern int signo_max PARAMS ((void));
extern int signo_max (void);
/* Return a signal message string for a signal number
(e.g., strsignal (SIGHUP) returns something like "Hangup"). */
/* This is commented out as it can conflict with one in system headers.
We still document its existence though. */
/*extern const char *strsignal PARAMS ((int));*/
/*extern const char *strsignal (int);*/
/* Return the name of a signal number (e.g., strsigno (SIGHUP) returns
"SIGHUP"). */
extern const char *strsigno PARAMS ((int));
extern const char *strsigno (int);
/* Given the name of a signal, return its number. */
extern int strtosigno PARAMS ((const char *));
extern int strtosigno (const char *);
/* Register a function to be run by xexit. Returns 0 on success. */
extern int xatexit PARAMS ((void (*fn) (void)));
extern int xatexit (void (*fn) (void));
/* Exit, calling all the functions registered with xatexit. */
extern void xexit PARAMS ((int status)) ATTRIBUTE_NORETURN;
extern void xexit (int status) ATTRIBUTE_NORETURN;
/* Set the program name used by xmalloc. */
extern void xmalloc_set_program_name PARAMS ((const char *));
extern void xmalloc_set_program_name (const char *);
/* Report an allocation failure. */
extern void xmalloc_failed PARAMS ((size_t)) ATTRIBUTE_NORETURN;
extern void xmalloc_failed (size_t) ATTRIBUTE_NORETURN;
/* Allocate memory without fail. If malloc fails, this will print a
message to stderr (using the name set by xmalloc_set_program_name,
if any) and then call xexit. */
extern PTR xmalloc PARAMS ((size_t)) ATTRIBUTE_MALLOC;
extern PTR xmalloc (size_t) ATTRIBUTE_MALLOC;
/* Reallocate memory without fail. This works like xmalloc. Note,
realloc type functions are not suitable for attribute malloc since
they may return the same address across multiple calls. */
extern PTR xrealloc PARAMS ((PTR, size_t));
extern PTR xrealloc (PTR, size_t);
/* Allocate memory without fail and set it to zero. This works like
xmalloc. */
extern PTR xcalloc PARAMS ((size_t, size_t)) ATTRIBUTE_MALLOC;
extern PTR xcalloc (size_t, size_t) ATTRIBUTE_MALLOC;
/* Copy a string into a memory buffer without fail. */
extern char *xstrdup PARAMS ((const char *)) ATTRIBUTE_MALLOC;
extern char *xstrdup (const char *) ATTRIBUTE_MALLOC;
/* Copy at most N characters from string into a buffer without fail. */
extern char *xstrndup PARAMS ((const char *, size_t)) ATTRIBUTE_MALLOC;
extern char *xstrndup (const char *, size_t) ATTRIBUTE_MALLOC;
/* Copy an existing memory buffer to a new memory buffer without fail. */
extern PTR xmemdup PARAMS ((const PTR, size_t, size_t)) ATTRIBUTE_MALLOC;
extern PTR xmemdup (const PTR, size_t, size_t) ATTRIBUTE_MALLOC;
/* Physical memory routines. Return values are in BYTES. */
extern double physmem_total PARAMS ((void));
extern double physmem_available PARAMS ((void));
extern double physmem_total (void);
extern double physmem_available (void);
/* These macros provide a K&R/C89/C++-friendly way of allocating structures
......@@ -303,7 +301,7 @@ extern double physmem_available PARAMS ((void));
#define _hex_array_size 256
#define _hex_bad 99
extern const unsigned char _hex_value[_hex_array_size];
extern void hex_init PARAMS ((void));
extern void hex_init (void);
#define hex_p(c) (hex_value (c) != _hex_bad)
/* If you change this, note well: Some code relies on side effects in
the argument being performed exactly once. */
......@@ -319,25 +317,25 @@ extern void hex_init PARAMS ((void));
/* Execute a program. */
extern int pexecute PARAMS ((const char *, char * const *, const char *,
const char *, char **, char **, int));
extern int pexecute (const char *, char * const *, const char *,
const char *, char **, char **, int);
/* Wait for pexecute to finish. */
extern int pwait PARAMS ((int, int *, int));
extern int pwait (int, int *, int);
#if !HAVE_DECL_ASPRINTF
/* Like sprintf but provides a pointer to malloc'd storage, which must
be freed by the caller. */
extern int asprintf PARAMS ((char **, const char *, ...)) ATTRIBUTE_PRINTF_2;
extern int asprintf (char **, const char *, ...) ATTRIBUTE_PRINTF_2;
#endif
#if !HAVE_DECL_VASPRINTF
/* Like vsprintf but provides a pointer to malloc'd storage, which
must be freed by the caller. */
extern int vasprintf PARAMS ((char **, const char *, va_list))
extern int vasprintf (char **, const char *, va_list)
ATTRIBUTE_PRINTF(2,0);
#endif
......@@ -349,7 +347,7 @@ extern int vasprintf PARAMS ((char **, const char *, va_list))
USE_C_ALLOCA yourself. The canonical autoconf macro C_ALLOCA is
also set/unset as it is often used to indicate whether code needs
to call alloca(0). */
extern PTR C_alloca PARAMS ((size_t)) ATTRIBUTE_MALLOC;
extern PTR C_alloca (size_t) ATTRIBUTE_MALLOC;
#undef alloca
#if GCC_VERSION >= 2000 && !defined USE_C_ALLOCA
# define alloca(x) __builtin_alloca(x)
......
libiberty/ChangeLog
2005-03-26 Gabriel Dos Reis <gdr@integrable-solutions.net>
Convert libiberty to use ISO C prototype style 2/n.
* cp-demangle.h: Remove uses of PARAMS.
* cp-demangle.c: Likewise.
(d_dump, cplus_demangle_fill_name,
cplus_demangle_fill_extended_operator, cplus_demangle_fill_ctor,
cplus_demangle_fill_dtor, d_make_empty, d_make_comp, d_make_name,
d_make_builtin_type, d_make_operator, d_make_extended_operator,
d_make_ctor, d_make_dtor, d_make_template_param, d_make_sub,
cplus_demangle_mangled_name, has_return_type,
is_ctor_dtor_or_conversion, d_encoding, d_name, d_nested_name,
d_prefix, d_unqualified_name, d_source_name, d_number,
d_identifier, d_operator_name, d_special_name, d_call_offset,
d_ctor_dtor_name, cplus_demangle_type, d_cv_qualifiers,
d_function_type, d_bare_function_type, d_class_enum_type,
d_array_type, d_pointer_to_member_type, d_template_param,
d_template_args, d_template_arg, d_expression, d_expr_primary,
d_local_name, d_discriminator, d_add_substitution,
d_substitution, d_print_resize, d_print_append_char,
d_print_append_buffer, d_print_error, cplus_demangle_print,
d_print_comp, d_print_java_identifier, d_print_mod_list,
d_print_mod, d_print_function_type, d_print_array_type,
d_print_expr_op, d_print_cast, cplus_demangle_init_info,
d_demangle, __cxa_demangle, cplus_demangle_v3, java_demangle_v3,
is_ctor_or_dtor, is_gnu_v3_mangled_ctor, is_gnu_v3_mangled_dtor,
print_usage, main):
2005-03-26 Gabriel Dos Reis <gdr@integrable-solutions.net>
Convert libiberty to ISO C prototype style 1/n.
* _doprnt.c: Remove conditional #include <varargs.h> on
ANSI_PROTOTYPES as the latter is always assumed.
(_doprnt, checkit, main): Use ISO C prototype.
* alloca.c (find_stack_direction, C_alloca): Use ISO C prototype.
* argv.c: Remove conditional #includes on ANSI_PROTOTYPES.
(dupargv, freeargv, buildargv, main): Use ISO C prototype.
* atexit.c (atexit): Likewise
* asprintf.c: Remove conditional include on ANSI_PROTOTYPES.
(asprintf): Use ISO C prototype.
* basename.c (basename): Likewise
* bcmp.c (bcmp): Likewise.
* bcopy.c (bcopy): Likewise.
* bzero.c (bzero): Likewise.
* bsearch.c (bsearch): Likewise. Improve const-correctness.
* choose-temp.c (choose_temp_base): Likewise.
* calloc.c: Remove conditional #include on ANSI_PROTOTYPES.
(calloc): Use ISO C prototype.
* clock.c (clock): Likewise.
* concat.c: Remove conditional #include on ANSI_PROTOTYPES.
(vconcat_length, vconcat_copy, concat_length, concat_copy,
concat_copy2, concat, reconcat, main): Use ISO C prototype.
* copysign.c (copysign): Likewise.
2005-03-24 Kaveh R. Ghazi <ghazi@caip.rutgers.edu>
* Makefile.in (CFILES): Add strndup.c and xstrndup.c.
......
libiberty/_doprnt.c
......@@ -21,11 +21,7 @@ Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
#include "safe-ctype.h"
#include <stdio.h>
#ifdef ANSI_PROTOTYPES
#include <stdarg.h>
#else
#include <varargs.h>
#endif
#ifdef HAVE_STRING_H
#include <string.h>
#endif
......@@ -79,10 +75,7 @@ Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
} while (0)
int
_doprnt (format, ap, stream)
const char * format;
va_list ap;
FILE * stream;
_doprnt (const char *format, va_list ap, FILE *stream)
{
const char * ptr = format;
char specifier[128];
......@@ -223,10 +216,10 @@ _doprnt (format, ap, stream)
fflush(stdin); \
} while (0)
static int checkit PARAMS ((const char * format, ...)) ATTRIBUTE_PRINTF_1;
static int checkit (const char * format, ...) ATTRIBUTE_PRINTF_1;
static int
checkit VPARAMS ((const char* format, ...))
checkit (const char* format, ...)
{
int result;
VA_OPEN (args, format);
......@@ -239,7 +232,7 @@ checkit VPARAMS ((const char* format, ...))
}
int
main ()
main (void)
{
RESULT(checkit ("<%d>\n", 0x12345678));
RESULT(printf ("<%d>\n", 0x12345678));
......
libiberty/alloca.c
......@@ -97,7 +97,7 @@ static int stack_dir; /* 1 or -1 once known. */
#define STACK_DIR stack_dir
static void
find_stack_direction ()
find_stack_direction (void)
{
static char *addr = NULL; /* Address of first `dummy', once known. */
auto char dummy; /* To get stack address. */
......@@ -153,8 +153,7 @@ static header *last_alloca_header = NULL; /* -> last alloca header. */
/* @undocumented C_alloca */
PTR
C_alloca (size)
size_t size;
C_alloca (size_t size)
{
auto char probe; /* Probes stack depth: */
register char *depth = ADDRESS_FUNCTION (probe);
......
libiberty/argv.c
......@@ -29,26 +29,10 @@ Boston, MA 02111-1307, USA. */
/* Routines imported from standard C runtime libraries. */
#ifdef ANSI_PROTOTYPES
#include <stddef.h>
#include <string.h>
#include <stdlib.h>
#else /* !ANSI_PROTOTYPES */
#if !defined _WIN32 || defined __GNUC__
extern char *memcpy (); /* Copy memory region */
extern int strlen (); /* Count length of string */
extern char *malloc (); /* Standard memory allocater */
extern char *realloc (); /* Standard memory reallocator */
extern void free (); /* Free malloc'd memory */
extern char *strdup (); /* Duplicate a string */
#endif
#endif /* ANSI_PROTOTYPES */
#ifndef NULL
#define NULL 0
#endif
......@@ -75,8 +59,7 @@ argument vector.
*/
char **
dupargv (argv)
char **argv;
dupargv (char **argv)
{
int argc;
char **copy;
......@@ -119,8 +102,7 @@ itself.
*/
void freeargv (vector)
char **vector;
void freeargv (char **vector)
{
register char **scan;
......@@ -174,8 +156,7 @@ returned, as appropriate.
*/
char **buildargv (input)
const char *input;
char **buildargv (const char *input)
{
char *arg;
char *copybuf;
......@@ -325,7 +306,8 @@ static const char *const tests[] =
NULL
};
int main ()
int
main (void)
{
char **argv;
const char *const *test;
......
libiberty/asprintf.c
......@@ -22,11 +22,7 @@ Boston, MA 02111-1307, USA. */
#include "ansidecl.h"
#include "libiberty.h"
#ifdef ANSI_PROTOTYPES
#include <stdarg.h>
#else
#include <varargs.h>
#endif
/*
......@@ -45,7 +41,7 @@ not be allocated, minus one is returned and @code{NULL} is stored in
*/
int
asprintf VPARAMS ((char **buf, const char *fmt, ...))
asprintf (char **buf, const char *fmt, ...)
{
int status;
VA_OPEN (ap, fmt);
......
libiberty/atexit.c
......@@ -16,8 +16,7 @@ Causes function @var{f} to be called at exit. Returns 0.
#ifdef HAVE_ON_EXIT
int
atexit(f)
void (*f)();
atexit(void (*f)(void))
{
/* If the system doesn't provide a definition for atexit, use on_exit
if the system provides that. */
......
libiberty/basename.c
......@@ -37,8 +37,7 @@ Behavior is undefined if the pathname ends in a directory separator.
#endif /* DIR_SEPARATOR_2 */
char *
basename (name)
const char *name;
basename (const char *name)
{
const char *base;
......
libiberty/bcmp.c
......@@ -17,9 +17,7 @@ result mean @var{x} sorts before @var{y}).
int
bcmp (from, to, count)
char *from, *to;
int count;
bcmp (char *from, char *to, int count)
{
int rtnval = 0;
......
libiberty/bcopy.c
......@@ -10,9 +10,7 @@ Copies @var{length} bytes from memory region @var{in} to region
*/
void
bcopy (src, dest, len)
register char *src, *dest;
int len;
bcopy (register char *src, register char *dest, int len)
{
if (dest < src)
while (len--)
......
libiberty/bsearch.c
......@@ -67,16 +67,13 @@ is respectively less than, matching, or greater than the array member.
* look at item 3.
*/
void *
bsearch(key, base0, nmemb, size, compar)
register void *key;
void *base0;
size_t nmemb;
register size_t size;
register int (*compar)();
bsearch (register const void *key, const void *base0,
size_t nmemb, register size_t size,
register int (*compar)(const void *, const void *))
{
register char *base = base0;
register const char *base = (const char *) base0;
register int lim, cmp;
register void *p;
register const void *p;
for (lim = nmemb; lim != 0; lim >>= 1) {
p = base + (lim >> 1) * size;
......@@ -84,7 +81,7 @@ bsearch(key, base0, nmemb, size, compar)
if (cmp == 0)
return (p);
if (cmp > 0) { /* key > p: move right */
base = (char *)p + size;
base = (const char *)p + size;
lim--;
} /* else move left */
}
......
libiberty/bzero.c
......@@ -14,9 +14,7 @@ is deprecated in favor of @code{memset}.
void
bzero (to, count)
char *to;
int count;
bzero (char *to, int count)
{
while (count-- > 0)
{
......
libiberty/calloc.c
......@@ -13,19 +13,14 @@ Uses @code{malloc} to allocate storage for @var{nelem} objects of
*/
#include "ansidecl.h"
#ifdef ANSI_PROTOTYPES
#include <stddef.h>
#else
#define size_t unsigned long
#endif
/* For systems with larger pointers than ints, this must be declared. */
PTR malloc PARAMS ((size_t));
void bzero PARAMS ((PTR, size_t));
PTR malloc (size_t);
void bzero (PTR, size_t);
PTR
calloc (nelem, elsize)
size_t nelem, elsize;
calloc (size_t nelem, size_t elsize)
{
register PTR ptr;
......
libiberty/choose-temp.c
......@@ -30,7 +30,7 @@ Boston, MA 02111-1307, USA. */
#endif
#include "libiberty.h"
extern char *choose_tmpdir PARAMS ((void));
extern char *choose_tmpdir (void);
/* Name of temporary file.
mktemp requires 6 trailing X's. */
......@@ -54,7 +54,7 @@ not recommended.
*/
char *
choose_temp_base ()
choose_temp_base (void)
{
const char *base = choose_tmpdir ();
char *temp_filename;
......
libiberty/clock.c
......@@ -67,7 +67,7 @@ number of seconds used.
/* FIXME: should be able to declare as clock_t. */
long
clock ()
clock (void)
{
#ifdef HAVE_GETRUSAGE
struct rusage rusage;
......
libiberty/concat.c
......@@ -51,11 +51,7 @@ NOTES
#include "libiberty.h"
#include <sys/types.h> /* size_t */
#ifdef ANSI_PROTOTYPES
#include <stdarg.h>
#else
#include <varargs.h>
#endif
# if HAVE_STRING_H
# include <string.h>
......@@ -69,11 +65,9 @@ NOTES
#include <stdlib.h>
#endif
static inline unsigned long vconcat_length PARAMS ((const char *, va_list));
static inline unsigned long vconcat_length (const char *, va_list);
static inline unsigned long
vconcat_length (first, args)
const char *first;
va_list args;
vconcat_length (const char *first, va_list args)
{
unsigned long length = 0;
const char *arg;
......@@ -84,12 +78,8 @@ vconcat_length (first, args)
return length;
}
static inline char *vconcat_copy PARAMS ((char *, const char *, va_list));
static inline char *
vconcat_copy (dst, first, args)
char *dst;
const char *first;
va_list args;
vconcat_copy (char *dst, const char *first, va_list args)
{
char *end = dst;
const char *arg;
......@@ -108,7 +98,7 @@ vconcat_copy (dst, first, args)
/* @undocumented concat_length */
unsigned long
concat_length VPARAMS ((const char *first, ...))
concat_length (const char *first, ...)
{
unsigned long length;
......@@ -123,7 +113,7 @@ concat_length VPARAMS ((const char *first, ...))
/* @undocumented concat_copy */
char *
concat_copy VPARAMS ((char *dst, const char *first, ...))
concat_copy (char *dst, const char *first, ...)
{
char *save_dst;
......@@ -142,7 +132,7 @@ char *libiberty_concat_ptr;
/* @undocumented concat_copy2 */
char *
concat_copy2 VPARAMS ((const char *first, ...))
concat_copy2 (const char *first, ...)
{
VA_OPEN (args, first);
VA_FIXEDARG (args, const char *, first);
......@@ -153,7 +143,7 @@ concat_copy2 VPARAMS ((const char *first, ...))
}
char *
concat VPARAMS ((const char *first, ...))
concat (const char *first, ...)
{
char *newstr;
......@@ -190,7 +180,7 @@ loop:
*/
char *
reconcat VPARAMS ((char *optr, const char *first, ...))
reconcat (char *optr, const char *first, ...)
{
char *newstr;
......@@ -221,7 +211,7 @@ reconcat VPARAMS ((char *optr, const char *first, ...))
#include <stdio.h>
int
main ()
main (void)
{
printf ("\"\" = \"%s\"\n", concat (NULLP));
printf ("\"a\" = \"%s\"\n", concat ("a", NULLP));
......
libiberty/copysign.c
......@@ -132,8 +132,7 @@ typedef union
#if defined(__IEEE_BIG_ENDIAN) || defined(__IEEE_LITTLE_ENDIAN)
double
copysign (x, y)
double x, y;
copysign (double x, double y)
{
__ieee_double_shape_type a,b;
b.value = y;
......@@ -145,8 +144,7 @@ copysign (x, y)
#else
double
copysign (x, y)
double x, y;
copysign (double x, double y)
{
if ((x < 0 && y > 0) || (x > 0 && y < 0))
return -x;
......
libiberty/cp-demangle.c
......@@ -109,39 +109,34 @@
#define CP_STATIC_IF_GLIBCPP_V3 static
#define cplus_demangle_fill_name d_fill_name
static int
d_fill_name PARAMS ((struct demangle_component *, const char *, int));
static int d_fill_name (struct demangle_component *, const char *, int);
#define cplus_demangle_fill_extended_operator d_fill_extended_operator
static int
d_fill_extended_operator PARAMS ((struct demangle_component *, int,
struct demangle_component *));
d_fill_extended_operator (struct demangle_component *, int,
struct demangle_component *);
#define cplus_demangle_fill_ctor d_fill_ctor
static int
d_fill_ctor PARAMS ((struct demangle_component *, enum gnu_v3_ctor_kinds,
struct demangle_component *));
d_fill_ctor (struct demangle_component *, enum gnu_v3_ctor_kinds,
struct demangle_component *);
#define cplus_demangle_fill_dtor d_fill_dtor
static int
d_fill_dtor PARAMS ((struct demangle_component *, enum gnu_v3_dtor_kinds,
struct demangle_component *));
d_fill_dtor (struct demangle_component *, enum gnu_v3_dtor_kinds,
struct demangle_component *);
#define cplus_demangle_mangled_name d_mangled_name
static struct demangle_component *
d_mangled_name PARAMS ((struct d_info *, int));
static struct demangle_component *d_mangled_name (struct d_info *, int);
#define cplus_demangle_type d_type
static struct demangle_component *
d_type PARAMS ((struct d_info *));
static struct demangle_component *d_type (struct d_info *);
#define cplus_demangle_print d_print
static char *
d_print PARAMS ((int, const struct demangle_component *, int, size_t *));
static char *d_print (int, const struct demangle_component *, int, size_t *);
#define cplus_demangle_init_info d_init_info
static void
d_init_info PARAMS ((const char *, int, size_t, struct d_info *));
static void d_init_info (const char *, int, size_t, struct d_info *);
#else /* ! defined(IN_GLIBCPP_V3) */
#define CP_STATIC_IF_GLIBCPP_V3
......@@ -286,187 +281,157 @@ struct d_print_info
((dpi)->buf == NULL || (dpi)->len == 0 ? '\0' : (dpi)->buf[(dpi)->len - 1])
#ifdef CP_DEMANGLE_DEBUG
static void
d_dump PARAMS ((struct demangle_component *, int));
static void d_dump (struct demangle_component *, int);
#endif
static struct demangle_component *
d_make_empty PARAMS ((struct d_info *));
d_make_empty (struct d_info *);
static struct demangle_component *
d_make_comp PARAMS ((struct d_info *, enum demangle_component_type,
struct demangle_component *,
struct demangle_component *));
d_make_comp (struct d_info *, enum demangle_component_type,
struct demangle_component *,
struct demangle_component *);
static struct demangle_component *
d_make_name PARAMS ((struct d_info *, const char *, int));
d_make_name (struct d_info *, const char *, int);
static struct demangle_component *
d_make_builtin_type PARAMS ((struct d_info *,
const struct demangle_builtin_type_info *));
d_make_builtin_type (struct d_info *,
const struct demangle_builtin_type_info *);
static struct demangle_component *
d_make_operator PARAMS ((struct d_info *,
const struct demangle_operator_info *));
d_make_operator (struct d_info *,
const struct demangle_operator_info *);
static struct demangle_component *
d_make_extended_operator PARAMS ((struct d_info *, int,
struct demangle_component *));
d_make_extended_operator (struct d_info *, int,
struct demangle_component *);
static struct demangle_component *
d_make_ctor PARAMS ((struct d_info *, enum gnu_v3_ctor_kinds,
struct demangle_component *));
d_make_ctor (struct d_info *, enum gnu_v3_ctor_kinds,
struct demangle_component *);
static struct demangle_component *
d_make_dtor PARAMS ((struct d_info *, enum gnu_v3_dtor_kinds,
struct demangle_component *));
d_make_dtor (struct d_info *, enum gnu_v3_dtor_kinds,
struct demangle_component *);
static struct demangle_component *
d_make_template_param PARAMS ((struct d_info *, long));
d_make_template_param (struct d_info *, long);
static struct demangle_component *
d_make_sub PARAMS ((struct d_info *, const char *, int));
d_make_sub (struct d_info *, const char *, int);
static int
has_return_type PARAMS ((struct demangle_component *));
has_return_type (struct demangle_component *);
static int
is_ctor_dtor_or_conversion PARAMS ((struct demangle_component *));
is_ctor_dtor_or_conversion (struct demangle_component *);
static struct demangle_component *
d_encoding PARAMS ((struct d_info *, int));
static struct demangle_component *d_encoding (struct d_info *, int);
static struct demangle_component *
d_name PARAMS ((struct d_info *));
static struct demangle_component *d_name (struct d_info *);
static struct demangle_component *
d_nested_name PARAMS ((struct d_info *));
static struct demangle_component *d_nested_name (struct d_info *);
static struct demangle_component *
d_prefix PARAMS ((struct d_info *));
static struct demangle_component *d_prefix (struct d_info *);
static struct demangle_component *
d_unqualified_name PARAMS ((struct d_info *));
static struct demangle_component *d_unqualified_name (struct d_info *);
static struct demangle_component *
d_source_name PARAMS ((struct d_info *));
static struct demangle_component *d_source_name (struct d_info *);
static long
d_number PARAMS ((struct d_info *));
static long d_number (struct d_info *);
static struct demangle_component *
d_identifier PARAMS ((struct d_info *, int));
static struct demangle_component *d_identifier (struct d_info *, int);
static struct demangle_component *
d_operator_name PARAMS ((struct d_info *));
static struct demangle_component *d_operator_name (struct d_info *);
static struct demangle_component *
d_special_name PARAMS ((struct d_info *));
static struct demangle_component *d_special_name (struct d_info *);
static int
d_call_offset PARAMS ((struct d_info *, int));
static int d_call_offset (struct d_info *, int);
static struct demangle_component *
d_ctor_dtor_name PARAMS ((struct d_info *));
static struct demangle_component *d_ctor_dtor_name (struct d_info *);
static struct demangle_component **
d_cv_qualifiers PARAMS ((struct d_info *, struct demangle_component **, int));
d_cv_qualifiers (struct d_info *, struct demangle_component **, int);
static struct demangle_component *
d_function_type PARAMS ((struct d_info *));
d_function_type (struct d_info *);
static struct demangle_component *
d_bare_function_type PARAMS ((struct d_info *, int));
d_bare_function_type (struct d_info *, int);
static struct demangle_component *
d_class_enum_type PARAMS ((struct d_info *));
d_class_enum_type (struct d_info *);
static struct demangle_component *
d_array_type PARAMS ((struct d_info *));
static struct demangle_component *d_array_type (struct d_info *);
static struct demangle_component *
d_pointer_to_member_type PARAMS ((struct d_info *));
d_pointer_to_member_type (struct d_info *);
static struct demangle_component *
d_template_param PARAMS ((struct d_info *));
d_template_param (struct d_info *);
static struct demangle_component *
d_template_args PARAMS ((struct d_info *));
static struct demangle_component *d_template_args (struct d_info *);
static struct demangle_component *
d_template_arg PARAMS ((struct d_info *));
d_template_arg (struct d_info *);
static struct demangle_component *
d_expression PARAMS ((struct d_info *));
static struct demangle_component *d_expression (struct d_info *);
static struct demangle_component *
d_expr_primary PARAMS ((struct d_info *));
static struct demangle_component *d_expr_primary (struct d_info *);
static struct demangle_component *
d_local_name PARAMS ((struct d_info *));
static struct demangle_component *d_local_name (struct d_info *);
static int
d_discriminator PARAMS ((struct d_info *));
static int d_discriminator (struct d_info *);
static int
d_add_substitution PARAMS ((struct d_info *, struct demangle_component *));
d_add_substitution (struct d_info *, struct demangle_component *);
static struct demangle_component *
d_substitution PARAMS ((struct d_info *, int));
static struct demangle_component *d_substitution (struct d_info *, int);
static void
d_print_resize PARAMS ((struct d_print_info *, size_t));
static void d_print_resize (struct d_print_info *, size_t);
static void
d_print_append_char PARAMS ((struct d_print_info *, int));
static void d_print_append_char (struct d_print_info *, int);
static void
d_print_append_buffer PARAMS ((struct d_print_info *, const char *, size_t));
d_print_append_buffer (struct d_print_info *, const char *, size_t);
static void
d_print_error PARAMS ((struct d_print_info *));
static void d_print_error (struct d_print_info *);
static void
d_print_comp PARAMS ((struct d_print_info *,
const struct demangle_component *));
d_print_comp (struct d_print_info *, const struct demangle_component *);
static void
d_print_java_identifier PARAMS ((struct d_print_info *, const char *, int));
d_print_java_identifier (struct d_print_info *, const char *, int);
static void
d_print_mod_list PARAMS ((struct d_print_info *, struct d_print_mod *, int));
d_print_mod_list (struct d_print_info *, struct d_print_mod *, int);
static void
d_print_mod PARAMS ((struct d_print_info *,
const struct demangle_component *));
d_print_mod (struct d_print_info *, const struct demangle_component *);
static void
d_print_function_type PARAMS ((struct d_print_info *,
const struct demangle_component *,
struct d_print_mod *));
d_print_function_type (struct d_print_info *,
const struct demangle_component *,
struct d_print_mod *);
static void
d_print_array_type PARAMS ((struct d_print_info *,
const struct demangle_component *,
struct d_print_mod *));
d_print_array_type (struct d_print_info *,
const struct demangle_component *,
struct d_print_mod *);
static void
d_print_expr_op PARAMS ((struct d_print_info *,
const struct demangle_component *));
d_print_expr_op (struct d_print_info *, const struct demangle_component *);
static void
d_print_cast PARAMS ((struct d_print_info *,
const struct demangle_component *));
d_print_cast (struct d_print_info *, const struct demangle_component *);
static char *
d_demangle PARAMS ((const char *, int, size_t *));
static char *d_demangle (const char *, int, size_t *);
#ifdef CP_DEMANGLE_DEBUG
static void
d_dump (dc, indent)
struct demangle_component *dc;
int indent;
d_dump (struct demangle_component *dc, int indent)
{
int i;
......@@ -645,10 +610,7 @@ d_dump (dc, indent)
CP_STATIC_IF_GLIBCPP_V3
int
cplus_demangle_fill_name (p, s, len)
struct demangle_component *p;
const char *s;
int len;
cplus_demangle_fill_name (struct demangle_component *p, const char *s, int len)
{
if (p == NULL || s == NULL || len == 0)
return 0;
......@@ -662,10 +624,8 @@ cplus_demangle_fill_name (p, s, len)
CP_STATIC_IF_GLIBCPP_V3
int
cplus_demangle_fill_extended_operator (p, args, name)
struct demangle_component *p;
int args;
struct demangle_component *name;
cplus_demangle_fill_extended_operator (struct demangle_component *p, int args,
struct demangle_component *name)
{
if (p == NULL || args < 0 || name == NULL)
return 0;
......@@ -679,10 +639,9 @@ cplus_demangle_fill_extended_operator (p, args, name)
CP_STATIC_IF_GLIBCPP_V3
int
cplus_demangle_fill_ctor (p, kind, name)
struct demangle_component *p;
enum gnu_v3_ctor_kinds kind;
struct demangle_component *name;
cplus_demangle_fill_ctor (struct demangle_component *p,
enum gnu_v3_ctor_kinds kind,
struct demangle_component *name)
{
if (p == NULL
|| name == NULL
......@@ -699,10 +658,9 @@ cplus_demangle_fill_ctor (p, kind, name)
CP_STATIC_IF_GLIBCPP_V3
int
cplus_demangle_fill_dtor (p, kind, name)
struct demangle_component *p;
enum gnu_v3_dtor_kinds kind;
struct demangle_component *name;
cplus_demangle_fill_dtor (struct demangle_component *p,
enum gnu_v3_dtor_kinds kind,
struct demangle_component *name)
{
if (p == NULL
|| name == NULL
......@@ -718,8 +676,7 @@ cplus_demangle_fill_dtor (p, kind, name)
/* Add a new component. */
static struct demangle_component *
d_make_empty (di)
struct d_info *di;
d_make_empty (struct d_info *di)
{
struct demangle_component *p;
......@@ -733,11 +690,9 @@ d_make_empty (di)
/* Add a new generic component. */
static struct demangle_component *
d_make_comp (di, type, left, right)
struct d_info *di;
enum demangle_component_type type;
struct demangle_component *left;
struct demangle_component *right;
d_make_comp (struct d_info *di, enum demangle_component_type type,
struct demangle_component *left,
struct demangle_component *right)
{
struct demangle_component *p;
......@@ -826,10 +781,7 @@ d_make_comp (di, type, left, right)
/* Add a new name component. */
static struct demangle_component *
d_make_name (di, s, len)
struct d_info *di;
const char *s;
int len;
d_make_name (struct d_info *di, const char *s, int len)
{
struct demangle_component *p;
......@@ -842,9 +794,8 @@ d_make_name (di, s, len)
/* Add a new builtin type component. */
static struct demangle_component *
d_make_builtin_type (di, type)
struct d_info *di;
const struct demangle_builtin_type_info *type;
d_make_builtin_type (struct d_info *di,
const struct demangle_builtin_type_info *type)
{
struct demangle_component *p;
......@@ -862,9 +813,7 @@ d_make_builtin_type (di, type)
/* Add a new operator component. */
static struct demangle_component *
d_make_operator (di, op)
struct d_info *di;
const struct demangle_operator_info *op;
d_make_operator (struct d_info *di, const struct demangle_operator_info *op)
{
struct demangle_component *p;
......@@ -880,10 +829,8 @@ d_make_operator (di, op)
/* Add a new extended operator component. */
static struct demangle_component *
d_make_extended_operator (di, args, name)
struct d_info *di;
int args;
struct demangle_component *name;
d_make_extended_operator (struct d_info *di, int args,
struct demangle_component *name)
{
struct demangle_component *p;
......@@ -896,10 +843,8 @@ d_make_extended_operator (di, args, name)
/* Add a new constructor component. */
static struct demangle_component *
d_make_ctor (di, kind, name)
struct d_info *di;
enum gnu_v3_ctor_kinds kind;
struct demangle_component *name;
d_make_ctor (struct d_info *di, enum gnu_v3_ctor_kinds kind,
struct demangle_component *name)
{
struct demangle_component *p;
......@@ -912,10 +857,8 @@ d_make_ctor (di, kind, name)
/* Add a new destructor component. */
static struct demangle_component *
d_make_dtor (di, kind, name)
struct d_info *di;
enum gnu_v3_dtor_kinds kind;
struct demangle_component *name;
d_make_dtor (struct d_info *di, enum gnu_v3_dtor_kinds kind,
struct demangle_component *name)
{
struct demangle_component *p;
......@@ -928,9 +871,7 @@ d_make_dtor (di, kind, name)
/* Add a new template parameter. */
static struct demangle_component *
d_make_template_param (di, i)
struct d_info *di;
long i;
d_make_template_param (struct d_info *di, long i)
{
struct demangle_component *p;
......@@ -946,10 +887,7 @@ d_make_template_param (di, i)
/* Add a new standard substitution component. */
static struct demangle_component *
d_make_sub (di, name, len)
struct d_info *di;
const char *name;
int len;
d_make_sub (struct d_info *di, const char *name, int len)
{
struct demangle_component *p;
......@@ -969,9 +907,7 @@ d_make_sub (di, name, len)
CP_STATIC_IF_GLIBCPP_V3
struct demangle_component *
cplus_demangle_mangled_name (di, top_level)
struct d_info *di;
int top_level;
cplus_demangle_mangled_name (struct d_info *di, int top_level)
{
if (d_next_char (di) != '_')
return NULL;
......@@ -990,8 +926,7 @@ cplus_demangle_mangled_name (di, top_level)
return types. */
static int
has_return_type (dc)
struct demangle_component *dc;
has_return_type (struct demangle_component *dc)
{
if (dc == NULL)
return 0;
......@@ -1012,8 +947,7 @@ has_return_type (dc)
conversion operator. */
static int
is_ctor_dtor_or_conversion (dc)
struct demangle_component *dc;
is_ctor_dtor_or_conversion (struct demangle_component *dc)
{
if (dc == NULL)
return 0;
......@@ -1041,9 +975,7 @@ is_ctor_dtor_or_conversion (dc)
we would not correctly demangle names in local scopes. */
static struct demangle_component *
d_encoding (di, top_level)
struct d_info *di;
int top_level;
d_encoding (struct d_info *di, int top_level)
{
char peek = d_peek_char (di);
......@@ -1105,8 +1037,7 @@ d_encoding (di, top_level)
*/
static struct demangle_component *
d_name (di)
struct d_info *di;
d_name (struct d_info *di)
{
char peek = d_peek_char (di);
struct demangle_component *dc;
......@@ -1183,8 +1114,7 @@ d_name (di)
*/
static struct demangle_component *
d_nested_name (di)
struct d_info *di;
d_nested_name (struct d_info *di)
{
struct demangle_component *ret;
struct demangle_component **pret;
......@@ -1218,8 +1148,7 @@ d_nested_name (di)
*/
static struct demangle_component *
d_prefix (di)
struct d_info *di;
d_prefix (struct d_info *di)
{
struct demangle_component *ret = NULL;
......@@ -1278,8 +1207,7 @@ d_prefix (di)
*/
static struct demangle_component *
d_unqualified_name (di)
struct d_info *di;
d_unqualified_name (struct d_info *di)
{
char peek;
......@@ -1304,8 +1232,7 @@ d_unqualified_name (di)
/* <source-name> ::= <(positive length) number> <identifier> */
static struct demangle_component *
d_source_name (di)
struct d_info *di;
d_source_name (struct d_info *di)
{
long len;
struct demangle_component *ret;
......@@ -1321,8 +1248,7 @@ d_source_name (di)
/* number ::= [n] <(non-negative decimal integer)> */
static long
d_number (di)
struct d_info *di;
d_number (struct d_info *di)
{
int negative;
char peek;
......@@ -1355,9 +1281,7 @@ d_number (di)
/* identifier ::= <(unqualified source code identifier)> */
static struct demangle_component *
d_identifier (di, len)
struct d_info *di;
int len;
d_identifier (struct d_info *di, int len)
{
const char *name;
......@@ -1460,8 +1384,7 @@ const struct demangle_operator_info cplus_demangle_operators[] =
};
static struct demangle_component *
d_operator_name (di)
struct d_info *di;
d_operator_name (struct d_info *di)
{
char c1;
char c2;
......@@ -1519,8 +1442,7 @@ d_operator_name (di)
*/
static struct demangle_component *
d_special_name (di)
struct d_info *di;
d_special_name (struct d_info *di)
{
char c;
......@@ -1629,9 +1551,7 @@ d_special_name (di)
display it in verbose mode. */
static int
d_call_offset (di, c)
struct d_info *di;
int c;
d_call_offset (struct d_info *di, int c)
{
if (c == '\0')
c = d_next_char (di);
......@@ -1663,8 +1583,7 @@ d_call_offset (di, c)
*/
static struct demangle_component *
d_ctor_dtor_name (di)
struct d_info *di;
d_ctor_dtor_name (struct d_info *di)
{
if (di->last_name != NULL)
{
......@@ -1777,8 +1696,7 @@ cplus_demangle_builtin_types[D_BUILTIN_TYPE_COUNT] =
CP_STATIC_IF_GLIBCPP_V3
struct demangle_component *
cplus_demangle_type (di)
struct d_info *di;
cplus_demangle_type (struct d_info *di)
{
char peek;
struct demangle_component *ret;
......@@ -1947,10 +1865,8 @@ cplus_demangle_type (di)
/* <CV-qualifiers> ::= [r] [V] [K] */
static struct demangle_component **
d_cv_qualifiers (di, pret, member_fn)
struct d_info *di;
struct demangle_component **pret;
int member_fn;
d_cv_qualifiers (struct d_info *di,
struct demangle_component **pret, int member_fn)
{
char peek;
......@@ -1996,8 +1912,7 @@ d_cv_qualifiers (di, pret, member_fn)
/* <function-type> ::= F [Y] <bare-function-type> E */
static struct demangle_component *
d_function_type (di)
struct d_info *di;
d_function_type (struct d_info *di)
{
struct demangle_component *ret;
......@@ -2018,9 +1933,7 @@ d_function_type (di)
/* <bare-function-type> ::= <type>+ */
static struct demangle_component *
d_bare_function_type (di, has_return_type)
struct d_info *di;
int has_return_type;
d_bare_function_type (struct d_info *di, int has_return_type)
{
struct demangle_component *return_type;
struct demangle_component *tl;
......@@ -2075,8 +1988,7 @@ d_bare_function_type (di, has_return_type)
/* <class-enum-type> ::= <name> */
static struct demangle_component *
d_class_enum_type (di)
struct d_info *di;
d_class_enum_type (struct d_info *di)
{
return d_name (di);
}
......@@ -2086,8 +1998,7 @@ d_class_enum_type (di)
*/
static struct demangle_component *
d_array_type (di)
struct d_info *di;
d_array_type (struct d_info *di)
{
char peek;
struct demangle_component *dim;
......@@ -2130,8 +2041,7 @@ d_array_type (di)
/* <pointer-to-member-type> ::= M <(class) type> <(member) type> */
static struct demangle_component *
d_pointer_to_member_type (di)
struct d_info *di;
d_pointer_to_member_type (struct d_info *di)
{
struct demangle_component *cl;
struct demangle_component *mem;
......@@ -2168,8 +2078,7 @@ d_pointer_to_member_type (di)
*/
static struct demangle_component *
d_template_param (di)
struct d_info *di;
d_template_param (struct d_info *di)
{
long param;
......@@ -2197,8 +2106,7 @@ d_template_param (di)
/* <template-args> ::= I <template-arg>+ E */
static struct demangle_component *
d_template_args (di)
struct d_info *di;
d_template_args (struct d_info *di)
{
struct demangle_component *hold_last_name;
struct demangle_component *al;
......@@ -2245,8 +2153,7 @@ d_template_args (di)
*/
static struct demangle_component *
d_template_arg (di)
struct d_info *di;
d_template_arg (struct d_info *di)
{
struct demangle_component *ret;
......@@ -2278,8 +2185,7 @@ d_template_arg (di)
*/
static struct demangle_component *
d_expression (di)
struct d_info *di;
d_expression (struct d_info *di)
{
char peek;
......@@ -2379,8 +2285,7 @@ d_expression (di)
*/
static struct demangle_component *
d_expr_primary (di)
struct d_info *di;
d_expr_primary (struct d_info *di)
{
struct demangle_component *ret;
......@@ -2436,8 +2341,7 @@ d_expr_primary (di)
*/
static struct demangle_component *
d_local_name (di)
struct d_info *di;
d_local_name (struct d_info *di)
{
struct demangle_component *function;
......@@ -2475,8 +2379,7 @@ d_local_name (di)
We should print it out in verbose mode. */
static int
d_discriminator (di)
struct d_info *di;
d_discriminator (struct d_info *di)
{
long discrim;
......@@ -2492,9 +2395,7 @@ d_discriminator (di)
/* Add a new substitution. */
static int
d_add_substitution (di, dc)
struct d_info *di;
struct demangle_component *dc;
d_add_substitution (struct d_info *di, struct demangle_component *dc)
{
if (dc == NULL)
return 0;
......@@ -2550,9 +2451,7 @@ static const struct d_standard_sub_info standard_subs[] =
};
static struct demangle_component *
d_substitution (di, prefix)
struct d_info *di;
int prefix;
d_substitution (struct d_info *di, int prefix)
{
char c;
......@@ -2639,9 +2538,7 @@ d_substitution (di, prefix)
/* Resize the print buffer. */
static void
d_print_resize (dpi, add)
struct d_print_info *dpi;
size_t add;
d_print_resize (struct d_print_info *dpi, size_t add)
{
size_t need;
......@@ -2670,9 +2567,7 @@ d_print_resize (dpi, add)
/* Append a character to the print buffer. */
static void
d_print_append_char (dpi, c)
struct d_print_info *dpi;
int c;
d_print_append_char (struct d_print_info *dpi, int c)
{
if (dpi->buf != NULL)
{
......@@ -2691,10 +2586,7 @@ d_print_append_char (dpi, c)
/* Append a buffer to the print buffer. */
static void
d_print_append_buffer (dpi, s, l)
struct d_print_info *dpi;
const char *s;
size_t l;
d_print_append_buffer (struct d_print_info *dpi, const char *s, size_t l)
{
if (dpi->buf != NULL)
{
......@@ -2713,8 +2605,7 @@ d_print_append_buffer (dpi, s, l)
/* Indicate that an error occurred during printing. */
static void
d_print_error (dpi)
struct d_print_info *dpi;
d_print_error (struct d_print_info *dpi)
{
free (dpi->buf);
dpi->buf = NULL;
......@@ -2730,11 +2621,8 @@ d_print_error (dpi)
CP_STATIC_IF_GLIBCPP_V3
char *
cplus_demangle_print (options, dc, estimate, palc)
int options;
const struct demangle_component *dc;
int estimate;
size_t *palc;
cplus_demangle_print (int options, const struct demangle_component *dc,
int estimate, size_t *palc)
{
struct d_print_info dpi;
......@@ -2769,9 +2657,8 @@ cplus_demangle_print (options, dc, estimate, palc)
/* Subroutine to handle components. */
static void
d_print_comp (dpi, dc)
struct d_print_info *dpi;
const struct demangle_component *dc;
d_print_comp (struct d_print_info *dpi,
const struct demangle_component *dc)
{
if (dc == NULL)
{
......@@ -3442,10 +3329,7 @@ d_print_comp (dpi, dc)
__U<hex-char>+_. */
static void
d_print_java_identifier (dpi, name, len)
struct d_print_info *dpi;
const char *name;
int len;
d_print_java_identifier (struct d_print_info *dpi, const char *name, int len)
{
const char *p;
const char *end;
......@@ -3495,10 +3379,8 @@ d_print_java_identifier (dpi, name, len)
qualifiers on this after printing a function. */
static void
d_print_mod_list (dpi, mods, suffix)
struct d_print_info *dpi;
struct d_print_mod *mods;
int suffix;
d_print_mod_list (struct d_print_info *dpi,
struct d_print_mod *mods, int suffix)
{
struct d_print_template *hold_dpt;
......@@ -3574,9 +3456,8 @@ d_print_mod_list (dpi, mods, suffix)
/* Print a modifier. */
static void
d_print_mod (dpi, mod)
struct d_print_info *dpi;
const struct demangle_component *mod;
d_print_mod (struct d_print_info *dpi,
const struct demangle_component *mod)
{
switch (mod->type)
{
......@@ -3630,10 +3511,9 @@ d_print_mod (dpi, mod)
/* Print a function type, except for the return type. */
static void
d_print_function_type (dpi, dc, mods)
struct d_print_info *dpi;
const struct demangle_component *dc;
struct d_print_mod *mods;
d_print_function_type (struct d_print_info *dpi,
const struct demangle_component *dc,
struct d_print_mod *mods)
{
int need_paren;
int saw_mod;
......@@ -3716,10 +3596,9 @@ d_print_function_type (dpi, dc, mods)
/* Print an array type, except for the element type. */
static void
d_print_array_type (dpi, dc, mods)
struct d_print_info *dpi;
const struct demangle_component *dc;
struct d_print_mod *mods;
d_print_array_type (struct d_print_info *dpi,
const struct demangle_component *dc,
struct d_print_mod *mods)
{
int need_space;
......@@ -3771,9 +3650,8 @@ d_print_array_type (dpi, dc, mods)
/* Print an operator in an expression. */
static void
d_print_expr_op (dpi, dc)
struct d_print_info *dpi;
const struct demangle_component *dc;
d_print_expr_op (struct d_print_info *dpi,
const struct demangle_component *dc)
{
if (dc->type == DEMANGLE_COMPONENT_OPERATOR)
d_append_buffer (dpi, dc->u.s_operator.op->name,
......@@ -3785,9 +3663,8 @@ d_print_expr_op (dpi, dc)
/* Print a cast. */
static void
d_print_cast (dpi, dc)
struct d_print_info *dpi;
const struct demangle_component *dc;
d_print_cast (struct d_print_info *dpi,
const struct demangle_component *dc)
{
if (d_left (dc)->type != DEMANGLE_COMPONENT_TEMPLATE)
d_print_comp (dpi, d_left (dc));
......@@ -3831,11 +3708,8 @@ d_print_cast (dpi, dc)
CP_STATIC_IF_GLIBCPP_V3
void
cplus_demangle_init_info (mangled, options, len, di)
const char *mangled;
int options;
size_t len;
struct d_info *di;
cplus_demangle_init_info (const char *mangled, int options, size_t len,
struct d_info *di)
{
di->s = mangled;
di->send = mangled + len;
......@@ -3868,10 +3742,7 @@ cplus_demangle_init_info (mangled, options, len, di)
a memory allocation failure. On failure, this returns NULL. */
static char *
d_demangle (mangled, options, palc)
const char* mangled;
int options;
size_t *palc;
d_demangle (const char* mangled, int options, size_t *palc)
{
size_t len;
int type;
......@@ -3995,7 +3866,7 @@ d_demangle (mangled, options, palc)
#if defined(IN_LIBGCC2) || defined(IN_GLIBCPP_V3)
extern char *__cxa_demangle PARAMS ((const char *, char *, size_t *, int *));
extern char *__cxa_demangle (const char *, char *, size_t *, int *);
/* ia64 ABI-mandated entry point in the C++ runtime library for
performing demangling. MANGLED_NAME is a NUL-terminated character
......@@ -4024,11 +3895,8 @@ extern char *__cxa_demangle PARAMS ((const char *, char *, size_t *, int *));
GNU extensions. */
char *
__cxa_demangle (mangled_name, output_buffer, length, status)
const char *mangled_name;
char *output_buffer;
size_t *length;
int *status;
__cxa_demangle (const char *mangled_name, char *output_buffer,
size_t *length, int *status)
{
char *demangled;
size_t alc;
......@@ -4094,9 +3962,7 @@ __cxa_demangle (mangled_name, output_buffer, length, status)
demangled name. Otherwise, return NULL. */
char *
cplus_demangle_v3 (mangled, options)
const char* mangled;
int options;
cplus_demangle_v3 (const char* mangled, int options)
{
size_t alc;
......@@ -4111,8 +3977,7 @@ cplus_demangle_v3 (mangled, options)
of JArray<TYPE> with TYPE[]. */
char *
java_demangle_v3 (mangled)
const char* mangled;
java_demangle_v3 (const char* mangled)
{
size_t alc;
char *demangled;
......@@ -4162,10 +4027,9 @@ java_demangle_v3 (mangled)
*DTOR_KIND appropriately. */
static int
is_ctor_or_dtor (mangled, ctor_kind, dtor_kind)
const char *mangled;
enum gnu_v3_ctor_kinds *ctor_kind;
enum gnu_v3_dtor_kinds *dtor_kind;
is_ctor_or_dtor (const char *mangled,
enum gnu_v3_ctor_kinds *ctor_kind,
enum gnu_v3_dtor_kinds *dtor_kind)
{
struct d_info di;
struct demangle_component *dc;
......@@ -4248,8 +4112,7 @@ is_ctor_or_dtor (mangled, ctor_kind, dtor_kind)
name. A non-zero return indicates the type of constructor. */
enum gnu_v3_ctor_kinds
is_gnu_v3_mangled_ctor (name)
const char *name;
is_gnu_v3_mangled_ctor (const char *name)
{
enum gnu_v3_ctor_kinds ctor_kind;
enum gnu_v3_dtor_kinds dtor_kind;
......@@ -4264,8 +4127,7 @@ is_gnu_v3_mangled_ctor (name)
name. A non-zero return indicates the type of destructor. */
enum gnu_v3_dtor_kinds
is_gnu_v3_mangled_dtor (name)
const char *name;
is_gnu_v3_mangled_dtor (const char *name)
{
enum gnu_v3_ctor_kinds ctor_kind;
enum gnu_v3_dtor_kinds dtor_kind;
......@@ -4299,9 +4161,7 @@ const char* program_name;
/* Prints usage summary to FP and then exits with EXIT_VALUE. */
static void
print_usage (fp, exit_value)
FILE* fp;
int exit_value;
print_usage (FILE* fp, int exit_value)
{
fprintf (fp, "Usage: %s [options] [names ...]\n", program_name);
fprintf (fp, "Options:\n");
......@@ -4328,9 +4188,7 @@ static const struct option long_options[] =
with their demangled equivalents. */
int
main (argc, argv)
int argc;
char *argv[];
main (int argc, char *argv[])
{
int i;
int opt_char;
......
libiberty/cp-demangle.h
......@@ -148,14 +148,14 @@ cplus_demangle_builtin_types[D_BUILTIN_TYPE_COUNT];
CP_STATIC_IF_GLIBCPP_V3
struct demangle_component *
cplus_demangle_mangled_name PARAMS ((struct d_info *, int));
cplus_demangle_mangled_name (struct d_info *, int);
CP_STATIC_IF_GLIBCPP_V3
struct demangle_component *
cplus_demangle_type PARAMS ((struct d_info *));
cplus_demangle_type (struct d_info *);
extern void
cplus_demangle_init_info PARAMS ((const char *, int, size_t, struct d_info *));
cplus_demangle_init_info (const char *, int, size_t, struct d_info *);
/* cp-demangle.c needs to define this a little differently */
#undef CP_STATIC_IF_GLIBCPP_V3
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