This is the mail archive of the libc-alpha@sources.redhat.com mailing list for the glibc project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]

[patch] fix usage of _dl_signal_error


I wasn't exactly sure what to use, so I just dropped NULL's. Feel free
to fill them in with more appropriate strings.

2001-09-08  Ben Collins  <bcollins@debian.org>

	* sysdeps/arm/dl-machine.h: Fix usage of new _dl_signal_error()
	format.
	* sysdeps/generic/dl-machine.h: Likewise.
	* sysdeps/hppa/dl-fptr.c: Likewise.
	* sysdeps/ia64/dl-fptr.c: Likewise.
	* sysdeps/mach/hurd/dl-sysdep.c: Likewise.
	* sysdeps/mips/dl-machine.h: Likewise.
	* sysdeps/mips/mips64/dl-machine.h: Likewise.
	* sysdeps/powerpc/dl-machine.c: Likewise.

-- 
 .----------=======-=-======-=========-----------=====------------=-=-----.
/  Ben Collins  --  ...on that fantastic voyage...  --  Debian GNU/Linux   \
`  bcollins@debian.org  --  bcollins@openldap.org  --  bcollins@linux.com  '
 `---=========------=======-------------=-=-----=-===-======-------=--=---'
--- sysdeps/arm/dl-machine.h~ 	2001/08/26 22:26:33	1.30
+++ sysdeps/arm/dl-machine.h 	2001/09/08 15:38:13
@@ -501,7 +501,7 @@
 		 topbits = newvalue & 0xfe000000;
 		 if (topbits != 0xfe000000 && topbits != 0x00000000)
 		   {
-		     _dl_signal_error (0, map->l_name,
+		     _dl_signal_error (0, map->l_name, NULL,
 				       "R_ARM_PC24 relocation out of range");
 		   }
 	       }
--- sysdeps/generic/dl-machine.h~ 	2001/07/06 04:55:49	1.7
+++ sysdeps/generic/dl-machine.h 	2001/09/08 15:38:15
@@ -95,7 +95,7 @@
 					 int noplt))
 {
   _dl_signal_error (0, "Elf32_Rela relocation requested -- unused on "
-		    ELF_MACHINE_NAME);
+		    NULL, ELF_MACHINE_NAME);
 }
 
 
--- sysdeps/hppa/dl-fptr.c~ 	2001/07/06 04:55:51	1.2
+++ sysdeps/hppa/dl-fptr.c 	2001/09/08 15:38:22
@@ -101,7 +101,7 @@
 	      if (_dl_zerofd == -1)
 		{
 		  __close (fd);
-		  _dl_signal_error (errno, NULL,
+		  _dl_signal_error (errno, NULL, NULL,
 				    "cannot open zero fill device");
 		}
 	    }
@@ -110,7 +110,7 @@
 	  __fptr_next = __mmap (0, _dl_pagesize, PROT_READ | PROT_WRITE,
 				MAP_ANON | MAP_PRIVATE, ANONFD, 0);
 	  if (__fptr_next == MAP_FAILED)
-	    _dl_signal_error(errno, NULL, "cannot map page for fptr");
+	    _dl_signal_error(errno, NULL, NULL, "cannot map page for fptr");
 	  __fptr_count = _dl_pagesize / sizeof (struct hppa_fptr);
 	}
       f = __fptr_next++;
--- sysdeps/ia64/dl-fptr.c~ 	2001/07/26 00:23:57	1.4
+++ sysdeps/ia64/dl-fptr.c 	2001/09/08 15:38:31
@@ -109,7 +109,7 @@
   new_table = __mmap (0, size, PROT_READ | PROT_WRITE,
 		      MAP_ANON | MAP_PRIVATE, -1, 0);
   if (new_table == MAP_FAILED)
-    _dl_signal_error (errno, NULL, "cannot map pages for fdesc table");
+    _dl_signal_error (errno, NULL, NULL, "cannot map pages for fdesc table");
 
   new_table->len = (size - sizeof (*new_table)) / sizeof (struct ia64_fdesc);
   fdesc = &new_table->fdesc[0];
@@ -182,7 +182,7 @@
   fptr_table = __mmap (NULL, size, PROT_READ | PROT_WRITE,
 		       MAP_ANON | MAP_PRIVATE, -1, 0);
   if (fptr_table == MAP_FAILED)
-    _dl_signal_error (errno, NULL, "cannot map pages for fptr table");
+    _dl_signal_error (errno, NULL, NULL, "cannot map pages for fptr table");
 
   map->l_mach.fptr_table_len = len;
   map->l_mach.fptr_table = fptr_table;
@@ -203,7 +203,7 @@
   symidx = sym - symtab;
 
   if (symidx >= map->l_mach.fptr_table_len)
-    _dl_signal_error (0, NULL,
+    _dl_signal_error (0, NULL, NULL,
 		      "internal error: symidx out of range of fptr table");
 
   if (!ftab[symidx])
--- sysdeps/mach/hurd/dl-sysdep.c~ 	2001/07/06 04:55:56	1.59
+++ sysdeps/mach/hurd/dl-sysdep.c 	2001/09/08 15:38:37
@@ -615,7 +615,7 @@
   /* Return an empty array.  Hurd has no hardware capabilities.  */
   result = (struct r_strlenpair *) malloc (sizeof (*result));
   if (result == NULL)
-    _dl_signal_error (ENOMEM, NULL, "cannot create capability list");
+    _dl_signal_error (ENOMEM, NULL, NULL, "cannot create capability list");
 
   result[0].str = (char *) result;	/* Does not really matter.  */
   result[0].len = 0;
--- sysdeps/mips/dl-machine.h~ 	2001/08/29 18:48:49	1.54
+++ sysdeps/mips/dl-machine.h 	2001/09/08 15:38:44
@@ -239,7 +239,7 @@
 	}
     }
 
-  _dl_signal_error (0, NULL, "cannot find runtime link map");
+  _dl_signal_error (0, NULL, NULL, "cannot find runtime link map");
   return NULL;
 }
 
--- sysdeps/mips/mips64/dl-machine.h~ 	2001/08/26 22:26:38	1.17
+++ sysdeps/mips/mips64/dl-machine.h 	2001/09/08 15:38:46
@@ -311,7 +311,7 @@
 	}
     }
 
-  _dl_signal_error (0, NULL, "cannot find runtime link map");
+  _dl_signal_error (0, NULL, NULL, "cannot find runtime link map");
   return NULL;
 }
 
--- sysdeps/powerpc/dl-machine.c~ 	2001/07/25 06:36:52	1.20
+++ sysdeps/powerpc/dl-machine.c 	2001/09/08 15:38:50
@@ -391,7 +391,7 @@
       t = stpcpy (t, "'");
     }
   t = stpcpy (t, " out of range");
-  _dl_signal_error (0, map->l_name, buffer);
+  _dl_signal_error (0, map->l_name, NULL, buffer);
 }
 
 void

Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]