[uClibc-cvs] uClibc/ldso/ldso/m68k elfinterp.c,1.14,1.15

[Erik Andersen]

Update of /var/cvs/uClibc/ldso/ldso/m68k
In directory nail:/tmp/cvs-serv13904/ldso/m68k

Modified Files:
	elfinterp.c 
Log Message:
Modify interfaces for _dl_parse_relocation_information()
_dl_parse_lazy_relocation_information() and _dl_parse_copy_information()
so they are all consistant, allowing for future consolidation.

Trim some trailing whitespace as well.


Index: elfinterp.c
===================================================================
RCS file: /var/cvs/uClibc/ldso/ldso/m68k/elfinterp.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- elfinterp.c	5 Nov 2002 18:21:04 -0000	1.14
+++ elfinterp.c	29 Jan 2004 12:18:52 -0000	1.15
@@ -1,7 +1,7 @@
 /* vi: set sw=4 ts=4: */
 /* m68k ELF shared library loader suppport
  *
- * Copyright (c) 1994-2000 Eric Youngdale, Peter MacDonald, 
+ * Copyright (c) 1994-2000 Eric Youngdale, Peter MacDonald,
  *				David Engel, Hongjiu Lu and Mitch D'Souza
  * Adapted to ELF/68k by Andreas Schwab.
  *
@@ -56,7 +56,7 @@
    working. */
 
 
-unsigned int _dl_linux_resolver (int dummy1, int dummy2, 
+unsigned int _dl_linux_resolver (int dummy1, int dummy2,
 	struct elf_resolve *tpnt, int reloc_entry)
 {
   int reloc_type;
@@ -112,7 +112,7 @@
 		{
 			_dl_dprintf(_dl_debug_file, "\nresolve function: %s",
 					strtab + symtab[symtab_index].st_name);
-			if(_dl_debug_detail) _dl_dprintf(_dl_debug_file, 
+			if(_dl_debug_detail) _dl_dprintf(_dl_debug_file,
 					"\tpatch %x ==> %x @ %x", *got_addr, new_addr, got_addr);
 		}
 	}
@@ -126,9 +126,8 @@
   return (unsigned int) new_addr;
 }
 
-void
-_dl_parse_lazy_relocation_information (struct elf_resolve *tpnt,
-                       unsigned long rel_addr, unsigned long rel_size, int type)
+void _dl_parse_lazy_relocation_information(struct dyn_elf *rpnt,
+	unsigned long rel_addr, unsigned long rel_size, int type)
 {
   int i;
   char *strtab;
@@ -137,6 +136,7 @@
   Elf32_Sym *symtab;
   Elf32_Rela *rpnt;
   unsigned int *reloc_addr;
+  struct elf_resolve *tpnt = rpnt->dyn;
 
   /* Now parse the relocation information.  */
   rpnt = (Elf32_Rela *) (rel_addr + tpnt->loadaddr);
@@ -179,9 +179,8 @@
     }
 }
 
-int 
-_dl_parse_relocation_information (struct elf_resolve *tpnt,
-                  unsigned long rel_addr, unsigned long rel_size, int type)
+int _dl_parse_relocation_information(struct dyn_elf *rpnt,
+	unsigned long rel_addr, unsigned long rel_size, int type)
 {
   int i;
   char *strtab;
@@ -192,6 +191,7 @@
   unsigned int *reloc_addr;
   unsigned int symbol_addr;
   int symtab_index;
+  struct elf_resolve *tpnt = rpnt->dyn;
   /* Now parse the relocation information */
 
   rpnt = (Elf32_Rela *) (rel_addr + tpnt->loadaddr);
@@ -302,9 +302,8 @@
 /* No, there are cases where the SVr4 linker fails to emit COPY relocs
    at all.  */
 
-int 
-_dl_parse_copy_information (struct dyn_elf *xpnt, unsigned long rel_addr,
-			    unsigned long rel_size, int type)
+int _dl_parse_copy_information(struct dyn_elf *xpnt,
+	unsigned long rel_addr, unsigned long rel_size, int type)
 {
   int i;
   char *strtab;