Refresh toolbox.
Use more upstream NetBSD, and update those things that were already NetBSD.
Note that unlike bionic, the upstream-netbsd directory isn't pristine; we have
changes marked by __ANDROID__.
Bug: 16493461
(cherry picked from commit fd4c6b0a3a25921a9fe24691a695d715aecb6afe)
Change-Id: I53267edaac0b92ad062a5df0f3201e3952eb084e
diff --git a/toolbox/swapon.c b/toolbox/swapon.c
index 21d2287..150701a 100644
--- a/toolbox/swapon.c
+++ b/toolbox/swapon.c
@@ -4,13 +4,13 @@
#include <getopt.h>
#include <sys/swap.h>
-void usage(char *name)
+static void usage(char *name)
{
fprintf(stderr, "Usage: %s [-p prio] <filename>\n"
" prio must be between 0 and %d\n", name, SWAP_FLAG_PRIO_MASK);
}
-int parse_prio(char *prio_str)
+static int parse_prio(char *prio_str)
{
unsigned long p = strtoul(prio_str, NULL, 10);