From owner-p4-projects@FreeBSD.ORG  Wed Dec 19 03:26:32 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 4A57616A419; Wed, 19 Dec 2007 03:26:32 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id EA09616A46B
	for <perforce@freebsd.org>; Wed, 19 Dec 2007 03:26:31 +0000 (UTC)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id ED4E413C46A
	for <perforce@freebsd.org>; Wed, 19 Dec 2007 03:26:31 +0000 (UTC)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lBJ3QVDO008132
	for <perforce@freebsd.org>; Wed, 19 Dec 2007 03:26:31 GMT
	(envelope-from jb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lBJ3QVnk008129
	for perforce@freebsd.org; Wed, 19 Dec 2007 03:26:31 GMT
	(envelope-from jb@freebsd.org)
Date: Wed, 19 Dec 2007 03:26:31 GMT
Message-Id: <200712190326.lBJ3QVnk008129@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	jb@freebsd.org using -f
From: John Birrell <jb@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 131208 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 19 Dec 2007 03:26:32 -0000

http://perforce.freebsd.org/chv.cgi?CH=131208

Change 131208 by jb@jb_freebsd1 on 2007/12/19 03:26:08

	Sub out a bit more code that we don't use yet to avoid having to
	get a fasttrap.h for each of the other archs that FreeBSD supports.

Affected files ...

.. //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/dt_pid.c#9 edit

Differences ...

==== //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/dt_pid.c#9 (text) ====

@@ -78,6 +78,7 @@
 }
 #endif
 
+#ifdef DOODAD
 static int
 dt_pid_error(dtrace_hdl_t *dtp, dt_pcb_t *pcb, dt_proc_t *dpr,
     fasttrap_probe_spec_t *ftp, dt_errtag_t tag, const char *fmt, ...)
@@ -104,6 +105,7 @@
 
 	return (1);
 }
+#endif
 
 #ifdef DOODAD
 static int
@@ -637,8 +639,10 @@
 	}
 
 	if (last == NULL || (*(++last) == '\0')) {
+#ifdef DOODAD
 		(void) dt_pid_error(dtp, pcb, dpr, NULL, D_PROC_BADPROV,
 		    "'%s' is not a valid provider", pdp->dtpd_provider);
+#endif
 		return (-1);
 	}
 
@@ -646,8 +650,10 @@
 	pid = strtol(last, &end, 10);
 
 	if (errno != 0 || end == last || end[0] != '\0' || pid <= 0) {
+#ifdef DOODAD
 		(void) dt_pid_error(dtp, pcb, dpr, NULL, D_PROC_BADPID,
 		    "'%s' does not contain a valid pid", pdp->dtpd_provider);
+#endif
 		return (-1);
 	}