From 3ad0b3622cf92989584097787323f00bc7a36c48 Mon Sep 17 00:00:00 2001 From: Petr Pisar Date: Thu, 12 May 2011 13:13:56 +0200 Subject: Make global symbols static as possible There are some calls (e.g. getpwnam(3)) that can lead to dlopening other libraries that could jump to symbol with name clashing to one of global quota symbols. (e.g. Name server switch plug-in nss_db calls dirname(3) that's already defined in edquota.c and tht can cause segmentation fault.) Although it's not possible to solve all these problems, making as much as possible global objects and functions static is the best thing we can do to avoid name space polution. Signed-off-by: Jan Kara --- quota.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'quota.c') diff --git a/quota.c b/quota.c index 5a2c23f..a154f21 100644 --- a/quota.c +++ b/quota.c @@ -76,10 +76,10 @@ #define FL_SHOW_MNTPOINT 16384 #define FL_SHOW_DEVICE 32768 -int flags, fmt = -1; +static int flags, fmt = -1; char *progname; -void usage(void) +static void usage(void) { errstr( "%s%s%s%s%s", _("Usage: quota [-guqvswim] [-l | [-Q | -A]] [-F quotaformat]\n"), @@ -112,7 +112,7 @@ void usage(void) exit(1); } -void heading(int type, qid_t id, char *name, char *tag) +static void heading(int type, qid_t id, char *name, char *tag) { char *spacehdr; @@ -130,7 +130,7 @@ void heading(int type, qid_t id, char *name, char *tag) } } -void print_fs_location(struct dquot *q) +static void print_fs_location(struct dquot *q) { struct quota_handle *h = q->dq_h; @@ -172,7 +172,7 @@ void print_fs_location(struct dquot *q) } } -int showquotas(int type, qid_t id, int mntcnt, char **mnt) +static int showquotas(int type, qid_t id, int mntcnt, char **mnt) { struct dquot *qlist, *q; char *msgi, *msgb; -- cgit v1.2.3