diff options
author | Alan Coopersmith <alan.coopersmith@oracle.com> | 2022-12-10 11:38:04 -0800 |
---|---|---|
committer | Alan Coopersmith <alan.coopersmith@oracle.com> | 2022-12-11 14:35:34 -0800 |
commit | 64761ee9424f755b84ab0ce02d13eda32d215a14 (patch) | |
tree | 0d5369ba1460fb9c4be686511de659ed653362ba /expr.c | |
parent | 9737af15196380a1687d18a17d297ee17b45a83f (diff) |
Variable scope reductions
Some found by cppcheck, some found by manual code inspection
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Diffstat (limited to 'expr.c')
-rw-r--r-- | expr.c | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -157,7 +157,6 @@ Bool SimpleLookup(XPointer priv, Atom elem, Atom field, unsigned type, ExprResult * val_rtrn) { - LookupEntry *entry; char *str; if ((priv == NULL) || @@ -167,7 +166,7 @@ SimpleLookup(XPointer priv, return False; } str = XkbAtomGetString(NULL, field); - for (entry = (LookupEntry *) priv; + for (LookupEntry *entry = (LookupEntry *) priv; (entry != NULL) && (entry->name != NULL); entry++) { if (uStrCaseCmp(str, entry->name) == 0) @@ -1051,11 +1050,12 @@ ExprResolveKeySym(ExprDef * expr, IdentLookupFunc lookup, XPointer lookupPriv) { int ok = 0; - KeySym sym; if (expr->op == ExprIdent) { char *str; + KeySym sym; + str = XkbAtomGetString(NULL, expr->value.str); if ((str != NULL) && ((sym = XStringToKeysym(str)) != NoSymbol)) { |