Improvements from Vladimir N. Oleynik.

diff --git a/coreutils/test.c b/coreutils/test.c
index d1a0b6025120404fb801150fe69c9954914ad9c4..ba6feb033e879c616af48d586d29b03ffd4ce7e0 100644 (file)
--- a/coreutils/test.c
+++ b/coreutils/test.c
@@ -156,8 +156,8 @@ struct t_op {
        {0,     0,      0}
 };
 
-char **t_wp;
-struct t_op const *t_wp_op;
+static char **t_wp;
+static struct t_op const *t_wp_op;
 static gid_t *group_array = NULL;
 static int ngroups;
 

diff --git a/more.c b/more.c
index ffc8206f2bfbb22baa21b85fd8359138b21d6043..9310cf930fc9dc79487c0088ce5bc14e6fa14acb 100644 (file)
--- a/more.c
+++ b/more.c
@@ -51,7 +51,7 @@ FILE *cin;
 
 static struct termios initial_settings, new_settings;
 
-void gotsig(int sig)
+static void gotsig(int sig)
 {
        setTermSettings(fileno(cin), &initial_settings);
        fprintf(stdout, "\n");

diff --git a/test.c b/test.c
index d1a0b6025120404fb801150fe69c9954914ad9c4..ba6feb033e879c616af48d586d29b03ffd4ce7e0 100644 (file)
--- a/test.c
+++ b/test.c
@@ -156,8 +156,8 @@ struct t_op {
        {0,     0,      0}
 };
 
-char **t_wp;
-struct t_op const *t_wp_op;
+static char **t_wp;
+static struct t_op const *t_wp_op;
 static gid_t *group_array = NULL;
 static int ngroups;
 

diff --git a/util-linux/more.c b/util-linux/more.c
index ffc8206f2bfbb22baa21b85fd8359138b21d6043..9310cf930fc9dc79487c0088ce5bc14e6fa14acb 100644 (file)
--- a/util-linux/more.c
+++ b/util-linux/more.c
@@ -51,7 +51,7 @@ FILE *cin;
 
 static struct termios initial_settings, new_settings;
 
-void gotsig(int sig)
+static void gotsig(int sig)
 {
        setTermSettings(fileno(cin), &initial_settings);
        fprintf(stdout, "\n");

diff --git a/utility.c b/utility.c
index f222518950b2c114f01d6cda0cfd560ef3809e51..fa2067af3860c7f78c9502b1202ffda3c02a19e7 100644 (file)
--- a/utility.c
+++ b/utility.c
@@ -962,6 +962,7 @@ void my_getgrgid(char *group, long gid)
        my_getid("/etc/group", group, gid, NULL);
 }
 
+#if defined BB_ID
 /* gets a gid given a user name */
 long my_getpwnamegid(char *name)
 {
@@ -969,6 +970,7 @@ long my_getpwnamegid(char *name)
        my_getid("/etc/passwd", name, -1, &gid);
        return gid;
 }
+#endif
 
 #endif
  /* BB_CHMOD_CHOWN_CHGRP || BB_PS || BB_LS || BB_TAR \