svn commit: r295363 - in head/tools/tools/ath: athaggrstats athdebug athradar athratestats athspectral athstats

[Adrian Chadd]

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 <sys/param.h>
@@ -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 <getopt.h>
 #include <errno.h>
 #include <err.h>

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 <getopt.h>
 #include <errno.h>
 #include <err.h>

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) {