summary refs log tree commit diff
path: root/elf/dl-version.c
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2001-09-05 03:42:43 +0000
committerUlrich Drepper <drepper@redhat.com>2001-09-05 03:42:43 +0000
commit407fe3bbb3708abc6796acc71c5fe34371c2847c (patch)
tree918b347c952d9d399789d21394b991bd42916977 /elf/dl-version.c
parent71ce28fd1abbccc9814d199d770e673135a33ee1 (diff)
downloadglibc-407fe3bbb3708abc6796acc71c5fe34371c2847c.tar.gz
glibc-407fe3bbb3708abc6796acc71c5fe34371c2847c.tar.xz
glibc-407fe3bbb3708abc6796acc71c5fe34371c2847c.zip
Update.
2001-09-04  Ulrich Drepper  <drepper@redhat.com>

	Correct very misleading message for error in failed runtime relocation.
	* elf/dl-error.c (_dl_signal_error): Take extra parameter to describe
	place of the error.
	(_dl_signal_cerror): Likewise.
	* sysdeps/generic/ldsodefs.h: Adjust prototypes.
	* elf/dl-close.c: Likewise.
	* elf/dl-deps.c: Likewise.
	* elf/dl-load.c: Likewise.
	* elf/dl-lookup.c: Likewise.
	* elf/dl-open.c: Likewise.
	* elf/dl-reloc.c: Likewise.
	* elf/dl-sym.c: Likewise.
	* elf/dl-version.c: Likewise.
	* sysdeps/generic/dl-sysdep.c: Likewise.
Diffstat (limited to 'elf/dl-version.c')
-rw-r--r--elf/dl-version.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/elf/dl-version.c b/elf/dl-version.c
index b362020e44..239507ee37 100644
--- a/elf/dl-version.c
+++ b/elf/dl-version.c
@@ -96,7 +96,7 @@ checking for version `%s' in file %s required by file %s\n",
 	 only print a message if verbose output is requested.  */
       if (verbose)
 	/* XXX We cannot translate the messages.  */
-	_dl_signal_cerror (0, map->l_name[0] ? map->l_name : _dl_argv[0],
+	_dl_signal_cerror (0, map->l_name[0] ? map->l_name : _dl_argv[0], NULL,
 			   make_string ("\
 no version information available (required by ",
 					name, ")"));
@@ -117,6 +117,7 @@ no version information available (required by ",
 	  buf[sizeof (buf) - 1] = '\0';
 	  /* XXX We cannot translate the message.  */
 	  _dl_signal_error (0, map->l_name[0] ? map->l_name : _dl_argv[0],
+			    NULL,
 			    make_string ("unsupported version ",
 					 _itoa_word (def->vd_version,
 						     &buf[sizeof (buf) - 1],
@@ -150,7 +151,7 @@ no version information available (required by ",
     {
       if (verbose)
 	/* XXX We cannot translate the message.  */
-	_dl_signal_cerror (0, map->l_name[0] ? map->l_name : _dl_argv[0],
+	_dl_signal_cerror (0, map->l_name[0] ? map->l_name : _dl_argv[0], NULL,
 			   make_string ("weak version `", string,
 					"' not found (required by ", name,
 					")"));
@@ -158,7 +159,7 @@ no version information available (required by ",
     }
 
   /* XXX We cannot translate the message.  */
-  _dl_signal_cerror (0, map->l_name[0] ? map->l_name : _dl_argv[0],
+  _dl_signal_cerror (0, map->l_name[0] ? map->l_name : _dl_argv[0], NULL,
 		     make_string ("version `", string,
 				  "' not found (required by ", name, ")"));
   return 1;
@@ -200,6 +201,7 @@ _dl_check_map_versions (struct link_map *map, int verbose, int trace_mode)
 	  buf[sizeof (buf) - 1] = '\0';
 	  /* XXX We cannot translate the message.  */
 	  _dl_signal_error (0, (*map->l_name ? map->l_name : _dl_argv[0]),
+			    NULL,
 			    make_string ("unsupported version ",
 					 _itoa_word (ent->vn_version,
 						     &buf[sizeof (buf) - 1],
@@ -289,6 +291,7 @@ _dl_check_map_versions (struct link_map *map, int verbose, int trace_mode)
       if (__builtin_expect (map->l_versions == NULL, 0))
 	{
 	  _dl_signal_error (ENOMEM, (*map->l_name ? map->l_name : _dl_argv[0]),
+			    NULL,
 			    N_("cannot allocate version reference table"));
 	  result = 1;
 	}