From owner-dev-commits-src-main@freebsd.org Tue Dec 29 18:25:13 2020 Return-Path: Delivered-To: dev-commits-src-main@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 25E1C4C772F; Tue, 29 Dec 2020 18:25:13 +0000 (UTC) (envelope-from git@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 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 4D52s50crtz3CFx; Tue, 29 Dec 2020 18:25:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 0763B109BE; Tue, 29 Dec 2020 18:25:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 0BTIPCYI055849; Tue, 29 Dec 2020 18:25:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 0BTIPC2n055848; Tue, 29 Dec 2020 18:25:12 GMT (envelope-from git) Date: Tue, 29 Dec 2020 18:25:12 GMT Message-Id: <202012291825.0BTIPC2n055848@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Adrian Chadd Subject: git: ff7c2c5a3bc3 - main - [wlanstats] Fix warnings-as-errors on gcc-6.4 on mips MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: adrian X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ff7c2c5a3bc3321ea7eeab824eff25257e7fbaae Auto-Submitted: auto-generated X-BeenThere: dev-commits-src-main@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: "Commit messages for the main branch of the src repository." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 29 Dec 2020 18:25:13 -0000 The branch main has been updated by adrian: URL: https://cgit.FreeBSD.org/src/commit/?id=ff7c2c5a3bc3321ea7eeab824eff25257e7fbaae commit ff7c2c5a3bc3321ea7eeab824eff25257e7fbaae Author: Adrian Chadd AuthorDate: 2020-12-29 01:03:11 +0000 Commit: Adrian Chadd CommitDate: 2020-12-29 18:24:30 +0000 [wlanstats] Fix warnings-as-errors on gcc-6.4 on mips * use CLLADDR() to not try deconsting a const * Unsigned where they should be * static where it should be Tested: * freebsd/mips32, using gcc-6.4 --- tools/tools/net80211/wlanstats/main.c | 8 +++++--- tools/tools/net80211/wlanstats/wlanstats.c | 10 +++++----- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/tools/tools/net80211/wlanstats/main.c b/tools/tools/net80211/wlanstats/main.c index bd73053be976..36da5c6b8e51 100644 --- a/tools/tools/net80211/wlanstats/main.c +++ b/tools/tools/net80211/wlanstats/main.c @@ -70,7 +70,7 @@ static struct { static const char * getfmt(const char *tag) { - int i; + unsigned int i; for (i = 0; i < nitems(tags); i++) if (strcasecmp(tags[i].tag, tag) == 0) return tags[i].fmt; @@ -156,8 +156,10 @@ print_sta_stats(FILE *fd, const u_int8_t macaddr[IEEE80211_ADDR_LEN]) } #endif -void -usage(void) { +static void +usage(void) +{ + printf("wlanstats: [-ah] [-i ifname] [-l] [-m station MAC address] [-o fmt] [interval]\n"); } diff --git a/tools/tools/net80211/wlanstats/wlanstats.c b/tools/tools/net80211/wlanstats/wlanstats.c index b42d7312e519..2f362a60a836 100644 --- a/tools/tools/net80211/wlanstats/wlanstats.c +++ b/tools/tools/net80211/wlanstats/wlanstats.c @@ -463,7 +463,7 @@ getlladdr(struct wlanstatfoo_p *wf) errx(1, "did not find link layer address for interface %s", wf->ifr.ifr_name); sdl = (const struct sockaddr_dl *) p->ifa_addr; - IEEE80211_ADDR_COPY(wf->mac, LLADDR(sdl)); + IEEE80211_ADDR_COPY(wf->mac, CLLADDR(sdl)); freeifaddrs(ifp); } @@ -561,8 +561,8 @@ wlan_update_tot(struct bsdstat *sf) wf->ntotal = wf->ncur; } -void -setreason(char b[], size_t bs, int v) +static void +setreason(char b[], size_t bs, unsigned int v) { static const char *reasons[] = { [IEEE80211_REASON_UNSPECIFIED] = "unspecified", @@ -595,8 +595,8 @@ setreason(char b[], size_t bs, int v) snprintf(b, bs, "%u", v); } -void -setstatus(char b[], size_t bs, int v) +static void +setstatus(char b[], size_t bs, unsigned int v) { static const char *status[] = { [IEEE80211_STATUS_SUCCESS] = "success",