From owner-svn-src-stable-11@freebsd.org Fri Oct 13 13:56:45 2017 Return-Path: Delivered-To: svn-src-stable-11@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 7E004E48EB2; Fri, 13 Oct 2017 13:56:45 +0000 (UTC) (envelope-from markj@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4C50C6567C; Fri, 13 Oct 2017 13:56:45 +0000 (UTC) (envelope-from markj@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v9DDuiHP020048; Fri, 13 Oct 2017 13:56:44 GMT (envelope-from markj@FreeBSD.org) Received: (from markj@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v9DDuiOP020046; Fri, 13 Oct 2017 13:56:44 GMT (envelope-from markj@FreeBSD.org) Message-Id: <201710131356.v9DDuiOP020046@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: markj set sender to markj@FreeBSD.org using -f From: Mark Johnston Date: Fri, 13 Oct 2017 13:56:44 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: svn commit: r324596 - stable/11/cddl/contrib/opensolaris/lib/libdtrace/common X-SVN-Group: stable-11 X-SVN-Commit-Author: markj X-SVN-Commit-Paths: stable/11/cddl/contrib/opensolaris/lib/libdtrace/common X-SVN-Commit-Revision: 324596 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-11@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for only the 11-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 13 Oct 2017 13:56:45 -0000 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; }