svn commit: r324596 - stable/11/cddl/contrib/opensolaris/lib/libdtrace/common

[Mark Johnston]

Author: markj
Date: Fri Oct 13 13:56:44 2017
New Revision: 324596
URL: https://svnweb.freebsd.org/changeset/base/324596

Log:
  MFC r324373:
  Avoid adding an extra "0x" prefix before pointer formats.

Modified:
  stable/11/cddl/contrib/opensolaris/lib/libdtrace/common/dt_dis.c
  stable/11/cddl/contrib/opensolaris/lib/libdtrace/common/dt_print.c
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/cddl/contrib/opensolaris/lib/libdtrace/common/dt_dis.c
==============================================================================
--- stable/11/cddl/contrib/opensolaris/lib/libdtrace/common/dt_dis.c	Fri Oct 13 13:53:19 2017	(r324595)
+++ stable/11/cddl/contrib/opensolaris/lib/libdtrace/common/dt_dis.c	Fri Oct 13 13:56:44 2017	(r324596)
@@ -434,7 +434,7 @@ dt_dis(const dtrace_difo_t *dp, FILE *fp)
 	ulong_t i = 0;
 	char type[DT_TYPE_NAMELEN];
 
-	(void) fprintf(fp, "\nDIFO 0x%p returns %s\n", (void *)dp,
+	(void) fprintf(fp, "\nDIFO %p returns %s\n", (void *)dp,
 	    dt_dis_typestr(&dp->dtdo_rtype, type, sizeof (type)));
 
 	(void) fprintf(fp, "%-3s %-8s    %s\n",

Modified: stable/11/cddl/contrib/opensolaris/lib/libdtrace/common/dt_print.c
==============================================================================
--- stable/11/cddl/contrib/opensolaris/lib/libdtrace/common/dt_print.c	Fri Oct 13 13:53:19 2017	(r324595)
+++ stable/11/cddl/contrib/opensolaris/lib/libdtrace/common/dt_print.c	Fri Oct 13 13:56:44 2017	(r324596)
@@ -377,7 +377,7 @@ dt_print_array(ctf_id_t base, ulong_t off, dt_printarg
 	ctf_id_t rtype;
 
 	if (ctf_array_info(ctfp, base, &car) == CTF_ERR) {
-		(void) fprintf(fp, "0x%p", (void *)addr);
+		(void) fprintf(fp, "%p", (void *)addr);
 		return;
 	}