X-Git-Url: https://git.wh0rd.org/?a=blobdiff_plain;f=src%2Ffcfs.c;h=7bea73651c5ee6ab01c1a57165b6ec0897569455;hb=23816bf9acbd6cc5dd942daaba3cc084ea70d99d;hp=90e858082f13d1483b96f744e3fddfd906e5b8f3;hpb=7f37423d8c1acc8ece0555e66ae7f857c22a77a7;p=fontconfig.git

diff --git a/src/fcfs.c b/src/fcfs.c
index 90e8580..7bea736 100644
--- a/src/fcfs.c
+++ b/src/fcfs.c
@@ -22,8 +22,8 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-#include <stdlib.h>
 #include "fcint.h"
+#include <stdlib.h>
 
 FcFontSet *
 FcFontSetCreate (void)
@@ -81,98 +81,55 @@ FcFontSetAdd (FcFontSet *s, FcPattern *font)
     return FcTrue;
 }
 
-static int * fcfs_pat_count;
-
-void
-FcFontSetNewBank (void)
-{
-    FcPatternNewBank();
-}
-
-int
-FcFontSetNeededBytes (FcFontSet *s)
-{
-    int i, c, cum = 0;
-
-    for (i = 0; i < s->nfont; i++)
-    {
-	c = FcPatternNeededBytes(s->fonts[i]);
-	if (c < 0)
-	    return c;
-	cum += c;
-    }
-
-    if (cum > 0)
-	return cum + sizeof(int) + FcObjectNeededBytes();
-    else
-	return 0;
-}
-
-void *
-FcFontSetDistributeBytes (FcCache * metadata, void * block_ptr)
-{
-    fcfs_pat_count = (int *)block_ptr;
-    block_ptr = (int *)block_ptr + 1;
-    // we don't consume any bytes for the fontset itself,
-    // since we don't allocate it statically.
-    block_ptr = FcPatternDistributeBytes (metadata, block_ptr);
-
-    // for good measure, write out the object ids used for
-    // this bank to the file.
-    return FcObjectDistributeBytes (metadata, block_ptr);
-}
-
 FcBool
-FcFontSetSerialize (int bank, FcFontSet * s)
+FcFontSetSerializeAlloc (FcSerialize *serialize, const FcFontSet *s)
 {
     int i;
-    FcPattern * p;
-    *fcfs_pat_count = s->nfont;
-
+    
+    if (!FcSerializeAlloc (serialize, s, sizeof (FcFontSet)))
+	return FcFalse;
+    if (!FcSerializeAlloc (serialize, s->fonts, s->nfont * sizeof (FcPattern *)))
+	return FcFalse;
     for (i = 0; i < s->nfont; i++)
     {
-	p = FcPatternSerialize (bank, s->fonts[i]);
-	if (!p) return FcFalse;
-	FcPatternDestroy (s->fonts[i]);
-
-	s->fonts[i] = p;
+	if (!FcPatternSerializeAlloc (serialize, s->fonts[i]))
+	    return FcFalse;
     }
-    FcObjectSerialize();
-
     return FcTrue;
 }
 
-FcBool
-FcFontSetUnserialize(FcCache metadata, FcFontSet * s, void * block_ptr)
+FcFontSet *
+FcFontSetSerialize (FcSerialize *serialize, const FcFontSet * s)
 {
-    int nfont;
-    int i, n;
-
-    nfont = *(int *)block_ptr;
-    block_ptr = (int *)block_ptr + 1;
-
-    if (s->sfont < s->nfont + nfont)
-    {
-	int sfont = s->nfont + nfont;
-	FcPattern ** pp;
-	pp = realloc (s->fonts, sfont * sizeof (FcPattern));
-	if (!pp)
-	    return FcFalse;
-	s->fonts = pp;
-	s->sfont = sfont;
-    }
-    n = s->nfont;
-    s->nfont += nfont;
+    int		i;
+    FcFontSet	*s_serialize;
+    FcPattern	**fonts_serialize;
+    FcPattern	*p_serialize;
+
+    s_serialize = FcSerializePtr (serialize, s);
+    if (!s_serialize)
+	return NULL;
+    *s_serialize = *s;
+    s_serialize->sfont = s_serialize->nfont;
+    
+    fonts_serialize = FcSerializePtr (serialize, s->fonts);
+    if (!fonts_serialize)
+	return NULL;
+    s_serialize->fonts = FcPtrToEncodedOffset (s_serialize,
+					       fonts_serialize, FcPattern *);
 
-    if (nfont > 0)
+    for (i = 0; i < s->nfont; i++)
     {
-	FcPattern * p = (FcPattern *)block_ptr;
-	block_ptr = FcPatternUnserialize (metadata, block_ptr);
-	for (i = 0; i < nfont; i++)
-	    s->fonts[n + i] = p+i;
-
-	block_ptr = FcObjectUnserialize (metadata, block_ptr);
+	p_serialize = FcPatternSerialize (serialize, s->fonts[i]);
+	if (!p_serialize)
+	    return NULL;
+	fonts_serialize[i] = FcPtrToEncodedOffset (s_serialize,
+						   p_serialize,
+						   FcPattern);
     }
 
-    return block_ptr != 0;
+    return s_serialize;
 }
+#define __fcfs__
+#include "fcaliastail.h"
+#undef __fcfs__