From 3d5ce417ba1a8973b04516b0395f15e6500c60ea Mon Sep 17 00:00:00 2001 From: Alan Coopersmith Date: Sun, 10 Feb 2013 20:31:55 -0800 Subject: Move global rules variable into applyRules, the only function that uses it Clears gcc warning: setxkbmap.c: In function `tryLoadRules': setxkbmap.c:811: warning: declaration of 'rules' shadows a global declaration setxkbmap.c:132: warning: shadowed declaration is here No longer marked static, since the function is called exactly once, so storing the value across calls seems pointless. Signed-off-by: Alan Coopersmith Signed-off-by: Peter Hutterer --- setxkbmap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setxkbmap.c b/setxkbmap.c index cde779c..b573b14 100644 --- a/setxkbmap.c +++ b/setxkbmap.c @@ -129,7 +129,6 @@ static settings_t settings = { static XkbConfigRtrnRec cfgResult; -static XkbRF_RulesPtr rules = NULL; static XkbRF_VarDefsRec rdefs; static Bool clearOptions = False; @@ -829,6 +828,7 @@ applyRules(void) { int i; char *rfName; + XkbRF_RulesPtr rules = NULL; if (settings.model.src || settings.layout.src || settings.variant.src || options.item) -- cgit v1.2.3