svn commit: trunk/uClibc/ldso: ldso libdl

[bernds at uclibc.org]

Author: bernds
Date: 2007-12-03 15:13:10 -0800 (Mon, 03 Dec 2007)
New Revision: 20617

Log:
Fix a few warnings introduced by my previous commits.


Modified:
   trunk/uClibc/ldso/ldso/dl-hash.c
   trunk/uClibc/ldso/libdl/libdl.c


Changeset:
Modified: trunk/uClibc/ldso/ldso/dl-hash.c
===================================================================
--- trunk/uClibc/ldso/ldso/dl-hash.c	2007-12-03 23:10:14 UTC (rev 20616)
+++ trunk/uClibc/ldso/ldso/dl-hash.c	2007-12-03 23:13:10 UTC (rev 20617)
@@ -343,7 +343,7 @@
 				if (tpntp)
 					*tpntp = tpnt;
 #endif
-				return DL_FIND_HASH_VALUE (tpnt, type_class, sym);
+				return (char *) DL_FIND_HASH_VALUE (tpnt, type_class, sym);
 			default:	/* Local symbols not handled here */
 				break;
 		}
@@ -353,7 +353,7 @@
 		if (tpntp)
 			*tpntp = weak_tpnt;
 #endif
-		return DL_FIND_HASH_VALUE (weak_tpnt, type_class, weak_sym);
+		return (char *) DL_FIND_HASH_VALUE (weak_tpnt, type_class, weak_sym);
 	}
 #ifdef __FDPIC__
 	if (tpntp)

Modified: trunk/uClibc/ldso/libdl/libdl.c
===================================================================
--- trunk/uClibc/ldso/libdl/libdl.c	2007-12-03 23:10:14 UTC (rev 20616)
+++ trunk/uClibc/ldso/libdl/libdl.c	2007-12-03 23:13:10 UTC (rev 20617)
@@ -447,8 +447,8 @@
 	struct dyn_elf *rpnt;
 	void *ret;
 	/* Nastiness to support underscore prefixes.  */
+#ifndef __UCLIBC_NO_UNDERSCORES__
 	char tmp_buf[80];
-#ifndef __UCLIBC_NO_UNDERSCORES__
 	char *name2 = tmp_buf;
 	size_t nlen = strlen (name) + 1;
 	if (nlen + 1 > sizeof (tmp_buf))