From owner-svn-src-all@freebsd.org Sun Feb 7 04:28:05 2016 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 2FED9A9F857; Sun, 7 Feb 2016 04:28:05 +0000 (UTC) (envelope-from adrian@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 mx1.freebsd.org (Postfix) with ESMTPS id 0A599B0; Sun, 7 Feb 2016 04:28:04 +0000 (UTC) (envelope-from adrian@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u174S4VU011822; Sun, 7 Feb 2016 04:28:04 GMT (envelope-from adrian@FreeBSD.org) Received: (from adrian@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u174S395011816; Sun, 7 Feb 2016 04:28:03 GMT (envelope-from adrian@FreeBSD.org) Message-Id: <201602070428.u174S395011816@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: adrian set sender to adrian@FreeBSD.org using -f From: Adrian Chadd Date: Sun, 7 Feb 2016 04:28:03 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r295363 - in head/tools/tools/ath: athaggrstats athdebug athradar athratestats athspectral athstats X-SVN-Group: head 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.20 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: Sun, 07 Feb 2016 04:28:05 -0000 Author: adrian Date: Sun Feb 7 04:28:03 2016 New Revision: 295363 URL: https://svnweb.freebsd.org/changeset/base/295363 Log: Remove the hard-coded 'ath0' strings and use ATH_DEFAULT. Remove the duplicate ATH_DEFAULT fields. The build bits should be including ../Makefile.inc as appropriate. Modified: head/tools/tools/ath/athaggrstats/main.c head/tools/tools/ath/athdebug/athdebug.c head/tools/tools/ath/athradar/athradar.c head/tools/tools/ath/athratestats/main.c head/tools/tools/ath/athspectral/athspectral.c head/tools/tools/ath/athstats/main.c Modified: head/tools/tools/ath/athaggrstats/main.c ============================================================================== --- head/tools/tools/ath/athaggrstats/main.c Sun Feb 7 03:48:40 2016 (r295362) +++ head/tools/tools/ath/athaggrstats/main.c Sun Feb 7 04:28:03 2016 (r295363) @@ -89,7 +89,7 @@ main(int argc, char *argv[]) ifname = getenv("ATH"); if (ifname == NULL) - ifname = "ath0"; + ifname = ATH_DEFAULT; wf = athaggrstats_new(ifname, getfmt("default")); while ((c = getopt(argc, argv, "bi:lo:z")) != -1) { switch (c) { Modified: head/tools/tools/ath/athdebug/athdebug.c ============================================================================== --- head/tools/tools/ath/athdebug/athdebug.c Sun Feb 7 03:48:40 2016 (r295362) +++ head/tools/tools/ath/athdebug/athdebug.c Sun Feb 7 04:28:03 2016 (r295363) @@ -31,7 +31,7 @@ /* * athdebug [-i interface] flags - * (default interface is ath0). + * (default interface is wlan0). */ #include @@ -156,7 +156,7 @@ main(int argc, char *argv[]) ifname = getenv("ATH"); if (ifname == NULL) - ifname = "ath0"; + ifname = ATH_DEFAULT; progname = argv[0]; if (argc > 1) { if (strcmp(argv[1], "-i") == 0) { Modified: head/tools/tools/ath/athradar/athradar.c ============================================================================== --- head/tools/tools/ath/athradar/athradar.c Sun Feb 7 03:48:40 2016 (r295362) +++ head/tools/tools/ath/athradar/athradar.c Sun Feb 7 04:28:03 2016 (r295363) @@ -30,10 +30,6 @@ #include "ah.h" #include "ah_internal.h" -#ifndef ATH_DEFAULT -#define ATH_DEFAULT "ath0" -#endif - #include #include #include Modified: head/tools/tools/ath/athratestats/main.c ============================================================================== --- head/tools/tools/ath/athratestats/main.c Sun Feb 7 03:48:40 2016 (r295362) +++ head/tools/tools/ath/athratestats/main.c Sun Feb 7 04:28:03 2016 (r295363) @@ -310,7 +310,7 @@ main(int argc, char *argv[]) ifname = getenv("ATH"); if (ifname == NULL) - ifname = "ath0"; + ifname = ATH_DEFAULT; while ((c = getopt(argc, argv, "ahi:m:s:")) != -1) { switch (c) { Modified: head/tools/tools/ath/athspectral/athspectral.c ============================================================================== --- head/tools/tools/ath/athspectral/athspectral.c Sun Feb 7 03:48:40 2016 (r295362) +++ head/tools/tools/ath/athspectral/athspectral.c Sun Feb 7 04:28:03 2016 (r295363) @@ -30,10 +30,6 @@ #include "ah.h" #include "ah_internal.h" -#ifndef ATH_DEFAULT -#define ATH_DEFAULT "ath0" -#endif - #include #include #include Modified: head/tools/tools/ath/athstats/main.c ============================================================================== --- head/tools/tools/ath/athstats/main.c Sun Feb 7 03:48:40 2016 (r295362) +++ head/tools/tools/ath/athstats/main.c Sun Feb 7 04:28:03 2016 (r295363) @@ -94,7 +94,7 @@ main(int argc, char *argv[]) ifname = getenv("ATH"); if (ifname == NULL) - ifname = "ath0"; + ifname = ATH_DEFAULT; wf = athstats_new(ifname, getfmt("default")); while ((c = getopt(argc, argv, "bi:lo:z")) != -1) { switch (c) {