From owner-svn-src-all@freebsd.org Tue May 29 21:02:16 2018 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id A5653F75C83; Tue, 29 May 2018 21:02:16 +0000 (UTC) (envelope-from mmacy@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id BC0EA7EDA0; Tue, 29 May 2018 21:02:15 +0000 (UTC) (envelope-from mmacy@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 74C26213E9; Tue, 29 May 2018 21:02:14 +0000 (UTC) (envelope-from mmacy@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w4TL2ETI064001; Tue, 29 May 2018 21:02:14 GMT (envelope-from mmacy@FreeBSD.org) Received: (from mmacy@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w4TL2Dpr063999; Tue, 29 May 2018 21:02:13 GMT (envelope-from mmacy@FreeBSD.org) Message-Id: <201805292102.w4TL2Dpr063999@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mmacy set sender to mmacy@FreeBSD.org using -f From: Matt Macy Date: Tue, 29 May 2018 21:02:13 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r334354 - head/lib/libpmc X-SVN-Group: head X-SVN-Commit-Author: mmacy X-SVN-Commit-Paths: head/lib/libpmc X-SVN-Commit-Revision: 334354 X-SVN-Commit-Repository: base 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.26 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, 29 May 2018 21:02:16 -0000 Author: mmacy Date: Tue May 29 21:02:13 2018 New Revision: 334354 URL: https://svnweb.freebsd.org/changeset/base/334354 Log: libpmc: silence scan-build warnings Modified: head/lib/libpmc/libpmc_pmu_util.c (contents, props changed) head/lib/libpmc/pmclog.c Modified: head/lib/libpmc/libpmc_pmu_util.c ============================================================================== --- head/lib/libpmc/libpmc_pmu_util.c Tue May 29 21:02:08 2018 (r334353) +++ head/lib/libpmc/libpmc_pmu_util.c Tue May 29 21:02:13 2018 (r334354) @@ -156,11 +156,12 @@ static int pmu_parse_event(struct pmu_event_desc *ped, const char *eventin) { char *event; - char *kvp, *key, *value; + char *kvp, *key, *value, *r; char *debug; if ((event = strdup(eventin)) == NULL) return (ENOMEM); + r = event; bzero(ped, sizeof(*ped)); while ((kvp = strsep(&event, ",")) != NULL) { key = strsep(&kvp, "="); @@ -199,7 +200,7 @@ pmu_parse_event(struct pmu_event_desc *ped, const char printf("unrecognized kvpair: %s:%s\n", key, value); } } - free(event); + free(r); return (0); } Modified: head/lib/libpmc/pmclog.c ============================================================================== --- head/lib/libpmc/pmclog.c Tue May 29 21:02:08 2018 (r334353) +++ head/lib/libpmc/pmclog.c Tue May 29 21:02:13 2018 (r334354) @@ -136,7 +136,7 @@ pmclog_get_record(struct pmclog_parse_state *ps, char return (ps->ps_state = PL_STATE_ERROR); src = *data; - h = used = 0; + used = 0; if (ps->ps_state == PL_STATE_NEW_RECORD) ps->ps_svcount = 0;