From owner-freebsd-scsi@FreeBSD.ORG  Mon Nov 20 00:21:13 2006
Return-Path: <owner-freebsd-scsi@FreeBSD.ORG>
X-Original-To: freebsd-scsi@freebsd.org
Delivered-To: freebsd-scsi@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 0240716A4A7
	for <freebsd-scsi@freebsd.org>; Mon, 20 Nov 2006 00:21:13 +0000 (UTC)
	(envelope-from mjacob@freebsd.org)
Received: from ns1.feral.com (ns1.feral.com [192.67.166.1])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 2E77843F54
	for <freebsd-scsi@freebsd.org>; Mon, 20 Nov 2006 00:17:28 +0000 (GMT)
	(envelope-from mjacob@freebsd.org)
Received: from ns1.feral.com (localhost [127.0.0.1])
	by ns1.feral.com (8.13.8/8.13.8) with ESMTP id kAK0HPER045258
	for <freebsd-scsi@freebsd.org>; Sun, 19 Nov 2006 16:17:35 -0800 (PST)
	(envelope-from mjacob@freebsd.org)
Received: from localhost (mjacob@localhost)
	by ns1.feral.com (8.13.8/8.13.8/Submit) with ESMTP id kAK0HPsP045255
	for <freebsd-scsi@freebsd.org>; Sun, 19 Nov 2006 16:17:25 -0800 (PST)
	(envelope-from mjacob@freebsd.org)
X-Authentication-Warning: ns1.feral.com: mjacob owned process doing -bs
Date: Sun, 19 Nov 2006 16:17:25 -0800 (PST)
From: mjacob@freebsd.org
X-X-Sender: mjacob@ns1.feral.com
To: freebsd-scsi@freebsd.org
Message-ID: <20061119161631.L44297@ns1.feral.com>
MIME-Version: 1.0
Content-Type: TEXT/PLAIN; charset=US-ASCII; format=flowed
Subject: a code reduction function addition to cam_xpt
X-BeenThere: freebsd-scsi@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: mjacob@freebsd.org
List-Id: SCSI subsystem <freebsd-scsi.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-scsi>,
	<mailto:freebsd-scsi-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-scsi>
List-Post: <mailto:freebsd-scsi@freebsd.org>
List-Help: <mailto:freebsd-scsi-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-scsi>,
	<mailto:freebsd-scsi-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 20 Nov 2006 00:21:13 -0000

There are *far* too many:

 	xpt_print_path(path);
 	printf("foo\n");

constructs. How about we just join them?

==== //depot/projects/newisp/cam/cam_xpt.c#12 - /home/FreeBSD/p4/newisp/cam/cam_xpt.c ====
@@ -63,6 +63,7 @@
  #include <cam/scsi/scsi_all.h>
  #include <cam/scsi/scsi_message.h>
  #include <cam/scsi/scsi_pass.h>
+#include <machine/stdarg.h>	/* for xpt_print below */
  #include "opt_cam.h"

  /* Datastructures internal to the xpt layer */
@@ -4160,6 +4161,16 @@
  	}
  }

+void
+xpt_print(struct cam_path *path, const char *fmt, ...)
+{
+	va_list ap;
+	xpt_print_path(path);
+	va_start(ap, fmt);
+	vprintf(fmt, ap);
+	va_end(ap);
+}
+
==== //depot/projects/newisp/cam/cam_xpt.h#1 - /home/FreeBSD/p4/newisp/cam/cam_xpt.h ====
@@ -62,6 +62,7 @@
  int			xpt_path_comp(struct cam_path *path1,
  				      struct cam_path *path2);
  void			xpt_print_path(struct cam_path *path);
+void			xpt_print(struct cam_path *path, const char *fmt, ...);
  int			xpt_path_string(struct cam_path *path, char *str,
  					size_t str_len);
  path_id_t		xpt_path_path_id(struct cam_path *path);