From owner-svn-src-head@freebsd.org Tue May 29 21:02:09 2018 Return-Path: Delivered-To: svn-src-head@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 61325F75C4C; Tue, 29 May 2018 21:02:09 +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 0DDA57ECF0; Tue, 29 May 2018 21:02:09 +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 E2E60213E0; Tue, 29 May 2018 21:02:08 +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 w4TL28b9063946; Tue, 29 May 2018 21:02:08 GMT (envelope-from mmacy@FreeBSD.org) Received: (from mmacy@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w4TL28se063945; Tue, 29 May 2018 21:02:08 GMT (envelope-from mmacy@FreeBSD.org) Message-Id: <201805292102.w4TL28se063945@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:08 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r334353 - head/usr.sbin/pmc X-SVN-Group: head X-SVN-Commit-Author: mmacy X-SVN-Commit-Paths: head/usr.sbin/pmc X-SVN-Commit-Revision: 334353 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 29 May 2018 21:02:09 -0000 Author: mmacy Date: Tue May 29 21:02:08 2018 New Revision: 334353 URL: https://svnweb.freebsd.org/changeset/base/334353 Log: pmc: silence scan-build warnings Modified: head/usr.sbin/pmc/cmd_pmc_stat.c (contents, props changed) Modified: head/usr.sbin/pmc/cmd_pmc_stat.c ============================================================================== --- head/usr.sbin/pmc/cmd_pmc_stat.c Tue May 29 20:39:54 2018 (r334352) +++ head/usr.sbin/pmc/cmd_pmc_stat.c Tue May 29 21:02:08 2018 (r334353) @@ -306,21 +306,21 @@ static struct option longopts[] = { static int pmc_stat_internal(int argc, char **argv, int system_mode) { - const char *event; + char *event, *r; struct sigaction sa; struct kevent kev; struct rusage ru; struct winsize ws; struct pmcstat_ev *ev; - int c, option, runstate, do_print, do_read; + int c, option, runstate; int waitstatus, ru_valid; - ru_valid = do_print = do_read = 0; - event = NULL; + ru_valid = 0; + r = event = NULL; while ((option = getopt_long(argc, argv, "j:", longopts, NULL)) != -1) { switch (option) { case 'j': - event = strdup(optarg); + r = event = strdup(optarg); break; case '?': default: @@ -333,7 +333,8 @@ pmc_stat_internal(int argc, char **argv, int system_mo usage(); pmc_args.pa_flags |= FLAG_HAS_COMMANDLINE; pmc_stat_setup_stat(system_mode, event); - + free(r); + bzero(&ru, sizeof(ru)); EV_SET(&kev, SIGINT, EVFILT_SIGNAL, EV_ADD, 0, 0, NULL); if (kevent(pmc_kq, &kev, 1, NULL, 0, NULL) < 0) err(EX_OSERR, "ERROR: Cannot register kevent for SIGINT"); @@ -394,7 +395,6 @@ pmc_stat_internal(int argc, char **argv, int system_mo * are killed by a SIGINT or we reached the time duration. */ runstate = PMCSTAT_RUNNING; - do_print = do_read = 0; do { if ((c = kevent(pmc_kq, NULL, 0, &kev, 1, NULL)) <= 0) { if (errno != EINTR) @@ -411,11 +411,9 @@ pmc_stat_internal(int argc, char **argv, int system_mo getrusage(RUSAGE_CHILDREN, &ru); ru_valid = 1; } - do_print = 1; break; case EVFILT_READ: /* log file data is present */ - do_read = 0; break; case EVFILT_SIGNAL: @@ -439,7 +437,6 @@ pmc_stat_internal(int argc, char **argv, int system_mo ru_valid = 1; } runstate = pmcstat_close_log(&pmc_args); - do_print = 1; /* print PMCs at exit */ } else if (kev.ident == SIGINT) { /* Kill the child process if we started it */ if (pmc_args.pa_flags & FLAG_HAS_COMMANDLINE)