svn commit: r334354 - head/lib/libpmc

[Matt Macy]

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;