rename *fdprint function to *dprintf, like libc version

3 files changed, 24 insertions, 24 deletions

diff --git a/libexec/ld.so/dl_printf.c b/libexec/ld.so/dl_printf.c
index 02d5a5d8f09..2bd20571f3d 100644
--- a/libexec/ld.so/dl_printf.c
+++ b/libexec/ld.so/dl_printf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: dl_printf.c,v 1.20 2017/01/24 23:37:10 millert Exp $	*/
+/*	$OpenBSD: dl_printf.c,v 1.21 2017/08/29 15:25:51 deraadt Exp $	*/
 
 /*-
  * Copyright (c) 1993
@@ -109,7 +109,7 @@ _dl_printf(const char *fmt, ...)
 }
 
 void
-_dl_fdprintf(int fd, const char *fmt, ...)
+_dl_dprintf(int fd, const char *fmt, ...)
 {
 	va_list ap;
 
diff --git a/libexec/ld.so/dlfcn.c b/libexec/ld.so/dlfcn.c
index 16f3ae098a3..b51c50aa738 100644
--- a/libexec/ld.so/dlfcn.c
+++ b/libexec/ld.so/dlfcn.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: dlfcn.c,v 1.97 2017/05/08 02:34:01 guenther Exp $ */
+/*	$OpenBSD: dlfcn.c,v 1.98 2017/08/29 15:25:51 deraadt Exp $ */
 
 /*
  * Copyright (c) 1998 Per Fogelstrom, Opsycon AB
@@ -378,7 +378,7 @@ _dl_tracefmt(int fd, elf_object_t *object, const char *fmt1, const char *fmt2,
 
 	for (i = 0; fmt[i]; i++) {
 		if (fmt[i] != '%' && fmt[i] != '\\') {
-			_dl_fdprintf(fd, "%c", fmt[i]);
+			_dl_dprintf(fd, "%c", fmt[i]);
 			continue;
 		}
 		if (fmt[i] == '%') {
@@ -387,46 +387,46 @@ _dl_tracefmt(int fd, elf_object_t *object, const char *fmt1, const char *fmt2,
 			case '\0':
 				return;
 			case '%':
-				_dl_fdprintf(fd, "%c", '%');
+				_dl_dprintf(fd, "%c", '%');
 				break;
 			case 'A':
-				_dl_fdprintf(fd, "%s", _dl_traceprog ?
+				_dl_dprintf(fd, "%s", _dl_traceprog ?
 				    _dl_traceprog : "");
 				break;
 			case 'a':
-				_dl_fdprintf(fd, "%s", __progname);
+				_dl_dprintf(fd, "%s", __progname);
 				break;
 			case 'e':
-				_dl_fdprintf(fd, "%lX",
+				_dl_dprintf(fd, "%lX",
 				    (void *)(object->load_base +
 				    object->load_size));
 				break;
 			case 'g':
-				_dl_fdprintf(fd, "%d", object->grprefcount);
+				_dl_dprintf(fd, "%d", object->grprefcount);
 				break;
 			case 'm':
-				_dl_fdprintf(fd, "%d", object->sod.sod_major);
+				_dl_dprintf(fd, "%d", object->sod.sod_major);
 				break;
 			case 'n':
-				_dl_fdprintf(fd, "%d", object->sod.sod_minor);
+				_dl_dprintf(fd, "%d", object->sod.sod_minor);
 				break;
 			case 'O':
-				_dl_fdprintf(fd, "%d", object->opencount);
+				_dl_dprintf(fd, "%d", object->opencount);
 				break;
 			case 'o':
-				_dl_fdprintf(fd, "%s", object->sod.sod_name);
+				_dl_dprintf(fd, "%s", object->sod.sod_name);
 				break;
 			case 'p':
-				_dl_fdprintf(fd, "%s", object->load_name);
+				_dl_dprintf(fd, "%s", object->load_name);
 				break;
 			case 'r':
-				_dl_fdprintf(fd, "%d", object->refcount);
+				_dl_dprintf(fd, "%d", object->refcount);
 				break;
 			case 't':
-				_dl_fdprintf(fd, "%s", objtypename);
+				_dl_dprintf(fd, "%s", objtypename);
 				break;
 			case 'x':
-				_dl_fdprintf(fd, "%lX", object->load_base);
+				_dl_dprintf(fd, "%lX", object->load_base);
 				break;
 			}
 		}
@@ -436,16 +436,16 @@ _dl_tracefmt(int fd, elf_object_t *object, const char *fmt1, const char *fmt2,
 			case '\0':
 				return;
 			case 'n':
-				_dl_fdprintf(fd, "%c", '\n');
+				_dl_dprintf(fd, "%c", '\n');
 				break;
 			case 'r':
-				_dl_fdprintf(fd, "%c", '\r');
+				_dl_dprintf(fd, "%c", '\r');
 				break;
 			case 't':
-				_dl_fdprintf(fd, "%c", '\t');
+				_dl_dprintf(fd, "%c", '\t');
 				break;
 			default:
-				_dl_fdprintf(fd, "%c", fmt[i]);
+				_dl_dprintf(fd, "%c", fmt[i]);
 				break;
 			}
 		}
@@ -478,7 +478,7 @@ _dl_show_objects(void)
 	    "\t%x %e %t %O    %r   %g      %p\n";
 
 	if (_dl_tracefmt1 == NULL && _dl_tracefmt2 == NULL)
-		_dl_fdprintf(outputfd, "\tStart   %s End     %s Type Open Ref GrpRef Name\n",
+		_dl_dprintf(outputfd, "\tStart   %s End     %s Type Open Ref GrpRef Name\n",
 		    pad, pad);
 
 	if (_dl_tracelib) {
diff --git a/libexec/ld.so/util.h b/libexec/ld.so/util.h
index 9bec531b7a5..9820fb38622 100644
--- a/libexec/ld.so/util.h
+++ b/libexec/ld.so/util.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: util.h,v 1.30 2017/01/24 07:48:37 guenther Exp $	*/
+/*	$OpenBSD: util.h,v 1.31 2017/08/29 15:25:51 deraadt Exp $	*/
 
 /*
  * Copyright (c) 1998 Todd C. Miller <Todd.Miller@courtesan.com>
@@ -46,7 +46,7 @@ size_t _dl_strlen(const char *);
 size_t _dl_strlcat(char *dst, const char *src, size_t siz);
 void _dl_printf(const char *fmt, ...);
 void _dl_vprintf(const char *fmt, va_list ap);
-void _dl_fdprintf(int, const char *fmt, ...);
+void _dl_dprintf(int, const char *fmt, ...);
 void _dl_show_objects(void);
 void _dl_arc4randombuf(void *, size_t);
 u_int32_t _dl_arc4random(void);