summaryrefslogtreecommitdiff
path: root/util-linux
diff options
context:
space:
mode:
Diffstat (limited to 'util-linux')
-rw-r--r--util-linux/fbset.c2
-rw-r--r--util-linux/fsck_minix.c4
-rw-r--r--util-linux/getopt.c21
-rw-r--r--util-linux/mkfs_minix.c2
-rw-r--r--util-linux/mkswap.c2
-rw-r--r--util-linux/mount.c2
-rw-r--r--util-linux/nfsmount.c2
-rw-r--r--util-linux/rdate.c6
-rw-r--r--util-linux/swaponoff.c4
9 files changed, 22 insertions, 23 deletions
diff --git a/util-linux/fbset.c b/util-linux/fbset.c
index be1e3c3..80711ec 100644
--- a/util-linux/fbset.c
+++ b/util-linux/fbset.c
@@ -132,7 +132,7 @@ struct fb_var_screeninfo {
};
-struct cmdoptions_t {
+static struct cmdoptions_t {
char *name;
unsigned char param_count;
unsigned char code;
diff --git a/util-linux/fsck_minix.c b/util-linux/fsck_minix.c
index 9a53a70..bd0c8a6 100644
--- a/util-linux/fsck_minix.c
+++ b/util-linux/fsck_minix.c
@@ -701,7 +701,7 @@ static void read_tables(void)
}
}
-struct minix_inode *get_inode(unsigned int nr)
+static struct minix_inode *get_inode(unsigned int nr)
{
struct minix_inode *inode;
@@ -749,7 +749,7 @@ struct minix_inode *get_inode(unsigned int nr)
}
#ifdef BB_FEATURE_MINIX2
-struct minix2_inode *get_inode2(unsigned int nr)
+static struct minix2_inode *get_inode2(unsigned int nr)
{
struct minix2_inode *inode;
diff --git a/util-linux/getopt.c b/util-linux/getopt.c
index eb28d5d..b74dd65 100644
--- a/util-linux/getopt.c
+++ b/util-linux/getopt.c
@@ -62,20 +62,19 @@ typedef enum {BASH,TCSH} shell_t;
/* Some global variables that tells us how to parse. */
-shell_t shell=BASH; /* The shell we generate output for. */
-int quiet_errors=0; /* 0 is not quiet. */
-int quiet_output=0; /* 0 is not quiet. */
-int quote=1; /* 1 is do quote. */
-int alternative=0; /* 0 is getopt_long, 1 is getopt_long_only */
+static shell_t shell=BASH; /* The shell we generate output for. */
+static int quiet_errors=0; /* 0 is not quiet. */
+static int quiet_output=0; /* 0 is not quiet. */
+static int quote=1; /* 1 is do quote. */
+static int alternative=0; /* 0 is getopt_long, 1 is getopt_long_only */
/* Function prototypes */
-const char *normalize(const char *arg);
-int generate_output(char * argv[],int argc,const char *optstr,
+static const char *normalize(const char *arg);
+static int generate_output(char * argv[],int argc,const char *optstr,
const struct option *longopts);
-void add_long_options(char *options);
-void add_longopt(const char *name,int has_arg);
-void set_shell(const char *new_shell);
-void set_initial_shell(void);
+static void add_long_options(char *options);
+static void add_longopt(const char *name,int has_arg);
+static void set_shell(const char *new_shell);
/*
diff --git a/util-linux/mkfs_minix.c b/util-linux/mkfs_minix.c
index 928a496..a83fa79 100644
--- a/util-linux/mkfs_minix.c
+++ b/util-linux/mkfs_minix.c
@@ -609,7 +609,7 @@ static void setup_tables(void)
* Perform a test of a block; return the number of
* blocks readable/writeable.
*/
-long do_check(char *buffer, int try, unsigned int current_block)
+static long do_check(char *buffer, int try, unsigned int current_block)
{
long got;
diff --git a/util-linux/mkswap.c b/util-linux/mkswap.c
index b5153f6..f72c700 100644
--- a/util-linux/mkswap.c
+++ b/util-linux/mkswap.c
@@ -72,7 +72,7 @@ static int version = -1;
static int pagesize;
static int *signature_page;
-struct swap_header_v1 {
+static struct swap_header_v1 {
char bootbits[1024]; /* Space for disklabel etc. */
unsigned int version;
unsigned int last_page;
diff --git a/util-linux/mount.c b/util-linux/mount.c
index fd68daf..a2d6053 100644
--- a/util-linux/mount.c
+++ b/util-linux/mount.c
@@ -231,7 +231,7 @@ parse_mount_options(char *options, int *flags, char *strflags)
}
}
-int
+static int
mount_one(char *blockDevice, char *directory, char *filesystemType,
unsigned long flags, char *string_flags, int useMtab, int fakeIt,
char *mtab_opts, int whineOnErrors)
diff --git a/util-linux/nfsmount.c b/util-linux/nfsmount.c
index aee4969..cd81510 100644
--- a/util-linux/nfsmount.c
+++ b/util-linux/nfsmount.c
@@ -886,7 +886,7 @@ static char *nfs_strerror(int stat)
return buf;
}
-bool_t
+static bool_t
xdr_fhandle (XDR *xdrs, fhandle objp)
{
//register int32_t *buf;
diff --git a/util-linux/rdate.c b/util-linux/rdate.c
index ed7121a..28e8732 100644
--- a/util-linux/rdate.c
+++ b/util-linux/rdate.c
@@ -39,10 +39,10 @@
static const int RFC_868_BIAS = 2208988800UL;
-int setdate= 0;
-int printdate= 0;
+static int setdate= 0;
+static int printdate= 0;
-time_t askremotedate(char *host)
+static time_t askremotedate(char *host)
{
struct hostent *h;
struct sockaddr_in sin;
diff --git a/util-linux/swaponoff.c b/util-linux/swaponoff.c
index 9deb13a..55022ae 100644
--- a/util-linux/swaponoff.c
+++ b/util-linux/swaponoff.c
@@ -33,8 +33,8 @@
#include <linux/unistd.h>
#include "busybox.h"
-_syscall2(int, swapon, const char *, path, int, flags);
-_syscall1(int, swapoff, const char *, path);
+static _syscall2(int, swapon, const char *, path, int, flags);
+static _syscall1(int, swapoff, const char *, path);
static int whichApp;