From owner-svn-src-head@FreeBSD.ORG Fri Jan 28 08:00:58 2011 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 1105D106566B; Fri, 28 Jan 2011 08:00:58 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 008338FC12; Fri, 28 Jan 2011 08:00:58 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p0S80vK4064970; Fri, 28 Jan 2011 08:00:57 GMT (envelope-from hselasky@svn.freebsd.org) Received: (from hselasky@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p0S80vtb064968; Fri, 28 Jan 2011 08:00:57 GMT (envelope-from hselasky@svn.freebsd.org) Message-Id: <201101280800.p0S80vtb064968@svn.freebsd.org> From: Hans Petter Selasky Date: Fri, 28 Jan 2011 08:00:57 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r218010 - head/usr.sbin/usbdump X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 28 Jan 2011 08:00:58 -0000 Author: hselasky Date: Fri Jan 28 08:00:57 2011 New Revision: 218010 URL: http://svn.freebsd.org/changeset/base/218010 Log: - Remove double semicolon. - Remove reference to sprintf. Use printf directly. This part of the code should be optimised further to avoid many small printouts. Setting a sensible line buffer length could help aswell when printing out megabytes of data per second. Approved by: thompsa (mentor) Modified: head/usr.sbin/usbdump/usbdump.c Modified: head/usr.sbin/usbdump/usbdump.c ============================================================================== --- head/usr.sbin/usbdump/usbdump.c Fri Jan 28 07:04:01 2011 (r218009) +++ head/usr.sbin/usbdump/usbdump.c Fri Jan 28 08:00:57 2011 (r218010) @@ -72,7 +72,7 @@ struct usbcap_filehdr { static int doexit = 0; static int pkt_captured = 0; static int verbose = 0; -static const char *i_arg = "usbus0";; +static const char *i_arg = "usbus0"; static const char *r_arg = NULL; static const char *w_arg = NULL; static const char *errstr_table[USB_ERR_MAX] = { @@ -185,11 +185,10 @@ static void hexdump(const char *region, size_t len) { const char *line; - int x, c; - char lbuf[80]; -#define EMIT(fmt, args...) do { \ - sprintf(lbuf, fmt , ## args); \ - printf("%s", lbuf); \ + int x; + int c; +#define EMIT(fmt, ...) do { \ + printf(fmt,## __VA_ARGS__); \ } while (0) for (line = region; line < (region + len); line += 16) {