[Commit] fontconfig/fc-glyphname fc-glyphname.c,1.1,1.2

[Carl Worth]

Committed by: cworth

Update of /local/src/CVS/fontconfig/fc-glyphname
In directory home.keithp.com:/tmp/cvs-serv29091/fc-glyphname

Modified Files:
	fc-glyphname.c 
Log Message:
Added new FcFini function for cleaning up all memory.
Fixed a few memory leaks.
fc-list now calls FcFini, (and is now leak-free according to valgrind)

Index: fc-glyphname.c
===================================================================
RCS file: /local/src/CVS/fontconfig/fc-glyphname/fc-glyphname.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- fc-glyphname.c	4 May 2003 22:50:17 -0000	1.1
+++ fc-glyphname.c	15 Aug 2003 19:45:19 -0000	1.2
@@ -24,6 +24,27 @@
 
 #include "fcint.h"
 
+static int
+rawindex (FcGlyphName *gn);
+
+static void
+scan (FILE *f, char *filename);
+
+static int
+isprime (int i);
+
+static void
+find_hash (void);
+
+static FcChar32
+FcHashGlyphName (const FcChar8 *name);
+
+static void
+insert (FcGlyphName *gn, FcGlyphName **table, FcChar32 h);
+
+static void
+dump (FcGlyphName **table, char *name);
+
 static FcGlyphName *
 FcAllocGlyphName (FcChar32 ucs, FcChar8 *name)
 {
@@ -55,7 +76,7 @@
 FcGlyphName *ucs_to_name[MAX_GLYPHNAME*2];
 int	    hash, rehash;
 
-int
+static int
 rawindex (FcGlyphName *gn)
 {
     int	i;
@@ -66,7 +87,7 @@
     return -1;
 }
 
-void
+static void
 scan (FILE *f, char *filename)
 {
     char	    buf[MAX_NAMELEN];
@@ -122,7 +143,7 @@
     return h;
 }
 
-int
+static int
 isprime (int i)
 {
     int	l, t;
@@ -146,7 +167,7 @@
  * Find a prime pair that leaves at least 25% of the hash table empty
  */
 
-void
+static void
 find_hash (void)
 {
     int	h;
@@ -160,7 +181,7 @@
     rehash = h-2;
 }
 
-FcChar32
+static FcChar32
 FcHashGlyphName (const FcChar8 *name)
 {
     FcChar32	h = 0;
@@ -173,7 +194,7 @@
     return h;
 }
 
-void
+static void
 insert (FcGlyphName *gn, FcGlyphName **table, FcChar32 h)
 {
     int		i, r = 0;
@@ -189,7 +210,7 @@
     table[i] = gn;
 }
 
-void
+static void
 dump (FcGlyphName **table, char *name)
 {
     int	i;