diff options
| author | Alan Coopersmith <alan.coopersmith@oracle.com> | 2013-02-10 20:31:55 -0800 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2013-02-12 13:26:48 +1000 |
| commit | 3d5ce417ba1a8973b04516b0395f15e6500c60ea (patch) | |
| tree | 1f71329ee8722678eeec1ddca0912348192578d5 | |
| parent | cac515f47457d9acac39ca43316f9e2af6a5b1b9 (diff) | |
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 <alan.coopersmith@oracle.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
| -rw-r--r-- | setxkbmap.c | 2 |
1 files changed, 1 insertions, 1 deletions
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) |