From 151a6341c6be543a337dab3690c211c4f61f802e Mon Sep 17 00:00:00 2001 From: John Gilmore Date: Thu, 5 Nov 1992 12:01:44 +0000 Subject: Clean up some old BFD ansification macros. * arsup.h, bucomm.h, objdump.h: Remove EXFUN from binutils. It still remains as a local macro in gmalloc.c, which is derived from some other copy of GNU Malloc somewhere (FIXME). * ar.c, objdump.c, size.c: Replace EXFUN with PROTO. Make static fns really static. * arsup.h: Declare extract_files. --- binutils/ChangeLog | 12 ++++++++++++ binutils/ar.c | 43 +++++++++++++++++++++++++++---------------- binutils/objdump.h | 21 ++++++++++++++++++++- 3 files changed, 59 insertions(+), 17 deletions(-) (limited to 'binutils') diff --git a/binutils/ChangeLog b/binutils/ChangeLog index 463d46f..bc7db6b 100644 --- a/binutils/ChangeLog +++ b/binutils/ChangeLog @@ -1,3 +1,15 @@ +Thu Nov 5 03:37:15 1992 John Gilmore (gnu@cygnus.com) + + Clean up some old BFD ansification macros. + + * arsup.h, bucomm.h, objdump.h: Remove EXFUN from binutils. + It still remains as a local macro in gmalloc.c, which is derived + from some other copy of GNU Malloc somewhere (FIXME). + + * ar.c, objdump.c, size.c: Replace EXFUN with PROTO. Make static + fns really static. + * arsup.h: Declare extract_files. + Mon Nov 2 12:42:11 1992 Ian Lance Taylor (ian@cygnus.com) * ar.c (extract_file): instead of checking USG: if POSIX_UTIME, diff --git a/binutils/ar.c b/binutils/ar.c index 2dec014..39e18bb 100644 --- a/binutils/ar.c +++ b/binutils/ar.c @@ -1,5 +1,5 @@ /* ar.c - Archive modify and extract. - Copyright (C) 1991 Free Software Foundation, Inc. + Copyright 1991, 1992 Free Software Foundation, Inc. This file is part of GNU Binutils. @@ -46,17 +46,28 @@ extern int errno; #endif #define BUFSIZE 8192 +/* Forward declarations */ +static void +print_contents PARAMS ((bfd * member)); +static void +delete_members PARAMS ((char **files_to_delete)); -PROTO(void, print_contents, (bfd * member)); -PROTO(void, extract_file, (bfd * abfd)); -PROTO(void, delete_members, (char **files_to_delete)); -PROTO(void, do_quick_append, (char *archive_filename, char **files_to_append)); -PROTO(void, move_members, (char **files_to_move)); -PROTO(void, replace_members, (char **files_to_replace)); -PROTO(void, print_descr, (bfd * abfd)); -PROTO(void, ranlib_only, (char *archname)); +static void +do_quick_append PARAMS ((char *archive_filename, char **files_to_append)); + +static void +move_members PARAMS ((char **files_to_move)); + +static void +replace_members PARAMS ((char **files_to_replace)); + +static void +print_descr PARAMS ((bfd * abfd)); + +static void +ranlib_only PARAMS ((char *archname)); /** Globals and flags */ @@ -481,7 +492,7 @@ open_inarch(archive_filename) -void +static void print_contents(abfd) bfd *abfd; { @@ -612,7 +623,7 @@ extract_file(abfd) PROTO(struct ar_hdr *, bfd_special_undocumented_glue, (bfd *abfd, char *filename)); -void +static void do_quick_append(archive_filename, files_to_append) char *archive_filename; char **files_to_append; @@ -772,7 +783,7 @@ get_pos_bfd(contents, default_pos) } -void +static void delete_members(files_to_delete) char **files_to_delete; { @@ -825,7 +836,7 @@ next_file:; /* Reposition existing members within an archive */ -void +static void move_members(files_to_move) char **files_to_move; { @@ -870,7 +881,7 @@ next_file:; /* Ought to default to replacing in place, but this is existing practice! */ -void +static void replace_members(files_to_move) char **files_to_move; { @@ -968,7 +979,7 @@ next_file:; write_archive(); } -void +static void ranlib_only(archname) char *archname; { @@ -982,7 +993,7 @@ ranlib_only(archname) /* Things which are interesting to map over all or some of the files: */ -void +static void print_descr(abfd) bfd *abfd; { diff --git a/binutils/objdump.h b/binutils/objdump.h index 14cf8f0..9030d94 100644 --- a/binutils/objdump.h +++ b/binutils/objdump.h @@ -1,2 +1,21 @@ +/* Object dumper's header file. + Copyright 1992 Free Software Foundation, Inc. -int EXFUN(print_address,(bfd_vma, FILE*)); +This file is part of GNU Binutils. + +This program is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program; if not, write to the Free Software +Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ + +int +print_address PARAMS ((bfd_vma, FILE *)); -- cgit v1.1