Remove deprecated bfd_read

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.

diff --git a/bfd/bfd-in.h b/bfd/bfd-in.h
index eb6ee9cf816feda94d5b63fa833b88afea855e6d..de7285626cd35a34d7c6c910a2c0c32f4b26d4ea 100644 (file)
--- 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 fcfd22662f33522dc627468b6a50f1f85a1d1a3b..1eae010d9ca72bc29d4453046d5a49ba5e6dadc1 100644 (file)
--- 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 7b03bde05e0c295db2d31b588f5239444678c200..d4f1478ec07d68cdfc8d5d44045a34ba7e0e8c1a 100644 (file)
--- 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