Remove /usr/lib/elf from a default search path.

Move xprintf to malloc.c, it is only used there. Make static.

Submitted by:	phantom

1 files changed, 0 insertions, 17 deletions

diff --git a/libexec/rtld-elf/rtld.c b/libexec/rtld-elf/rtld.c
index 4408d63..1febf0c 100644
--- a/libexec/rtld-elf/rtld.c
+++ b/libexec/rtld-elf/rtld.c
@@ -118,7 +118,6 @@ static void unload_object(Obj_Entry *);
 static void unref_dag(Obj_Entry *);
 
 void r_debug_state(struct r_debug*, struct link_map*);
-void xprintf(const char *, ...) __printflike(1, 2);
 
 /*
  * Data declarations.
@@ -2172,19 +2171,3 @@ unref_dag(Obj_Entry *root)
 	    objlist_remove(&elm->obj->dldags, root);
     }
 }
-
-/*
- * Non-mallocing printf, for use by malloc itself.
- * XXX - This doesn't belong in this module.
- */
-void
-xprintf(const char *fmt, ...)
-{
-    char buf[256];
-    va_list ap;
-
-    va_start(ap, fmt);
-    vsprintf(buf, fmt, ap);
-    (void)write(STDOUT_FILENO, buf, strlen(buf));
-    va_end(ap);
-}