aboutsummaryrefslogtreecommitdiff
path: root/binutils/strings.c
diff options
context:
space:
mode:
authorAndreas Jaeger <aj@suse.de>2003-09-14 12:20:17 +0000
committerAndreas Jaeger <aj@suse.de>2003-09-14 12:20:17 +0000
commit2da42df615c0489291f8d3e1ce873642755a49c6 (patch)
tree2294d219a7e8025d03f45821f383cf3692f249ed /binutils/strings.c
parent4a4b3fedfec42967926860950ee4fae2f01af98e (diff)
downloadgdb-2da42df615c0489291f8d3e1ce873642755a49c6.zip
gdb-2da42df615c0489291f8d3e1ce873642755a49c6.tar.gz
gdb-2da42df615c0489291f8d3e1ce873642755a49c6.tar.bz2
* addr2line.c: Convert to ISO C90 prototypes, change PTR, remove
unneeded (void *) casts. * ar.c: Likewise. * arlex.l: Likewise. * arparse.y: Likewise. * arsup.c: Likewise. * binemul.c: Likewise. * binemul.h: Likewise. * bucomm.c: Likewise. * bucomm.h: Likewise. * budbg.h: Likewise. * budemang.c: Likewise. * budemang.h: Likewise. * coffdump.c: Likewise. * coffgrok.c: Likewise. * cxxfilt.c: Likewise. * debug.c: Likewise. * debug.h: Likewise. * deflex.l: Likewise. * dlltool.c: Likewise. * dlltool.h: Likewise. * dllwrap.c: Likewise. * emul_aix.c: Likewise. * filemode.c: Likewise. * ieee.c: Likewise. * nlmconv.c: Likewise. * nlmconv.h: Likewise. * nlmheader.y: Likewise. * nm.c: Likewise. * prdbg.c: Likewise. * rclex.l: Likewise. * rcparse.y: Likewise. * rdcoff.c: Likewise. * rddbg.c: Likewise. * rename.c: Likewise. * resbin.c: Likewise. * rescoff.c: Likewise. * resrc.c: Likewise. * size.c: Likewise. * srconv.c: Likewise. * stabs.c: Likewise. * strings.c: Likewise. * sysdump.c: Likewise. * sysinfo.y: Likewise. * syslex.l: Likewise. * unwind-ia64.c: Likewise. * unwind-ia64.h: Likewise. * version.c: Likewise. * windres.c: Likewise. * windres.h: Likewise. * winduni.c: Likewise. * wrstabs.c: Likewise.
Diffstat (limited to 'binutils/strings.c')
-rw-r--r--binutils/strings.c67
1 files changed, 20 insertions, 47 deletions
diff --git a/binutils/strings.c b/binutils/strings.c
index b5e88d0..67c601f 100644
--- a/binutils/strings.c
+++ b/binutils/strings.c
@@ -1,6 +1,6 @@
/* strings -- print the strings of printable characters in files
Copyright 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
- 2002 Free Software Foundation, Inc.
+ 2002, 2003 Free Software Foundation, Inc.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -143,28 +143,18 @@ static struct option long_options[] =
{NULL, 0, NULL, 0}
};
-static void strings_a_section
- PARAMS ((bfd *, asection *, PTR));
-static bfd_boolean strings_object_file
- PARAMS ((const char *));
-static bfd_boolean strings_file
- PARAMS ((char *file));
-static int integer_arg
- PARAMS ((char *s));
-static void print_strings
- PARAMS ((const char *, FILE *, file_off, int, int, char *));
-static void usage
- PARAMS ((FILE *, int));
-static long get_char
- PARAMS ((FILE *, file_off *, int *, char **));
+static void strings_a_section (bfd *, asection *, void *);
+static bfd_boolean strings_object_file (const char *);
+static bfd_boolean strings_file (char *file);
+static int integer_arg (char *s);
+static void print_strings (const char *, FILE *, file_off, int, int, char *);
+static void usage (FILE *, int);
+static long get_char (FILE *, file_off *, int *, char **);
-int main
- PARAMS ((int, char **));
+int main (int, char **);
int
-main (argc, argv)
- int argc;
- char **argv;
+main (int argc, char **argv)
{
int optc;
int exit_status = 0;
@@ -321,17 +311,14 @@ main (argc, argv)
set `got_a_section' and print the strings in it. */
static void
-strings_a_section (abfd, sect, filearg)
- bfd *abfd;
- asection *sect;
- PTR filearg;
+strings_a_section (bfd *abfd, asection *sect, void *filearg)
{
const char *file = (const char *) filearg;
if ((sect->flags & DATA_FLAGS) == DATA_FLAGS)
{
bfd_size_type sz = bfd_get_section_size_before_reloc (sect);
- PTR mem = xmalloc (sz);
+ void *mem = xmalloc (sz);
if (bfd_get_section_contents (abfd, sect, mem, (file_ptr) 0, sz))
{
@@ -349,8 +336,7 @@ strings_a_section (abfd, sect, filearg)
FALSE if not (such as if FILE is not an object file). */
static bfd_boolean
-strings_object_file (file)
- const char *file;
+strings_object_file (const char *file)
{
bfd *abfd = bfd_openr (file, target);
@@ -368,7 +354,7 @@ strings_object_file (file)
}
got_a_section = FALSE;
- bfd_map_over_sections (abfd, strings_a_section, (PTR) file);
+ bfd_map_over_sections (abfd, strings_a_section, (void *) file);
if (!bfd_close (abfd))
{
@@ -382,8 +368,7 @@ strings_object_file (file)
/* Print the strings in FILE. Return TRUE if ok, FALSE if an error occurs. */
static bfd_boolean
-strings_file (file)
- char *file;
+strings_file (char *file)
{
/* If we weren't told to scan the whole file,
try to open it as an object file and only look at
@@ -425,11 +410,7 @@ strings_file (file)
MAGICCOUNT is how many characters are in it. */
static long
-get_char (stream, address, magiccount, magic)
- FILE *stream;
- file_off *address;
- int *magiccount;
- char **magic;
+get_char (FILE *stream, file_off *address, int *magiccount, char **magic)
{
int c, i;
long r = EOF;
@@ -500,13 +481,8 @@ get_char (stream, address, magiccount, magic)
Those characters come at address ADDRESS and the data in STREAM follow. */
static void
-print_strings (filename, stream, address, stop_point, magiccount, magic)
- const char *filename;
- FILE *stream;
- file_off address;
- int stop_point;
- int magiccount;
- char *magic;
+print_strings (const char *filename, FILE *stream, file_off address,
+ int stop_point, int magiccount, char *magic)
{
char *buf = (char *) xmalloc (sizeof (char) * (string_min + 1));
@@ -607,8 +583,7 @@ print_strings (filename, stream, address, stop_point, magiccount, magic)
but allowing octal and hex numbers as in C. */
static int
-integer_arg (s)
- char *s;
+integer_arg (char *s)
{
int value;
int radix = 10;
@@ -650,9 +625,7 @@ integer_arg (s)
}
static void
-usage (stream, status)
- FILE *stream;
- int status;
+usage (FILE *stream, int status)
{
fprintf (stream, _("Usage: %s [option(s)] [file(s)]\n"), program_name);
fprintf (stream, _(" Display printable strings in [file(s)] (stdin by default)\n"));