From owner-svn-src-projects@FreeBSD.ORG Fri Oct 11 22:00:55 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 434555B1; Fri, 11 Oct 2013 22:00:55 +0000 (UTC) (envelope-from asomers@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 312842740; Fri, 11 Oct 2013 22:00:55 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9BM0tNj044163; Fri, 11 Oct 2013 22:00:55 GMT (envelope-from asomers@svn.freebsd.org) Received: (from asomers@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9BM0tN2044162; Fri, 11 Oct 2013 22:00:55 GMT (envelope-from asomers@svn.freebsd.org) Message-Id: <201310112200.r9BM0tN2044162@svn.freebsd.org> From: Alan Somers Date: Fri, 11 Oct 2013 22:00:55 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r256355 - projects/zfsd/head/cddl/sbin/zfsd X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 11 Oct 2013 22:00:55 -0000 Author: asomers Date: Fri Oct 11 22:00:54 2013 New Revision: 256355 URL: http://svnweb.freebsd.org/changeset/base/256355 Log: Modify the parsing of device control attach and detach events to tolerate the timestamp key<=>value pair added to all events in changeset 256353. cddl/sbin/zfsd/dev_ctl_event.cc: o In DevCtlEvent::ParseEventString(), remove code that verified that attach and detach events contained no trailing key<=>value pairs after the "parent" field. o Fix whitespace/style error in an if statement. Submitted by: gibbs Approved by: ken (mentor) Sponsored By: Spectra Logic Corporation Modified: projects/zfsd/head/cddl/sbin/zfsd/dev_ctl_event.cc Modified: projects/zfsd/head/cddl/sbin/zfsd/dev_ctl_event.cc ============================================================================== --- projects/zfsd/head/cddl/sbin/zfsd/dev_ctl_event.cc Fri Oct 11 21:55:12 2013 (r256354) +++ projects/zfsd/head/cddl/sbin/zfsd/dev_ctl_event.cc Fri Oct 11 22:00:54 2013 (r256355) @@ -256,7 +256,7 @@ DevCtlEvent::GetTimestamp() const timeval tv_timestamp; struct tm tm_timestamp; - if ( ! Contains("timestamp") ) { + if (!Contains("timestamp")) { throw ZfsdException("Event contains no timestamp: %s", m_eventString.c_str()); } @@ -320,17 +320,6 @@ DevCtlEvent::ParseEventString(DevCtlEven start += 4; end = eventString.find_first_of(" \t\n", start); nvpairs["parent"] = eventString.substr(start, end); - if (end == string::npos) - break; - - /* - * The parent field should terminate the event with the - * exception of trailing whitespace. - */ - end = eventString.find_first_not_of(" \t\n", end); - if (end != string::npos) - throw ParseException(ParseException::INVALID_FORMAT, - end); break; case NOTIFY: break;