Move some definitions from expr.h to expr.c

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

diff --git a/src/xkbcomp/expr.c b/src/xkbcomp/expr.c
index 3915988..063dcd6 100644 (file)
--- a/src/xkbcomp/expr.c
+++ b/src/xkbcomp/expr.c
@@ -34,6 +34,21 @@
 
 /***====================================================================***/
 
+typedef Bool(*IdentLookupFunc) (char * /* priv */ ,
+                                uint32_t /* field */ ,
+                                unsigned /* type */ ,
+                                ExprResult *    /* val_rtrn */
+    );
+
+typedef struct _LookupPriv
+{
+    char * priv;
+    IdentLookupFunc chain;
+    char * chainPriv;
+} LookupPriv;
+
+/***====================================================================***/
+
 char *
 exprOpText(unsigned type)
 {
@@ -155,7 +170,7 @@ ExprResolveLhs(ExprDef * expr,
     return False;
 }
 
-Bool
+static Bool
 SimpleLookup(char * priv, uint32_t field, unsigned type,
              ExprResult * val_rtrn)
 {
@@ -182,7 +197,7 @@ SimpleLookup(char * priv, uint32_t field, unsigned type,
     return False;
 }
 
-Bool
+static Bool
 RadioLookup(char * priv, uint32_t field, unsigned type, ExprResult * val_rtrn)
 {
     const char *str;

diff --git a/src/xkbcomp/expr.h b/src/xkbcomp/expr.h
index c10be24..e399e1c 100644 (file)
--- a/src/xkbcomp/expr.h
+++ b/src/xkbcomp/expr.h
@@ -35,54 +35,22 @@ typedef union _ExprResult
     struct xkb_key_name keyName;
 } ExprResult;
 
-typedef Bool(*IdentLookupFunc) (char * /* priv */ ,
-                                uint32_t /* field */ ,
-                                unsigned /* type */ ,
-                                ExprResult *    /* val_rtrn */
-    );
-
 extern int ExprResolveLhs(ExprDef * /* expr */ ,
                           ExprResult * /* elem_rtrn */ ,
                           ExprResult * /* field_rtrn */ ,
                           ExprDef **    /* index_rtrn */
     );
 
-typedef struct _LookupPriv
-{
-    char * priv;
-    IdentLookupFunc chain;
-    char * chainPriv;
-} LookupPriv;
-
 typedef struct _LookupEntry
 {
     const char *name;
     unsigned result;
 } LookupEntry;
 
-typedef struct _LookupTable
-{
-    char *element;
-    LookupEntry *entries;
-    struct _LookupTable *nextElement;
-} LookupTable;
-
 
 extern char *exprOpText(unsigned        /* type */
     );
 
-extern int RadioLookup(char * /* priv */ ,
-                       uint32_t /* field */ ,
-                       unsigned /* type */ ,
-                       ExprResult *     /* val_rtrn */
-    );
-
-extern int SimpleLookup(char * /* priv */ ,
-                        uint32_t /* field */ ,
-                        unsigned /* type */ ,
-                        ExprResult *    /* val_rtrn */
-    );
-
 extern int LookupModIndex(char * /* priv */ ,
                           uint32_t /* field */ ,
                           unsigned /* type */ ,