Begin removing some unnecessary inlining, and fix naming

of _dl_fprintf which should really be _dl_dprintf
 -Erik

1 files changed, 16 insertions, 16 deletions

diff --git a/ldso/ldso/arm/elfinterp.c b/ldso/ldso/arm/elfinterp.c
index 09b934a1a..f0c83a166 100644
--- a/ldso/ldso/arm/elfinterp.c
+++ b/ldso/ldso/arm/elfinterp.c
@@ -81,7 +81,7 @@ unsigned long _dl_linux_resolver(struct elf_resolve *tpnt, int reloc_entry)
 	strtab = (char *) (tpnt->dynamic_info[DT_STRTAB] + tpnt->loadaddr);
 
 	if (reloc_type != R_ARM_JUMP_SLOT) {
-	  _dl_fprintf(2, "%s: Incorrect relocation type in jump relocations\n", 
+	  _dl_dprintf(2, "%s: Incorrect relocation type in jump relocations\n", 
 		       _dl_progname);
 	  _dl_exit(1);
 	};
@@ -92,7 +92,7 @@ unsigned long _dl_linux_resolver(struct elf_resolve *tpnt, int reloc_entry)
 	got_addr = (char **) instr_addr;
 
 #ifdef DL_DEBUG
-	_dl_fprintf(2, "Resolving symbol %s\n", 
+	_dl_dprintf(2, "Resolving symbol %s\n", 
 		strtab + symtab[symtab_index].st_name);
 #endif
 
@@ -100,13 +100,13 @@ unsigned long _dl_linux_resolver(struct elf_resolve *tpnt, int reloc_entry)
 	new_addr = _dl_find_hash(strtab + symtab[symtab_index].st_name, 
 		tpnt->symbol_scope, (unsigned long) got_addr, tpnt, 0);
 	if (!new_addr) {
-		_dl_fprintf(2, "%s: can't resolve symbol '%s'\n", 
+		_dl_dprintf(2, "%s: can't resolve symbol '%s'\n", 
 			_dl_progname, strtab + symtab[symtab_index].st_name);
 		_dl_exit(1);
 	};
 #ifdef DL_DEBUG
 	if ((unsigned long) got_addr < 0x40000000) {
-		_dl_fprintf(2, "Calling library function: %s\n", 
+		_dl_dprintf(2, "Calling library function: %s\n", 
 			strtab + symtab[symtab_index].st_name);
 	} else {
 		*got_addr = new_addr;
@@ -156,13 +156,13 @@ void _dl_parse_lazy_relocation_information(struct elf_resolve *tpnt,
 			*reloc_addr += (unsigned long) tpnt->loadaddr;
 			break;
 		default:
-			_dl_fprintf(2, "%s: (LAZY) can't handle reloc type ", 
+			_dl_dprintf(2, "%s: (LAZY) can't handle reloc type ", 
 				_dl_progname);
 #ifdef VERBOSE_DLINKER
-			_dl_fprintf(2, "%s ", _dl_reltypes[reloc_type]);
+			_dl_dprintf(2, "%s ", _dl_reltypes[reloc_type]);
 #endif
 			if (symtab_index)
-				_dl_fprintf(2, "'%s'\n", strtab + symtab[symtab_index].st_name);
+				_dl_dprintf(2, "'%s'\n", strtab + symtab[symtab_index].st_name);
 			_dl_exit(1);
 		};
 	};
@@ -239,7 +239,7 @@ int _dl_parse_relocation_information(struct elf_resolve *tpnt,
 			 * here, so all bases should be covered.
 			 */
 			if (!symbol_addr && ELF32_ST_BIND(symtab[symtab_index].st_info) == STB_GLOBAL) {
-				_dl_fprintf(2, "%s: can't resolve symbol '%s'\n", 
+				_dl_dprintf(2, "%s: can't resolve symbol '%s'\n", 
 						_dl_progname, strtab + symtab[symtab_index].st_name);
 				goof++;
 			}
@@ -267,7 +267,7 @@ int _dl_parse_relocation_information(struct elf_resolve *tpnt,
 						topbits = newvalue & 0xfe000000;
 						if (topbits != 0xfe000000 && topbits != 0x00000000)
 						{
-							_dl_fprintf(2, "R_ARM_PC24 relocation out of range ");
+							_dl_dprintf(2, "R_ARM_PC24 relocation out of range ");
 							_dl_exit(1);
 						}
 					}
@@ -286,20 +286,20 @@ int _dl_parse_relocation_information(struct elf_resolve *tpnt,
 			case R_ARM_COPY:						
 #if 0							
 				/* Do this later */
-				_dl_fprintf(2, "Doing copy for symbol ");
-				if (symtab_index) _dl_fprintf(2, strtab + symtab[symtab_index].st_name);
-				_dl_fprintf(2, "\n");
+				_dl_dprintf(2, "Doing copy for symbol ");
+				if (symtab_index) _dl_dprintf(2, strtab + symtab[symtab_index].st_name);
+				_dl_dprintf(2, "\n");
 				_dl_memcpy((void *) symtab[symtab_index].st_value, 
 						(void *) symbol_addr, symtab[symtab_index].st_size);
 #endif
 				break;
 			default:
-				_dl_fprintf(2, "%s: can't handle reloc type ", _dl_progname);
+				_dl_dprintf(2, "%s: can't handle reloc type ", _dl_progname);
 #ifdef VERBOSE_DLINKER
-				_dl_fprintf(2, "%s ", _dl_reltypes[reloc_type]);
+				_dl_dprintf(2, "%s ", _dl_reltypes[reloc_type]);
 #endif
 				if (symtab_index)
-					_dl_fprintf(2, "'%s'\n", strtab + symtab[symtab_index].st_name);
+					_dl_dprintf(2, "'%s'\n", strtab + symtab[symtab_index].st_name);
 				_dl_exit(1);
 		};
 
@@ -360,7 +360,7 @@ int _dl_parse_copy_information(struct dyn_elf *xpnt, unsigned long rel_addr,
 				symtab[symtab_index].st_name, xpnt->next, 
 				(unsigned long) reloc_addr, NULL, 1);
 			if (!symbol_addr) {
-				_dl_fprintf(2, "%s: can't resolve symbol '%s'\n", 
+				_dl_dprintf(2, "%s: can't resolve symbol '%s'\n", 
 					_dl_progname, strtab + symtab[symtab_index].st_name);
 				goof++;
 			};