From owner-svn-src-all@freebsd.org Tue May 31 23:26:47 2016 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 64640B557E3; Tue, 31 May 2016 23:26:47 +0000 (UTC) (envelope-from asomers@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 1DD671749; Tue, 31 May 2016 23:26:47 +0000 (UTC) (envelope-from asomers@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u4VNQk4O049520; Tue, 31 May 2016 23:26:46 GMT (envelope-from asomers@FreeBSD.org) Received: (from asomers@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u4VNQkho049517; Tue, 31 May 2016 23:26:46 GMT (envelope-from asomers@FreeBSD.org) Message-Id: <201605312326.u4VNQkho049517@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: asomers set sender to asomers@FreeBSD.org using -f From: Alan Somers Date: Tue, 31 May 2016 23:26:46 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r301087 - in head: cddl/usr.sbin/zfsd lib/libdevdctl X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 31 May 2016 23:26:47 -0000 Author: asomers Date: Tue May 31 23:26:45 2016 New Revision: 301087 URL: https://svnweb.freebsd.org/changeset/base/301087 Log: Coverity fixes for r300906 lib/libdevdctl/consumer.cc In Consumer::DisconnectFromDevd, don't close the socket if it's already closed. cddl/usr.sbin/zfsd/case_file.cc lib/libdevdctl/consumer.h Delete dead code leftover from before devd(8) gained SOCK_SEQPACKET support Reported by: Coverity CID: 1356155, 1356169 Sponsored by: Spectra Logic Corp Modified: head/cddl/usr.sbin/zfsd/case_file.cc head/lib/libdevdctl/consumer.cc head/lib/libdevdctl/consumer.h Modified: head/cddl/usr.sbin/zfsd/case_file.cc ============================================================================== --- head/cddl/usr.sbin/zfsd/case_file.cc Tue May 31 23:14:15 2016 (r301086) +++ head/cddl/usr.sbin/zfsd/case_file.cc Tue May 31 23:26:45 2016 (r301087) @@ -83,7 +83,6 @@ using std::setfill; using std::setw; using DevdCtl::Event; -using DevdCtl::EventBuffer; using DevdCtl::EventFactory; using DevdCtl::EventList; using DevdCtl::Guid; Modified: head/lib/libdevdctl/consumer.cc ============================================================================== --- head/lib/libdevdctl/consumer.cc Tue May 31 23:14:15 2016 (r301086) +++ head/lib/libdevdctl/consumer.cc Tue May 31 23:26:45 2016 (r301087) @@ -129,10 +129,10 @@ Consumer::ConnectToDevd() void Consumer::DisconnectFromDevd() { - if (m_devdSockFD != -1) + if (m_devdSockFD != -1) { syslog(LOG_INFO, "Disconnecting from devd."); - - close(m_devdSockFD); + close(m_devdSockFD); + } m_devdSockFD = -1; } Modified: head/lib/libdevdctl/consumer.h ============================================================================== --- head/lib/libdevdctl/consumer.h Tue May 31 23:14:15 2016 (r301086) +++ head/lib/libdevdctl/consumer.h Tue May 31 23:26:45 2016 (r301087) @@ -44,8 +44,6 @@ namespace DevdCtl /*=========================== Forward Declarations ===========================*/ class Event; -class EventBuffer; -class FDReader; /*============================ Class Declarations ============================*/ /*----------------------------- DevdCtl::Consumer ----------------------------*/ @@ -139,16 +137,6 @@ protected: */ int m_devdSockFD; - /** - * Reader tied to the devd socket. - */ - FDReader *m_reader; - - /** - * Default EventBuffer connected to m_reader. - */ - EventBuffer *m_eventBuffer; - EventFactory m_eventFactory; /** Queued events for replay. */