aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKazu Hirata <kazu@codesourcery.com>2001-01-23 20:27:54 +0000
committerKazu Hirata <kazu@codesourcery.com>2001-01-23 20:27:54 +0000
commit3fde5a36df2955b5a443e8da6f30fdf3b3b2769e (patch)
tree9a5b023629a717ff9232ff6eee349bfe6be9d500 /bfd/format.c
parent* config/m32r/m32r.mt (GDBSERVER_LIBS): Added ../../intl/libintl.a. (diff)
downloadbinutils-gdb-3fde5a36df2955b5a443e8da6f30fdf3b3b2769e.tar.gz
binutils-gdb-3fde5a36df2955b5a443e8da6f30fdf3b3b2769e.tar.bz2
binutils-gdb-3fde5a36df2955b5a443e8da6f30fdf3b3b2769e.zip
2001-01-23 Kazu Hirata <kazu@hxi.com>
* aoutx.h: Fix formatting. * bfd.c: Likewise. * bfd-in2.h: Likewise. * bfd-in.h: Likewise. * cpu-i386.c: Likewise. * cpu-m68hc11.c: Likewise. * dwarf2.c: Likewise. * elf64-x86-64.c: Likewise. * format.c: Likewise. * freebsd.h: Likewise. * hash.c: Likewise. * hp300hpux.c: Likewise. * hppabsd-core.c: Likewise. * hpux-core.c: Likewise.
Diffstat (limited to 'bfd/format.c')
-rw-r--r--bfd/format.c72
1 files changed, 35 insertions, 37 deletions
diff --git a/bfd/format.c b/bfd/format.c
index 714778cb4ea..ad4a6a8733e 100644
--- a/bfd/format.c
+++ b/bfd/format.c
@@ -23,7 +23,7 @@ SECTION
File formats
A format is a BFD concept of high level file contents type. The
- formats supported by BFD are:
+ formats supported by BFD are:
o <<bfd_object>>
@@ -37,7 +37,6 @@ SECTION
The BFD contains the result of an executable core dump.
-
*/
#include "bfd.h"
@@ -68,7 +67,7 @@ DESCRIPTION
the file, or an error results.
The function returns <<true>> on success, otherwise <<false>>
- with one of the following error codes:
+ with one of the following error codes:
o <<bfd_error_invalid_operation>> -
if <<format>> is not one of <<bfd_object>>, <<bfd_archive>> or
@@ -109,7 +108,7 @@ DESCRIPTION
Then the user may choose a format and try again.
When done with the list that @var{matching} points to, the caller
- should free it.
+ should free it.
*/
boolean
@@ -134,11 +133,11 @@ bfd_check_format_matches (abfd, format, matching)
if (abfd->format != bfd_unknown)
return (abfd->format == format)? true: false;
- /* Since the target type was defaulted, check them
+ /* Since the target type was defaulted, check them
all in the hope that one will be uniquely recognized. */
save_targ = abfd->xvec;
match_count = 0;
-
+
if (matching)
{
matching_vector =
@@ -149,7 +148,7 @@ bfd_check_format_matches (abfd, format, matching)
matching_vector[0] = NULL;
*matching = matching_vector;
}
-
+
right_targ = 0;
/* Presume the answer is yes. */
@@ -160,16 +159,16 @@ bfd_check_format_matches (abfd, format, matching)
{
if (bfd_seek (abfd, (file_ptr)0, SEEK_SET) != 0) /* rewind! */
return false;
-
+
right_targ = BFD_SEND_FMT (abfd, _bfd_check_format, (abfd));
-
+
if (right_targ)
{
abfd->xvec = right_targ; /* Set the target as returned. */
-
+
if (matching)
free (matching_vector);
-
+
return true; /* File position has moved, BTW. */
}
@@ -189,12 +188,12 @@ bfd_check_format_matches (abfd, format, matching)
{
abfd->xvec = save_targ;
abfd->format = bfd_unknown;
-
+
if (matching)
free (matching_vector);
-
+
bfd_set_error (bfd_error_file_not_recognized);
-
+
return false;
}
}
@@ -202,15 +201,15 @@ bfd_check_format_matches (abfd, format, matching)
for (target = bfd_target_vector; *target != NULL; target++)
{
const bfd_target *temp;
-
+
if (*target == &binary_vec)
continue;
-
+
abfd->xvec = *target; /* Change BFD's target temporarily */
-
+
if (bfd_seek (abfd, (file_ptr)0, SEEK_SET) != 0)
return false;
-
+
/* If _bfd_check_format neglects to set bfd_error, assume
bfd_error_wrong_format. We didn't used to even pay any
attention to bfd_error, so I suspect that some
@@ -218,19 +217,19 @@ bfd_check_format_matches (abfd, format, matching)
bfd_set_error (bfd_error_wrong_format);
temp = BFD_SEND_FMT (abfd, _bfd_check_format, (abfd));
-
+
if (temp)
{ /* This format checks out as ok! */
right_targ = temp;
-
+
if (matching)
{
matching_vector[match_count] = temp->name;
matching_vector[match_count + 1] = NULL;
}
-
+
match_count++;
-
+
/* If this is the default target, accept it, even if other
targets might match. People who want those other targets
have to set the GNUTARGET variable. */
@@ -258,38 +257,38 @@ bfd_check_format_matches (abfd, format, matching)
{
abfd->xvec = save_targ;
abfd->format = bfd_unknown;
-
+
if (matching && bfd_get_error ()
!= bfd_error_file_ambiguously_recognized)
free (matching_vector);
-
+
return false;
}
}
-
+
if (match_count == 1)
{
abfd->xvec = right_targ; /* Change BFD's target permanently. */
-
+
if (matching)
free (matching_vector);
-
+
return true; /* File position has moved, BTW. */
}
abfd->xvec = save_targ; /* Restore original target type. */
abfd->format = bfd_unknown; /* Restore original format. */
-
+
if (match_count == 0)
{
bfd_set_error (bfd_error_file_not_recognized);
-
+
if (matching)
free (matching_vector);
}
else
bfd_set_error (bfd_error_file_ambiguously_recognized);
-
+
return false;
}
@@ -335,7 +334,6 @@ bfd_set_format (abfd, format)
return true;
}
-
/*
FUNCTION
bfd_format_string
@@ -353,19 +351,19 @@ CONST char *
bfd_format_string (format)
bfd_format format;
{
- if (((int)format <(int) bfd_unknown)
- || ((int)format >=(int) bfd_type_end))
+ if (((int)format <(int) bfd_unknown)
+ || ((int)format >=(int) bfd_type_end))
return "invalid";
-
+
switch (format)
{
case bfd_object:
return "object"; /* Linker/assember/compiler output. */
- case bfd_archive:
+ case bfd_archive:
return "archive"; /* Object archive file. */
- case bfd_core:
+ case bfd_core:
return "core"; /* Core dump. */
- default:
+ default:
return "unknown";
}
}