Patch from Bernhard Fischer to make a bunch of symbols static

which were otherwise cluttering the global namespace.

4 files changed, 6 insertions, 6 deletions

diff --git a/loginutils/getty.c b/loginutils/getty.c
index a9ef561fa..3dd6258c5 100644
--- a/loginutils/getty.c
+++ b/loginutils/getty.c
@@ -151,7 +151,7 @@ struct options {
 
 /* Storage for things detected while the login name was read. */
 
-struct chardata {
+static struct chardata {
         int erase;                                      /* erase character */
         int kill;                                       /* kill character */
         int eol;                                        /* end-of-line character */
@@ -161,7 +161,7 @@ struct chardata {
 
 /* Initial values for the above. */
 
-struct chardata init_chardata = {
+static struct chardata init_chardata = {
         DEF_ERASE,                                      /* default erase character */
         DEF_KILL,                                       /* default kill character */
         13,                                                     /* default eol char */
diff --git a/loginutils/login.c b/loginutils/login.c
index 25f3c01e2..34095a6a7 100644
--- a/loginutils/login.c
+++ b/loginutils/login.c
@@ -28,7 +28,7 @@
 static void checkutmp(int picky);
 static void setutmp(const char *name, const char *line);
 /* Stuff global to this file */
-struct utmp utent;
+static struct utmp utent;
 #endif
 
 // login defines
diff --git a/loginutils/passwd.c b/loginutils/passwd.c
index 9c4b4ddfb..c8940eed7 100644
--- a/loginutils/passwd.c
+++ b/loginutils/passwd.c
@@ -21,7 +21,7 @@ static int new_password(const struct passwd *pw, int amroot, int algo);
 static void set_filesize_limit(int blocks);
 
 
-int get_algo(char *a)
+static int get_algo(char *a)
 {
         int x = 1;                                      /* standard: MD5 */
 
@@ -31,7 +31,7 @@ int get_algo(char *a)
 }
 
 
-extern int update_passwd(const struct passwd *pw, char *crypt_pw)
+static int update_passwd(const struct passwd *pw, char *crypt_pw)
 {
         char filename[1024];
         char buf[1025];
diff --git a/loginutils/vlock.c b/loginutils/vlock.c
index def484ae6..b66a3b1ae 100644
--- a/loginutils/vlock.c
+++ b/loginutils/vlock.c
@@ -51,7 +51,7 @@ static int o_lock_all = 0;
 static struct spwd *spw;
 
 /* getspuid - get a shadow entry by uid */
-struct spwd *getspuid(uid_t uid)
+static struct spwd *getspuid(uid_t uid)
 {
         struct spwd *sp;
         struct passwd *mypw;