Eliminate global cache. Eliminate multi-arch cache code.

[fontconfig.git] / fc-glyphname / fc-glyphname.c

diff --git a/fc-glyphname/fc-glyphname.c b/fc-glyphname/fc-glyphname.c
index 05a22ae31174da7c720b55e15b1fffeb4033e5a5..8b265e4ea0106e7661ed63868edd78ebe8f9b9e9 100644 (file)
--- a/fc-glyphname/fc-glyphname.c
+++ b/fc-glyphname/fc-glyphname.c
@@ -24,6 +24,19 @@
 
 #include "fcint.h"
 
+/* stub definitions for declarations from fcint.h.. */
+int * _fcBankId = 0, * _fcBankIdx = 0;
+FcValueList ** _fcValueLists = 0;
+FcPatternElt ** _fcPatternElts = 0;
+int FcDebugVal = 0;
+
+int
+FcCacheBankToIndexMTF (int bank)
+{
+    return 0;
+}
+/* end stub definitions */
+
 static int
 rawindex (const FcGlyphName *gn);
 
@@ -73,12 +86,12 @@ fatal (const char *file, int lineno, const char *msg)
 #define MAX_GLYPHNAME      10240
 #define MAX_NAMELEN        1024
 
-FcGlyphName *raw[MAX_GLYPHNAME];
-int        nraw;
-int        max_name_len;
-FcGlyphName *name_to_ucs[MAX_GLYPHNAME*2];
-FcGlyphName *ucs_to_name[MAX_GLYPHNAME*2];
-int        hash, rehash;
+static FcGlyphName *raw[MAX_GLYPHNAME];
+static int         nraw;
+static int         max_name_len;
+static FcGlyphName *name_to_ucs[MAX_GLYPHNAME*2];
+static FcGlyphName *ucs_to_name[MAX_GLYPHNAME*2];
+static unsigned int hash, rehash;
 
 static int
 rawindex (const FcGlyphName *gn)
@@ -219,7 +232,7 @@ dump (FcGlyphName * const *table, const char *name)
 {
     int        i;
     
-    printf ("static FcGlyphName        *%s[%d] = {\n", name, hash);
+    printf ("static const FcGlyphName  *%s[%d] = {\n", name, hash);
 
     for (i = 0; i < hash; i++)
        if (table[i])
@@ -289,7 +302,7 @@ main (int argc, char **argv)
      */
     
     for (i = 0; i < nraw; i++)
-       printf ("static struct { FcChar32 ucs; FcChar8 name[%d]; }"
+       printf ("static const struct { const FcChar32 ucs; const FcChar8 name[%d]; }"
                " glyph%d = { 0x%lx, \"%s\" };\n",
                (int) strlen ((char *) raw[i]->name) + 1,
                i, (unsigned long) raw[i]->ucs, raw[i]->name);