OpenE2K
/
binutils-gdb
12
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

* nlmconv.c (main): Use bfd_get_flavour instead of struct member. 

* ar.c (print_contents, extract_file), size.c
	(print_berkeley_format): Use bfd_get_filename and
	bfd_my_archive instead of dereferencing the structs directly.
This commit is contained in:
David MacKenzie 1994-02-03 01:39:10 +00:00
parent 0c62139f90
commit 0c5dc23cc9
4 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
binutils/ChangeLog
View File

@ -1,5 +1,10 @@
Wed Feb 2 13:42:23 1994 David J. Mackenzie (djm@thepub.cygnus.com)
* nlmconv.c (main): Use bfd_get_flavour instead of struct member.
* ar.c (print_contents, extract_file), size.c
(print_berkeley_format): Use bfd_get_filename and
bfd_my_archive instead of dereferencing the structs directly.
* ar.c: Use bfd_fatal and bfd_nonfatal instead of bfd_perror and exit.
Indent. Remove DEFUNs.

6
binutils/ar.c
View File

@ -528,7 +528,8 @@ print_contents (abfd)
nread = bfd_read (cbuf, 1, tocopy, abfd); /* oops -- broke
abstraction! */
if (nread != tocopy)
fatal ("%s is not a valid archive", abfd->my_archive->filename);
fatal ("%s is not a valid archive",
bfd_get_filename (bfd_my_archive (abfd)));
fwrite (cbuf, 1, nread, stdout);
ncopied += tocopy;
}
@ -583,7 +584,8 @@ extract_file (abfd)
nread = bfd_read (cbuf, 1, tocopy, abfd);
if (nread != tocopy)
fatal ("%s is not a valid archive", abfd->my_archive->filename);
fatal ("%s is not a valid archive",
bfd_get_filename (bfd_my_archive (abfd)));
/* See comment above; this saves disk arm motion */
if (!ostream)

2
binutils/nlmconv.c
View File

@ -330,7 +330,7 @@ main (argc, argv)
if (! bfd_set_format (outbfd, bfd_object))
bfd_fatal (output_file);
assert (outbfd->xvec->flavour == bfd_target_nlm_flavour);
assert (bfd_get_flavour (outbfd) == bfd_target_nlm_flavour);
if (bfd_arch_get_compatible (inbfd, outbfd) == NULL)
fprintf (stderr,

4
binutils/size.c
View File

@ -369,8 +369,8 @@ print_berkeley_format (abfd)
(unsigned long) total, (unsigned long) total);
fputs (bfd_get_filename (abfd), stdout);
if (abfd->my_archive)
printf (" (ex %s)", abfd->my_archive->filename);
if (bfd_my_archive (abfd))
printf (" (ex %s)", bfd_get_filename (bfd_my_archive (abfd)));
}
/* I REALLY miss lexical functions! */