This is the mail archive of the binutils@sources.redhat.com mailing list for the binutils project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

tidy ppc64_elf_get_synthetic_symtab return value


Allows callers to distinguish an error return from the no symbols case.

	* elf64-ppc.c (ppc64_elf_get_synthetic_symtab): Return -1 on errors
	rather than 0.

Applying mainline and branch.

Index: bfd/elf64-ppc.c
===================================================================
RCS file: /cvs/src/src/bfd/elf64-ppc.c,v
retrieving revision 1.194
diff -u -p -r1.194 elf64-ppc.c
--- bfd/elf64-ppc.c	5 Mar 2005 11:44:14 -0000	1.194
+++ bfd/elf64-ppc.c	1 Apr 2005 02:00:21 -0000
@@ -2687,7 +2687,7 @@ ppc64_elf_get_synthetic_symtab (bfd *abf
 
   syms = bfd_malloc ((symcount + 1) * sizeof (*syms));
   if (syms == NULL)
-    return 0;
+    return -1;
 
   if (!relocatable && static_count != 0 && dyn_count != 0)
     {
@@ -2758,11 +2758,15 @@ ppc64_elf_get_synthetic_symtab (bfd *abf
 
       slurp_relocs = get_elf_backend_data (abfd)->s->slurp_reloc_table;
       relcount = (opd->flags & SEC_RELOC) ? opd->reloc_count : 0;
-
-      if (! relcount
-	  || ! (*slurp_relocs) (abfd, opd, static_syms, FALSE))
+      if (relcount == 0)
 	goto done;
 
+      if (!(*slurp_relocs) (abfd, opd, static_syms, FALSE))
+	{
+	  count = -1;
+	  goto done;
+	}
+
       size = 0;
       for (i = secsymend, r = opd->relocation; i < opdsymend; ++i)
 	{
@@ -2794,7 +2798,7 @@ ppc64_elf_get_synthetic_symtab (bfd *abf
       s = *ret = bfd_malloc (size);
       if (s == NULL)
 	{
-	  count = 0;
+	  count = -1;
 	  goto done;
 	}
 
@@ -2847,6 +2851,7 @@ ppc64_elf_get_synthetic_symtab (bfd *abf
 	    free_contents_and_exit:
 	      free (contents);
 	    }
+	  count = -1;
 	  goto done;
 	}
 
@@ -2866,10 +2871,7 @@ ppc64_elf_get_synthetic_symtab (bfd *abf
 
       s = *ret = bfd_malloc (size);
       if (s == NULL)
-	{
-	  count = 0;
-	  goto free_contents_and_exit;
-	}
+	goto free_contents_and_exit;
 
       names = (char *) (s + count);
 

-- 
Alan Modra
IBM OzLabs - Linux Technology Centre


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