From owner-svn-src-all@freebsd.org Fri Apr 5 20:12:20 2019 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 49BE1155D2D0; Fri, 5 Apr 2019 20:12:20 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id E173A7307A; Fri, 5 Apr 2019 20:12:19 +0000 (UTC) (envelope-from kib@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 BDEE81A18D; Fri, 5 Apr 2019 20:12:19 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x35KCJZh012904; Fri, 5 Apr 2019 20:12:19 GMT (envelope-from kib@FreeBSD.org) Received: (from kib@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x35KCJIH012902; Fri, 5 Apr 2019 20:12:19 GMT (envelope-from kib@FreeBSD.org) Message-Id: <201904052012.x35KCJIH012902@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kib set sender to kib@FreeBSD.org using -f From: Konstantin Belousov Date: Fri, 5 Apr 2019 20:12:19 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r345968 - head/usr.sbin/devctl X-SVN-Group: head X-SVN-Commit-Author: kib X-SVN-Commit-Paths: head/usr.sbin/devctl X-SVN-Commit-Revision: 345968 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: E173A7307A X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.97 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_SHORT(-0.97)[-0.972,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; NEURAL_HAM_LONG(-1.00)[-1.000,0] X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.29 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: Fri, 05 Apr 2019 20:12:20 -0000 Author: kib Date: Fri Apr 5 20:12:19 2019 New Revision: 345968 URL: https://svnweb.freebsd.org/changeset/base/345968 Log: Fix gcc warning about shadowed global. Sponsored by: Mellanox Technologies MFC after: 2 weeks Modified: head/usr.sbin/devctl/devctl.c Modified: head/usr.sbin/devctl/devctl.c ============================================================================== --- head/usr.sbin/devctl/devctl.c Fri Apr 5 19:42:54 2019 (r345967) +++ head/usr.sbin/devctl/devctl.c Fri Apr 5 20:12:19 2019 (r345968) @@ -397,14 +397,14 @@ reset_usage(void) static int reset(int ac, char **av) { - bool detach; + bool detach_drv; int ch; - detach = false; + detach_drv = false; while ((ch = getopt(ac, av, "d")) != -1) switch (ch) { case 'd': - detach = true; + detach_drv = true; break; default: reset_usage(); @@ -414,7 +414,7 @@ reset(int ac, char **av) if (ac != 1) reset_usage(); - if (devctl_reset(av[0], detach) < 0) + if (devctl_reset(av[0], detach_drv) < 0) err(1, "Failed to reset %s", av[0]); return (0); }