[rtems-libbsd commit] Add and use RTEMS_BSD_ARGC()

[Sebastian Huber]

Module:    rtems-libbsd
Branch:    master
Commit:    7831313a174c92057e0b17d79db75f45af7f9ecb
Changeset: http://git.rtems.org/rtems-libbsd/commit/?id=7831313a174c92057e0b17d79db75f45af7f9ecb

Author:    Sebastian Huber <sebastian.huber at embedded-brains.de>
Date:      Mon Jan 20 15:27:13 2014 +0100

Add and use RTEMS_BSD_ARGC()

---

 rtemsbsd/include/machine/rtems-bsd-commands.h      |    4 +++-
 testsuite/commands01/test_main.c                   |    4 ++--
 .../include/rtems/bsd/test/default-network-init.h  |   14 ++++++--------
 testsuite/ping01/test_main.c                       |    6 ++----
 4 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/rtemsbsd/include/machine/rtems-bsd-commands.h b/rtemsbsd/include/machine/rtems-bsd-commands.h
index 2b4c617..d442d3f 100644
--- a/rtemsbsd/include/machine/rtems-bsd-commands.h
+++ b/rtemsbsd/include/machine/rtems-bsd-commands.h
@@ -7,7 +7,7 @@
  */
 
 /*
- * Copyright (c) 2013 embedded brains GmbH.  All rights reserved.
+ * Copyright (c) 2013-2014 embedded brains GmbH.  All rights reserved.
  *
  *  embedded brains GmbH
  *  Dornierstr. 4
@@ -42,6 +42,8 @@
 
 #include <sys/cdefs.h>
 
+#define RTEMS_BSD_ARGC(array) (sizeof(array) / sizeof((array)[0]) - 1)
+
 __BEGIN_DECLS
 
 int rtems_bsd_command_ifconfig(int argc, char **argv);
diff --git a/testsuite/commands01/test_main.c b/testsuite/commands01/test_main.c
index c84ba77..7061e90 100644
--- a/testsuite/commands01/test_main.c
+++ b/testsuite/commands01/test_main.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013 embedded brains GmbH.  All rights reserved.
+ * Copyright (c) 2013-2014 embedded brains GmbH.  All rights reserved.
  *
  *  embedded brains GmbH
  *  Dornierstr. 4
@@ -43,7 +43,7 @@
 
 #define TEST_NAME "LIBBSD COMMANDS 1"
 
-#define ARGC(x) (nitems(x) - 1)
+#define ARGC(x) RTEMS_BSD_ARGC(x)
 
 static void
 test_route_without_if(void)
diff --git a/testsuite/include/rtems/bsd/test/default-network-init.h b/testsuite/include/rtems/bsd/test/default-network-init.h
index 959b350..f2abdfa 100644
--- a/testsuite/include/rtems/bsd/test/default-network-init.h
+++ b/testsuite/include/rtems/bsd/test/default-network-init.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013 embedded brains GmbH.  All rights reserved.
+ * Copyright (c) 2013-2014 embedded brains GmbH.  All rights reserved.
  *
  *  embedded brains GmbH
  *  Dornierstr. 4
@@ -41,8 +41,6 @@
 #include <rtems/bsd/test/network-config.h>
 #include <rtems/bsd/bsd.h>
 
-#define DEFAULT_NETWORK_ARGC(x) (RTEMS_ARRAY_SIZE(x) - 1)
-
 static void
 default_network_set_self_prio(rtems_task_priority prio)
 {
@@ -75,10 +73,10 @@ default_network_ifconfig_lo0(void)
 		NULL
 	};
 
-	exit_code = rtems_bsd_command_ifconfig(DEFAULT_NETWORK_ARGC(lo0), lo0);
+	exit_code = rtems_bsd_command_ifconfig(RTEMS_BSD_ARGC(lo0), lo0);
 	assert(exit_code == EX_OK);
 
-	exit_code = rtems_bsd_command_ifconfig(DEFAULT_NETWORK_ARGC(lo0_inet6), lo0_inet6);
+	exit_code = rtems_bsd_command_ifconfig(RTEMS_BSD_ARGC(lo0_inet6), lo0_inet6);
 	assert(exit_code == EX_OK);
 }
 
@@ -96,7 +94,7 @@ default_network_ifconfig_interface_0(void)
 		NULL
 	};
 
-	exit_code = rtems_bsd_command_ifconfig(DEFAULT_NETWORK_ARGC(iface0), iface0);
+	exit_code = rtems_bsd_command_ifconfig(RTEMS_BSD_ARGC(iface0), iface0);
 	assert(exit_code == EX_OK);
 }
 
@@ -121,10 +119,10 @@ default_network_route(void)
 		NULL
 	};
 
-	exit_code = rtems_bsd_command_route(DEFAULT_NETWORK_ARGC(dflt_route), dflt_route);
+	exit_code = rtems_bsd_command_route(RTEMS_BSD_ARGC(dflt_route), dflt_route);
 	assert(exit_code == EXIT_SUCCESS);
 
-	exit_code = rtems_bsd_command_route(DEFAULT_NETWORK_ARGC(dflt_route2), dflt_route2);
+	exit_code = rtems_bsd_command_route(RTEMS_BSD_ARGC(dflt_route2), dflt_route2);
 	assert(exit_code == EXIT_SUCCESS);
 }
 
diff --git a/testsuite/ping01/test_main.c b/testsuite/ping01/test_main.c
index 0eb99a2..659043c 100644
--- a/testsuite/ping01/test_main.c
+++ b/testsuite/ping01/test_main.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013 embedded brains GmbH.  All rights reserved.
+ * Copyright (c) 2013-2014 embedded brains GmbH.  All rights reserved.
  *
  *  embedded brains GmbH
  *  Dornierstr. 4
@@ -41,8 +41,6 @@
 
 #define TEST_NAME "LIBBSD PING 1"
 
-#define ARGC(x) (RTEMS_ARRAY_SIZE(x) - 1)
-
 static void
 test_ping(void)
 {
@@ -55,7 +53,7 @@ test_ping(void)
 		NULL
 	};
 
-	exit_code = rtems_bsd_command_ping(ARGC(ping), ping);
+	exit_code = rtems_bsd_command_ping(RTEMS_BSD_ARGC(ping), ping);
 	assert(exit_code == EXIT_SUCCESS);
 }