Commit 9486db4f by Gabriel Dos Reis Committed by Gabriel Dos Reis

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
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> 2005-03-24 Kaveh R. Ghazi <ghazi@caip.rutgers.edu>
* libiberty.h (xstrndup): Declare. * libiberty.h (xstrndup): Declare.
......
...@@ -110,31 +110,31 @@ extern const struct demangler_engine ...@@ -110,31 +110,31 @@ extern const struct demangler_engine
} libiberty_demanglers[]; } libiberty_demanglers[];
extern char * extern char *
cplus_demangle PARAMS ((const char *mangled, int options)); cplus_demangle (const char *mangled, int options);
extern int 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 * 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. */ /* Note: This sets global state. FIXME if you care about multi-threading. */
extern void extern void
set_cplus_marker_for_demangling PARAMS ((int ch)); set_cplus_marker_for_demangling (int ch);
extern enum demangling_styles 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 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. */ /* V3 ABI demangling entry points, defined in cp-demangle.c. */
extern char* extern char*
cplus_demangle_v3 PARAMS ((const char* mangled, int options)); cplus_demangle_v3 (const char* mangled, int options);
extern char* extern char*
java_demangle_v3 PARAMS ((const char* mangled)); java_demangle_v3 (const char* mangled);
enum gnu_v3_ctor_kinds { enum gnu_v3_ctor_kinds {
...@@ -148,7 +148,7 @@ enum gnu_v3_ctor_kinds { ...@@ -148,7 +148,7 @@ enum gnu_v3_ctor_kinds {
gnu_v3_ctor_kinds' value indicating what kind of constructor gnu_v3_ctor_kinds' value indicating what kind of constructor
it is. */ it is. */
extern enum gnu_v3_ctor_kinds 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 { enum gnu_v3_dtor_kinds {
...@@ -162,7 +162,7 @@ enum gnu_v3_dtor_kinds { ...@@ -162,7 +162,7 @@ enum gnu_v3_dtor_kinds {
gnu_v3_dtor_kinds' value, indicating what kind of destructor gnu_v3_dtor_kinds' value, indicating what kind of destructor
it is. */ it is. */
extern enum gnu_v3_dtor_kinds 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 /* The V3 demangler works in two passes. The first pass builds a tree
representation of the mangled name, and the second pass turns the representation of the mangled name, and the second pass turns the
...@@ -440,25 +440,25 @@ struct demangle_component ...@@ -440,25 +440,25 @@ struct demangle_component
unrecognized or inappropriate component type. */ unrecognized or inappropriate component type. */
extern int extern int
cplus_demangle_fill_component PARAMS ((struct demangle_component *fill, cplus_demangle_fill_component (struct demangle_component *fill,
enum demangle_component_type, enum demangle_component_type,
struct demangle_component *left, struct demangle_component *left,
struct demangle_component *right)); struct demangle_component *right);
/* Fill in a DEMANGLE_COMPONENT_NAME. Returns non-zero on success, /* Fill in a DEMANGLE_COMPONENT_NAME. Returns non-zero on success,
zero for bad arguments. */ zero for bad arguments. */
extern int extern int
cplus_demangle_fill_name PARAMS ((struct demangle_component *fill, cplus_demangle_fill_name (struct demangle_component *fill,
const char *, int)); const char *, int);
/* Fill in a DEMANGLE_COMPONENT_BUILTIN_TYPE, using the name of the /* Fill in a DEMANGLE_COMPONENT_BUILTIN_TYPE, using the name of the
builtin type (e.g., "int", etc.). Returns non-zero on success, builtin type (e.g., "int", etc.). Returns non-zero on success,
zero if the type is not recognized. */ zero if the type is not recognized. */
extern int extern int
cplus_demangle_fill_builtin_type PARAMS ((struct demangle_component *fill, cplus_demangle_fill_builtin_type (struct demangle_component *fill,
const char *type_name)); const char *type_name);
/* Fill in a DEMANGLE_COMPONENT_OPERATOR, using the name of the /* Fill in a DEMANGLE_COMPONENT_OPERATOR, using the name of the
operator and the number of arguments which it takes (the latter is 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, ...@@ -467,33 +467,33 @@ cplus_demangle_fill_builtin_type PARAMS ((struct demangle_component *fill,
not recognized. */ not recognized. */
extern int extern int
cplus_demangle_fill_operator PARAMS ((struct demangle_component *fill, cplus_demangle_fill_operator (struct demangle_component *fill,
const char *opname, int args)); const char *opname, int args);
/* Fill in a DEMANGLE_COMPONENT_EXTENDED_OPERATOR, providing the /* Fill in a DEMANGLE_COMPONENT_EXTENDED_OPERATOR, providing the
number of arguments and the name. Returns non-zero on success, number of arguments and the name. Returns non-zero on success,
zero for bad arguments. */ zero for bad arguments. */
extern int extern int
cplus_demangle_fill_extended_operator PARAMS ((struct demangle_component *fill, cplus_demangle_fill_extended_operator (struct demangle_component *fill,
int numargs, int numargs,
struct demangle_component *nm)); struct demangle_component *nm);
/* Fill in a DEMANGLE_COMPONENT_CTOR. Returns non-zero on success, /* Fill in a DEMANGLE_COMPONENT_CTOR. Returns non-zero on success,
zero for bad arguments. */ zero for bad arguments. */
extern int extern int
cplus_demangle_fill_ctor PARAMS ((struct demangle_component *fill, cplus_demangle_fill_ctor (struct demangle_component *fill,
enum gnu_v3_ctor_kinds kind, enum gnu_v3_ctor_kinds kind,
struct demangle_component *name)); struct demangle_component *name);
/* Fill in a DEMANGLE_COMPONENT_DTOR. Returns non-zero on success, /* Fill in a DEMANGLE_COMPONENT_DTOR. Returns non-zero on success,
zero for bad arguments. */ zero for bad arguments. */
extern int extern int
cplus_demangle_fill_dtor PARAMS ((struct demangle_component *fill, cplus_demangle_fill_dtor (struct demangle_component *fill,
enum gnu_v3_dtor_kinds kind, enum gnu_v3_dtor_kinds kind,
struct demangle_component *name)); struct demangle_component *name);
/* This function translates a mangled name into a struct /* This function translates a mangled name into a struct
demangle_component tree. The first argument is the mangled name. demangle_component tree. The first argument is the mangled name.
...@@ -504,9 +504,7 @@ cplus_demangle_fill_dtor PARAMS ((struct demangle_component *fill, ...@@ -504,9 +504,7 @@ cplus_demangle_fill_dtor PARAMS ((struct demangle_component *fill,
needed. */ needed. */
extern struct demangle_component * extern struct demangle_component *
cplus_demangle_v3_components PARAMS ((const char *mangled, cplus_demangle_v3_components (const char *mangled, int options, void **mem);
int options,
void **mem));
/* This function takes a struct demangle_component tree and returns /* This function takes a struct demangle_component tree and returns
the corresponding demangled string. The first argument is DMGL_* the corresponding demangled string. The first argument is DMGL_*
...@@ -521,10 +519,10 @@ cplus_demangle_v3_components PARAMS ((const char *mangled, ...@@ -521,10 +519,10 @@ cplus_demangle_v3_components PARAMS ((const char *mangled,
memory allocation error. */ memory allocation error. */
extern char * extern char *
cplus_demangle_print PARAMS ((int options, cplus_demangle_print (int options,
const struct demangle_component *tree, const struct demangle_component *tree,
int estimated_length, int estimated_length,
size_t *p_allocated_size)); size_t *p_allocated_size);
#ifdef __cplusplus #ifdef __cplusplus
} }
......
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> 2005-03-24 Kaveh R. Ghazi <ghazi@caip.rutgers.edu>
* Makefile.in (CFILES): Add strndup.c and xstrndup.c. * Makefile.in (CFILES): Add strndup.c and xstrndup.c.
......
...@@ -21,11 +21,7 @@ Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ ...@@ -21,11 +21,7 @@ Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
#include "safe-ctype.h" #include "safe-ctype.h"
#include <stdio.h> #include <stdio.h>
#ifdef ANSI_PROTOTYPES
#include <stdarg.h> #include <stdarg.h>
#else
#include <varargs.h>
#endif
#ifdef HAVE_STRING_H #ifdef HAVE_STRING_H
#include <string.h> #include <string.h>
#endif #endif
...@@ -79,10 +75,7 @@ Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ ...@@ -79,10 +75,7 @@ Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
} while (0) } while (0)
int int
_doprnt (format, ap, stream) _doprnt (const char *format, va_list ap, FILE *stream)
const char * format;
va_list ap;
FILE * stream;
{ {
const char * ptr = format; const char * ptr = format;
char specifier[128]; char specifier[128];
...@@ -223,10 +216,10 @@ _doprnt (format, ap, stream) ...@@ -223,10 +216,10 @@ _doprnt (format, ap, stream)
fflush(stdin); \ fflush(stdin); \
} while (0) } while (0)
static int checkit PARAMS ((const char * format, ...)) ATTRIBUTE_PRINTF_1; static int checkit (const char * format, ...) ATTRIBUTE_PRINTF_1;
static int static int
checkit VPARAMS ((const char* format, ...)) checkit (const char* format, ...)
{ {
int result; int result;
VA_OPEN (args, format); VA_OPEN (args, format);
...@@ -239,7 +232,7 @@ checkit VPARAMS ((const char* format, ...)) ...@@ -239,7 +232,7 @@ checkit VPARAMS ((const char* format, ...))
} }
int int
main () main (void)
{ {
RESULT(checkit ("<%d>\n", 0x12345678)); RESULT(checkit ("<%d>\n", 0x12345678));
RESULT(printf ("<%d>\n", 0x12345678)); RESULT(printf ("<%d>\n", 0x12345678));
......
...@@ -97,7 +97,7 @@ static int stack_dir; /* 1 or -1 once known. */ ...@@ -97,7 +97,7 @@ static int stack_dir; /* 1 or -1 once known. */
#define STACK_DIR stack_dir #define STACK_DIR stack_dir
static void static void
find_stack_direction () find_stack_direction (void)
{ {
static char *addr = NULL; /* Address of first `dummy', once known. */ static char *addr = NULL; /* Address of first `dummy', once known. */
auto char dummy; /* To get stack address. */ auto char dummy; /* To get stack address. */
...@@ -153,8 +153,7 @@ static header *last_alloca_header = NULL; /* -> last alloca header. */ ...@@ -153,8 +153,7 @@ static header *last_alloca_header = NULL; /* -> last alloca header. */
/* @undocumented C_alloca */ /* @undocumented C_alloca */
PTR PTR
C_alloca (size) C_alloca (size_t size)
size_t size;
{ {
auto char probe; /* Probes stack depth: */ auto char probe; /* Probes stack depth: */
register char *depth = ADDRESS_FUNCTION (probe); register char *depth = ADDRESS_FUNCTION (probe);
......
...@@ -29,26 +29,10 @@ Boston, MA 02111-1307, USA. */ ...@@ -29,26 +29,10 @@ Boston, MA 02111-1307, USA. */
/* Routines imported from standard C runtime libraries. */ /* Routines imported from standard C runtime libraries. */
#ifdef ANSI_PROTOTYPES
#include <stddef.h> #include <stddef.h>
#include <string.h> #include <string.h>
#include <stdlib.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 #ifndef NULL
#define NULL 0 #define NULL 0
#endif #endif
...@@ -75,8 +59,7 @@ argument vector. ...@@ -75,8 +59,7 @@ argument vector.
*/ */
char ** char **
dupargv (argv) dupargv (char **argv)
char **argv;
{ {
int argc; int argc;
char **copy; char **copy;
...@@ -119,8 +102,7 @@ itself. ...@@ -119,8 +102,7 @@ itself.
*/ */
void freeargv (vector) void freeargv (char **vector)
char **vector;
{ {
register char **scan; register char **scan;
...@@ -174,8 +156,7 @@ returned, as appropriate. ...@@ -174,8 +156,7 @@ returned, as appropriate.
*/ */
char **buildargv (input) char **buildargv (const char *input)
const char *input;
{ {
char *arg; char *arg;
char *copybuf; char *copybuf;
...@@ -325,7 +306,8 @@ static const char *const tests[] = ...@@ -325,7 +306,8 @@ static const char *const tests[] =
NULL NULL
}; };
int main () int
main (void)
{ {
char **argv; char **argv;
const char *const *test; const char *const *test;
......
...@@ -22,11 +22,7 @@ Boston, MA 02111-1307, USA. */ ...@@ -22,11 +22,7 @@ Boston, MA 02111-1307, USA. */
#include "ansidecl.h" #include "ansidecl.h"
#include "libiberty.h" #include "libiberty.h"
#ifdef ANSI_PROTOTYPES
#include <stdarg.h> #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 ...@@ -45,7 +41,7 @@ not be allocated, minus one is returned and @code{NULL} is stored in
*/ */
int int
asprintf VPARAMS ((char **buf, const char *fmt, ...)) asprintf (char **buf, const char *fmt, ...)
{ {
int status; int status;
VA_OPEN (ap, fmt); VA_OPEN (ap, fmt);
......
...@@ -16,8 +16,7 @@ Causes function @var{f} to be called at exit. Returns 0. ...@@ -16,8 +16,7 @@ Causes function @var{f} to be called at exit. Returns 0.
#ifdef HAVE_ON_EXIT #ifdef HAVE_ON_EXIT
int int
atexit(f) atexit(void (*f)(void))
void (*f)();
{ {
/* If the system doesn't provide a definition for atexit, use on_exit /* If the system doesn't provide a definition for atexit, use on_exit
if the system provides that. */ if the system provides that. */
......
...@@ -37,8 +37,7 @@ Behavior is undefined if the pathname ends in a directory separator. ...@@ -37,8 +37,7 @@ Behavior is undefined if the pathname ends in a directory separator.
#endif /* DIR_SEPARATOR_2 */ #endif /* DIR_SEPARATOR_2 */
char * char *
basename (name) basename (const char *name)
const char *name;
{ {
const char *base; const char *base;
......
...@@ -17,9 +17,7 @@ result mean @var{x} sorts before @var{y}). ...@@ -17,9 +17,7 @@ result mean @var{x} sorts before @var{y}).
int int
bcmp (from, to, count) bcmp (char *from, char *to, int count)
char *from, *to;
int count;
{ {
int rtnval = 0; int rtnval = 0;
......
...@@ -10,9 +10,7 @@ Copies @var{length} bytes from memory region @var{in} to region ...@@ -10,9 +10,7 @@ Copies @var{length} bytes from memory region @var{in} to region
*/ */
void void
bcopy (src, dest, len) bcopy (register char *src, register char *dest, int len)
register char *src, *dest;
int len;
{ {
if (dest < src) if (dest < src)
while (len--) while (len--)
......
...@@ -67,16 +67,13 @@ is respectively less than, matching, or greater than the array member. ...@@ -67,16 +67,13 @@ is respectively less than, matching, or greater than the array member.
* look at item 3. * look at item 3.
*/ */
void * void *
bsearch(key, base0, nmemb, size, compar) bsearch (register const void *key, const void *base0,
register void *key; size_t nmemb, register size_t size,
void *base0; register int (*compar)(const void *, const void *))
size_t nmemb;
register size_t size;
register int (*compar)();
{ {
register char *base = base0; register const char *base = (const char *) base0;
register int lim, cmp; register int lim, cmp;
register void *p; register const void *p;
for (lim = nmemb; lim != 0; lim >>= 1) { for (lim = nmemb; lim != 0; lim >>= 1) {
p = base + (lim >> 1) * size; p = base + (lim >> 1) * size;
...@@ -84,7 +81,7 @@ bsearch(key, base0, nmemb, size, compar) ...@@ -84,7 +81,7 @@ bsearch(key, base0, nmemb, size, compar)
if (cmp == 0) if (cmp == 0)
return (p); return (p);
if (cmp > 0) { /* key > p: move right */ if (cmp > 0) { /* key > p: move right */
base = (char *)p + size; base = (const char *)p + size;
lim--; lim--;
} /* else move left */ } /* else move left */
} }
......
...@@ -14,9 +14,7 @@ is deprecated in favor of @code{memset}. ...@@ -14,9 +14,7 @@ is deprecated in favor of @code{memset}.
void void
bzero (to, count) bzero (char *to, int count)
char *to;
int count;
{ {
while (count-- > 0) while (count-- > 0)
{ {
......
...@@ -13,19 +13,14 @@ Uses @code{malloc} to allocate storage for @var{nelem} objects of ...@@ -13,19 +13,14 @@ Uses @code{malloc} to allocate storage for @var{nelem} objects of
*/ */
#include "ansidecl.h" #include "ansidecl.h"
#ifdef ANSI_PROTOTYPES
#include <stddef.h> #include <stddef.h>
#else
#define size_t unsigned long
#endif
/* For systems with larger pointers than ints, this must be declared. */ /* For systems with larger pointers than ints, this must be declared. */
PTR malloc PARAMS ((size_t)); PTR malloc (size_t);
void bzero PARAMS ((PTR, size_t)); void bzero (PTR, size_t);
PTR PTR
calloc (nelem, elsize) calloc (size_t nelem, size_t elsize)
size_t nelem, elsize;
{ {
register PTR ptr; register PTR ptr;
......
...@@ -30,7 +30,7 @@ Boston, MA 02111-1307, USA. */ ...@@ -30,7 +30,7 @@ Boston, MA 02111-1307, USA. */
#endif #endif
#include "libiberty.h" #include "libiberty.h"
extern char *choose_tmpdir PARAMS ((void)); extern char *choose_tmpdir (void);
/* Name of temporary file. /* Name of temporary file.
mktemp requires 6 trailing X's. */ mktemp requires 6 trailing X's. */
...@@ -54,7 +54,7 @@ not recommended. ...@@ -54,7 +54,7 @@ not recommended.
*/ */
char * char *
choose_temp_base () choose_temp_base (void)
{ {
const char *base = choose_tmpdir (); const char *base = choose_tmpdir ();
char *temp_filename; char *temp_filename;
......
...@@ -67,7 +67,7 @@ number of seconds used. ...@@ -67,7 +67,7 @@ number of seconds used.
/* FIXME: should be able to declare as clock_t. */ /* FIXME: should be able to declare as clock_t. */
long long
clock () clock (void)
{ {
#ifdef HAVE_GETRUSAGE #ifdef HAVE_GETRUSAGE
struct rusage rusage; struct rusage rusage;
......
...@@ -51,11 +51,7 @@ NOTES ...@@ -51,11 +51,7 @@ NOTES
#include "libiberty.h" #include "libiberty.h"
#include <sys/types.h> /* size_t */ #include <sys/types.h> /* size_t */
#ifdef ANSI_PROTOTYPES
#include <stdarg.h> #include <stdarg.h>
#else
#include <varargs.h>
#endif
# if HAVE_STRING_H # if HAVE_STRING_H
# include <string.h> # include <string.h>
...@@ -69,11 +65,9 @@ NOTES ...@@ -69,11 +65,9 @@ NOTES
#include <stdlib.h> #include <stdlib.h>
#endif #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 static inline unsigned long
vconcat_length (first, args) vconcat_length (const char *first, va_list args)
const char *first;
va_list args;
{ {
unsigned long length = 0; unsigned long length = 0;
const char *arg; const char *arg;
...@@ -84,12 +78,8 @@ vconcat_length (first, args) ...@@ -84,12 +78,8 @@ vconcat_length (first, args)
return length; return length;
} }
static inline char *vconcat_copy PARAMS ((char *, const char *, va_list));
static inline char * static inline char *
vconcat_copy (dst, first, args) vconcat_copy (char *dst, const char *first, va_list args)
char *dst;
const char *first;
va_list args;
{ {
char *end = dst; char *end = dst;
const char *arg; const char *arg;
...@@ -108,7 +98,7 @@ vconcat_copy (dst, first, args) ...@@ -108,7 +98,7 @@ vconcat_copy (dst, first, args)
/* @undocumented concat_length */ /* @undocumented concat_length */
unsigned long unsigned long
concat_length VPARAMS ((const char *first, ...)) concat_length (const char *first, ...)
{ {
unsigned long length; unsigned long length;
...@@ -123,7 +113,7 @@ concat_length VPARAMS ((const char *first, ...)) ...@@ -123,7 +113,7 @@ concat_length VPARAMS ((const char *first, ...))
/* @undocumented concat_copy */ /* @undocumented concat_copy */
char * char *
concat_copy VPARAMS ((char *dst, const char *first, ...)) concat_copy (char *dst, const char *first, ...)
{ {
char *save_dst; char *save_dst;
...@@ -142,7 +132,7 @@ char *libiberty_concat_ptr; ...@@ -142,7 +132,7 @@ char *libiberty_concat_ptr;
/* @undocumented concat_copy2 */ /* @undocumented concat_copy2 */
char * char *
concat_copy2 VPARAMS ((const char *first, ...)) concat_copy2 (const char *first, ...)
{ {
VA_OPEN (args, first); VA_OPEN (args, first);
VA_FIXEDARG (args, const char *, first); VA_FIXEDARG (args, const char *, first);
...@@ -153,7 +143,7 @@ concat_copy2 VPARAMS ((const char *first, ...)) ...@@ -153,7 +143,7 @@ concat_copy2 VPARAMS ((const char *first, ...))
} }
char * char *
concat VPARAMS ((const char *first, ...)) concat (const char *first, ...)
{ {
char *newstr; char *newstr;
...@@ -190,7 +180,7 @@ loop: ...@@ -190,7 +180,7 @@ loop:
*/ */
char * char *
reconcat VPARAMS ((char *optr, const char *first, ...)) reconcat (char *optr, const char *first, ...)
{ {
char *newstr; char *newstr;
...@@ -221,7 +211,7 @@ reconcat VPARAMS ((char *optr, const char *first, ...)) ...@@ -221,7 +211,7 @@ reconcat VPARAMS ((char *optr, const char *first, ...))
#include <stdio.h> #include <stdio.h>
int int
main () main (void)
{ {
printf ("\"\" = \"%s\"\n", concat (NULLP)); printf ("\"\" = \"%s\"\n", concat (NULLP));
printf ("\"a\" = \"%s\"\n", concat ("a", NULLP)); printf ("\"a\" = \"%s\"\n", concat ("a", NULLP));
......
...@@ -132,8 +132,7 @@ typedef union ...@@ -132,8 +132,7 @@ typedef union
#if defined(__IEEE_BIG_ENDIAN) || defined(__IEEE_LITTLE_ENDIAN) #if defined(__IEEE_BIG_ENDIAN) || defined(__IEEE_LITTLE_ENDIAN)
double double
copysign (x, y) copysign (double x, double y)
double x, y;
{ {
__ieee_double_shape_type a,b; __ieee_double_shape_type a,b;
b.value = y; b.value = y;
...@@ -145,8 +144,7 @@ copysign (x, y) ...@@ -145,8 +144,7 @@ copysign (x, y)
#else #else
double double
copysign (x, y) copysign (double x, double y)
double x, y;
{ {
if ((x < 0 && y > 0) || (x > 0 && y < 0)) if ((x < 0 && y > 0) || (x > 0 && y < 0))
return -x; return -x;
......
...@@ -148,14 +148,14 @@ cplus_demangle_builtin_types[D_BUILTIN_TYPE_COUNT]; ...@@ -148,14 +148,14 @@ cplus_demangle_builtin_types[D_BUILTIN_TYPE_COUNT];
CP_STATIC_IF_GLIBCPP_V3 CP_STATIC_IF_GLIBCPP_V3
struct demangle_component * 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 CP_STATIC_IF_GLIBCPP_V3
struct demangle_component * struct demangle_component *
cplus_demangle_type PARAMS ((struct d_info *)); cplus_demangle_type (struct d_info *);
extern void 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 */ /* cp-demangle.c needs to define this a little differently */
#undef CP_STATIC_IF_GLIBCPP_V3 #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