From: Daniel Stone <daniel@fooishbar.org>
Date: Mon, 20 Feb 2012 17:09:06 +0000 (+0000)
Subject: Remove chaining support from LookupModMask
X-Git-Tag: accepted/2.0alpha-wayland/20121109.204519~280
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=eb6d9a0528d5f8836109898a674dcc3bb2e421f5;p=profile%2Fivi%2Flibxkbcommon.git

Remove chaining support from LookupModMask

Turns out we never use it, so.

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

diff --git a/src/xkbcomp/expr.c b/src/xkbcomp/expr.c
index e34a754..1d610a0 100644
--- a/src/xkbcomp/expr.c
+++ b/src/xkbcomp/expr.c
@@ -40,12 +40,6 @@ typedef Bool(*IdentLookupFunc) (char * /* priv */ ,
                                 ExprResult *    /* val_rtrn */
     );
 
-typedef struct _LookupPriv
-{
-    IdentLookupFunc chain;
-    char * chainPriv;
-} LookupPriv;
-
 /***====================================================================***/
 
 char *
@@ -261,13 +255,6 @@ LookupModMask(char * priv, uint32_t field, unsigned type,
         val_rtrn->uval = 0;
     else if (LookupModIndex(priv, field, type, val_rtrn))
         val_rtrn->uval = (1 << val_rtrn->uval);
-    else if (priv != NULL)
-    {
-        LookupPriv *lpriv = (LookupPriv *) priv;
-        if ((lpriv->chain == NULL) ||
-            (!(*lpriv->chain) (lpriv->chainPriv, field, type, val_rtrn)))
-            ret = False;
-    }
     else
         ret = False;
     free(str);