Remove priv arguments from ExprResolveKeySym

They've never been used by its one caller.

Signed-off-by: Daniel Stone <daniel@fooishbar.org>

diff --git a/src/xkbcomp/expr.c b/src/xkbcomp/expr.c
index df94824..bb8a826 100644 (file)
--- a/src/xkbcomp/expr.c
+++ b/src/xkbcomp/expr.c
@@ -962,8 +962,7 @@ ExprResolveMask(ExprDef * expr,
 
 int
 ExprResolveKeySym(ExprDef * expr,
-                  ExprResult * val_rtrn,
-                  IdentLookupFunc lookup, char * lookupPriv)
+                  ExprResult * val_rtrn)
 {
     int ok = 0;
     uint32_t sym;
@@ -978,7 +977,7 @@ ExprResolveKeySym(ExprDef * expr,
             return True;
         }
     }
-    ok = ExprResolveInteger(expr, val_rtrn, lookup, lookupPriv);
+    ok = ExprResolveInteger(expr, val_rtrn, NULL, NULL);
     if ((ok) && (val_rtrn->uval < 10))
         val_rtrn->uval += '0';
     return ok;

diff --git a/src/xkbcomp/expr.h b/src/xkbcomp/expr.h
index fabb0ec..7c27c04 100644 (file)
--- a/src/xkbcomp/expr.h
+++ b/src/xkbcomp/expr.h
@@ -142,9 +142,7 @@ extern int ExprResolveMask(ExprDef * /* expr */ ,
     );
 
 extern int ExprResolveKeySym(ExprDef * /* expr */ ,
-                             ExprResult * /* val_rtrn */ ,
-                             IdentLookupFunc /* lookup */ ,
-                             char *   /* lookupPriv */
+                             ExprResult * /* val_rtrn */
     );
 
 #endif /* EXPR_H */

diff --git a/src/xkbcomp/symbols.c b/src/xkbcomp/symbols.c
index 5934c3e..d26032b 100644 (file)
--- a/src/xkbcomp/symbols.c
+++ b/src/xkbcomp/symbols.c
@@ -1641,7 +1641,7 @@ HandleModMapDef(ModMapDef * def,
             tmp.haveSymbol = False;
             tmp.u.keyName = KeyNameToLong(key->value.keyName);
         }
-        else if (ExprResolveKeySym(key, &rtrn, NULL, NULL))
+        else if (ExprResolveKeySym(key, &rtrn))
         {
             tmp.haveSymbol = True;
             tmp.u.keySym = rtrn.uval;