* Remove deprecated bfd_read
@ 2023-04-28 6:15 Alan Modra
0 siblings, 0 replies; only message in thread
From: Alan Modra @ 2023-04-28 6:15 UTC (permalink / raw)
To: binutils
20+ years is long enough to warn.
* bfd-in.h (bfd_read, bfd_write): Don't define
(_bfd_warn_deprecated): Don't declare.
* bfd-in2.h: Regenerate.
* libbfd.c (_bfd_warn_deprecated): Delete.
---
bfd/bfd-in.h | 18 ------------------
bfd/bfd-in2.h | 18 ------------------
bfd/libbfd.c | 28 ----------------------------
3 files changed, 64 deletions(-)
diff --git a/bfd/bfd-in.h b/bfd/bfd-in.h
index eb6ee9cf816..de7285626cd 100644
--- a/bfd/bfd-in.h
+++ b/bfd/bfd-in.h
@@ -362,24 +362,6 @@ extern file_ptr bfd_tell (bfd *);
extern int bfd_flush (bfd *);
extern int bfd_stat (bfd *, struct stat *);
-/* Deprecated old routines. */
-#if __GNUC__
-#define bfd_read(BUF, ELTSIZE, NITEMS, ABFD) \
- (_bfd_warn_deprecated ("bfd_read", __FILE__, __LINE__, __func__), \
- bfd_bread ((BUF), (ELTSIZE) * (NITEMS), (ABFD)))
-#define bfd_write(BUF, ELTSIZE, NITEMS, ABFD) \
- (_bfd_warn_deprecated ("bfd_write", __FILE__, __LINE__, __func__), \
- bfd_bwrite ((BUF), (ELTSIZE) * (NITEMS), (ABFD)))
-#else
-#define bfd_read(BUF, ELTSIZE, NITEMS, ABFD) \
- (_bfd_warn_deprecated ("bfd_read", (const char *) 0, 0, (const char *) 0), \
- bfd_bread ((BUF), (ELTSIZE) * (NITEMS), (ABFD)))
-#define bfd_write(BUF, ELTSIZE, NITEMS, ABFD) \
- (_bfd_warn_deprecated ("bfd_write", (const char *) 0, 0, (const char *) 0),\
- bfd_bwrite ((BUF), (ELTSIZE) * (NITEMS), (ABFD)))
-#endif
-extern void _bfd_warn_deprecated (const char *, const char *, int, const char *);
-
extern bool bfd_cache_close
(bfd *abfd);
/* NB: This declaration should match the autogenerated one in libbfd.h. */
diff --git a/bfd/bfd-in2.h b/bfd/bfd-in2.h
index fcfd22662f3..1eae010d9ca 100644
--- a/bfd/bfd-in2.h
+++ b/bfd/bfd-in2.h
@@ -369,24 +369,6 @@ extern file_ptr bfd_tell (bfd *);
extern int bfd_flush (bfd *);
extern int bfd_stat (bfd *, struct stat *);
-/* Deprecated old routines. */
-#if __GNUC__
-#define bfd_read(BUF, ELTSIZE, NITEMS, ABFD) \
- (_bfd_warn_deprecated ("bfd_read", __FILE__, __LINE__, __func__), \
- bfd_bread ((BUF), (ELTSIZE) * (NITEMS), (ABFD)))
-#define bfd_write(BUF, ELTSIZE, NITEMS, ABFD) \
- (_bfd_warn_deprecated ("bfd_write", __FILE__, __LINE__, __func__), \
- bfd_bwrite ((BUF), (ELTSIZE) * (NITEMS), (ABFD)))
-#else
-#define bfd_read(BUF, ELTSIZE, NITEMS, ABFD) \
- (_bfd_warn_deprecated ("bfd_read", (const char *) 0, 0, (const char *) 0), \
- bfd_bread ((BUF), (ELTSIZE) * (NITEMS), (ABFD)))
-#define bfd_write(BUF, ELTSIZE, NITEMS, ABFD) \
- (_bfd_warn_deprecated ("bfd_write", (const char *) 0, 0, (const char *) 0),\
- bfd_bwrite ((BUF), (ELTSIZE) * (NITEMS), (ABFD)))
-#endif
-extern void _bfd_warn_deprecated (const char *, const char *, int, const char *);
-
extern bool bfd_cache_close
(bfd *abfd);
/* NB: This declaration should match the autogenerated one in libbfd.h. */
diff --git a/bfd/libbfd.c b/bfd/libbfd.c
index 7b03bde05e0..d4f1478ec07 100644
--- a/bfd/libbfd.c
+++ b/bfd/libbfd.c
@@ -1074,34 +1074,6 @@ bfd_generic_is_local_label_name (bfd *abfd, const char *name)
return name[0] == locals_prefix;
}
-/* Give a warning at runtime if someone compiles code which calls
- old routines. */
-
-void
-_bfd_warn_deprecated (const char *what,
- const char *file,
- int line,
- const char *func)
-{
- /* Poor man's tracking of functions we've already warned about. */
- static size_t mask = 0;
-
- if (~(size_t) func & ~mask)
- {
- fflush (stdout);
- /* Note: separate sentences in order to allow
- for translation into other languages. */
- if (func)
- /* xgettext:c-format */
- fprintf (stderr, _("Deprecated %s called at %s line %d in %s\n"),
- what, file, line, func);
- else
- fprintf (stderr, _("Deprecated %s called\n"), what);
- fflush (stderr);
- mask |= ~(size_t) func;
- }
-}
-
/* Helper function for reading uleb128 encoded data. */
bfd_vma
--
Alan Modra
Australia Development Lab, IBM
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2023-04-28 6:15 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-04-28 6:15 Remove deprecated bfd_read Alan Modra
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).