From owner-svn-src-projects@FreeBSD.ORG  Mon Aug  1 13:40:48 2011
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 8C7C2106566B;
	Mon,  1 Aug 2011 13:40:48 +0000 (UTC) (envelope-from mav@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 7CBBB8FC24;
	Mon,  1 Aug 2011 13:40:48 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p71DemC4099146;
	Mon, 1 Aug 2011 13:40:48 GMT (envelope-from mav@svn.freebsd.org)
Received: (from mav@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p71DemM3099144;
	Mon, 1 Aug 2011 13:40:48 GMT (envelope-from mav@svn.freebsd.org)
Message-Id: <201108011340.p71DemM3099144@svn.freebsd.org>
From: Alexander Motin <mav@FreeBSD.org>
Date: Mon, 1 Aug 2011 13:40:48 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r224574 - projects/hid/usr.bin/usbhidctl
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 01 Aug 2011 13:40:48 -0000

Author: mav
Date: Mon Aug  1 13:40:48 2011
New Revision: 224574
URL: http://svn.freebsd.org/changeset/base/224574

Log:
  Fix bug in previous change.

Modified:
  projects/hid/usr.bin/usbhidctl/usbhid.c

Modified: projects/hid/usr.bin/usbhidctl/usbhid.c
==============================================================================
--- projects/hid/usr.bin/usbhidctl/usbhid.c	Mon Aug  1 13:17:59 2011	(r224573)
+++ projects/hid/usr.bin/usbhidctl/usbhid.c	Mon Aug  1 13:40:48 2011	(r224574)
@@ -90,6 +90,9 @@ parceargs(report_desc_t r, int all, int 
 				if (tmp1 != NULL) {
 					cp -= strlen(tmp1);
 					tmp1[0] = 0;
+				} else {
+					cp = 0;
+					colls[0] = 0;
 				}
 			}
 			if ((h.kind != hid_input && h.kind != hid_output &&
@@ -141,6 +144,9 @@ parceargs(report_desc_t r, int all, int 
 				if (tmp1 != NULL) {
 					cp -= strlen(tmp1);
 					tmp1[0] = 0;
+				} else {
+					cp = 0;
+					colls[0] = 0;
 				}
 			}
 			if ((h.kind != hid_input && h.kind != hid_output &&