#include "fcint.h"
static int
-rawindex (FcGlyphName *gn);
+rawindex (const FcGlyphName *gn);
static void
scan (FILE *f, char *filename);
insert (FcGlyphName *gn, FcGlyphName **table, FcChar32 h);
static void
-dump (FcGlyphName **table, char *name);
+dump (FcGlyphName * const *table, const char *name);
static FcGlyphName *
FcAllocGlyphName (FcChar32 ucs, FcChar8 *name)
}
static void
-fatal (char *file, int lineno, char *msg)
+fatal (const char *file, int lineno, const char *msg)
{
- fprintf (stderr, "%s:%d: %s\n", file, lineno, msg);
+ if (lineno)
+ fprintf (stderr, "%s:%d: %s\n", file, lineno, msg);
+ else
+ fprintf (stderr, "%s: %s\n", file, msg);
+
exit (1);
}
#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 (FcGlyphName *gn)
+rawindex (const FcGlyphName *gn)
{
int i;
}
static void
-dump (FcGlyphName **table, char *name)
+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])
int i;
i = 0;
- while (*++argv)
+ while (argv[i+1])
{
if (i == MAX_GLYPHFILE)
fatal (*argv, 0, "Too many glyphname files");
- files[i++] = *argv;
+ files[i] = argv[i+1];
+ i++;
}
files[i] = 0;
qsort (files, i, sizeof (char *), compare_string);
*/
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);