[fcformat] Refactor and restructure code for upcoming changes

Also makes it thread-safe.

src/fcformat.c

@@ -40,41 +40,86 @@ message (const char *fmt, ...)
 }
 
 
-static FcChar8 *scratch1;
+typedef struct _FcFormatContext
-static FcChar8 *scratch2;
+{
-static const FcChar8 *format_orig;
+    const FcChar8 *format_orig;
+    const FcChar8 *format;
+    int            format_len;
+    FcChar8       *scratch;
+} FcFormatContext;
 
-static const FcChar8 *
+static void
-interpret_percent (FcPattern *pat,
+FcFormatContextInit (FcFormatContext *c,
-		   FcStrBuf *buf,
 		     const FcChar8   *format)
 {
-    int width, before;
+    c->format_orig = c->format = format;
+    c->format_len = strlen ((const char *) format);
+    c->scratch = malloc (c->format_len + 1);
+}
 
-    /* parse an optional width specifier */
+static void
-    width = strtol (format, (char **) &format, 10);
+FcFormatContextDone (FcFormatContext *c)
-
-    before = buf->len;
-
-    switch (*format) {
-    case '{':
 {
+    if (c)
+    {
+	free (c->scratch);
+    }
+}
+
+static FcBool
+consume_char (FcFormatContext *c,
+	      FcChar8          term)
+{
+    if (*c->format != term)
+    {
+	message ("Pattern format error: expected '%c' at %d",
+		 term, c->format - c->format_orig + 1);
+	return FcFalse;
+    }
+
+    c->format++;
+    return FcTrue;
+}
+
+static void
+interpret_percent (FcFormatContext *c,
+		   FcPattern       *pat,
+		   FcStrBuf        *buf)
+{
+    int width, before;
     FcChar8 *p;
     FcPatternElt *e;
 
-	format++; /* skip over '{' */
+    if (!consume_char (c, '%'))
+	return;
 
-	p = (FcChar8 *) strpbrk ((const char *) format, "}");
+    if (*c->format == '%') /* "%%" */
+    {
+	FcStrBufChar (buf, *c->format++);
+	return;
+    }
+
+    /* parse an optional width specifier */
+    width = strtol ((const char *) c->format, (char **) &c->format, 10);
+
+    before = buf->len;
+
+    if (!consume_char (c, '{'))
+	return;
+
+    p = (FcChar8 *) strpbrk ((const char *) c->format, "}" /* "=?:}" */);
     if (!p)
     {
-	    message ("Pattern format missing closing brace");
+	message ("Pattern format missing closing brace for opening brace at %d",
-	    break;
+		 c->format-1 - c->format_orig + 1);
+	return;
     }
     /* extract the element name */
-	memcpy (scratch1, format, p - format);
+    memcpy (c->scratch, c->format, p - c->format);
-	scratch1[p - format] = '\0';
+    c->scratch[p - c->format] = '\0';
+    c->format = p;
 
-	e = FcPatternObjectFindElt (pat, FcObjectFromName ((const char *) scratch1));
+    e = FcPatternObjectFindElt (pat, FcObjectFromName ((const char *) c->scratch));
     if (e)
     {
 	FcValueListPtr l;
@@ -82,15 +127,8 @@ interpret_percent (FcPattern *pat,
 	FcNameUnparseValueList (buf, l, '\0');
     }
 
-	p++; /* skip over '}' */
+    /* handle filters, if any */
-	format = p;
+    /* XXX */
-	break;
-    }
-    default:
-	message ("Pattern format has invalid character after '%%' at %d",
-		 format - format_orig);
-	break;
-    }
 
     /* align to width */
     if (!buf->failed)
@@ -122,7 +160,7 @@ interpret_percent (FcPattern *pat,
 	}
     }
 
-    return format;
+    consume_char (c, '}');
 }
 
 static char escaped_char(const char ch)
@@ -139,54 +177,43 @@ static char escaped_char(const char ch)
     }
 }
 
-static const FcChar8 *
+static void
-interpret (FcPattern *pat,
+interpret (FcFormatContext *c,
+	   FcPattern       *pat,
 	   FcStrBuf        *buf,
-	   const FcChar8 *format,
 	   FcChar8          term)
 {
-    const FcChar8 *end;
+    for (; *c->format && *c->format != term;)
-
-    for (end = format; *end && *end != term;)
     {
-	switch (*end)
+	switch (*c->format)
 	{
 	case '\\':
-	    end++; /* skip over '\\' */
+	    c->format++; /* skip over '\\' */
-	    FcStrBufChar (buf, escaped_char (*end++));
+	    if (*c->format)
+		FcStrBufChar (buf, escaped_char (*c->format++));
 	    continue;
 	case '%':
-	    end++; /* skip over '%' */
+	    interpret_percent (c, pat, buf);
-	    if (*end == '%')
-		break;
-	    end = interpret_percent (pat, buf, end);
 	    continue;
 	}
-	FcStrBufChar (buf, *end);
+	FcStrBufChar (buf, *c->format++);
-	end++;
     }
-    if (*end != term)
+    if (*c->format != term)
 	message ("Pattern format ended while looking for '%c'", term);
-
-    return end;
 }
 
 FcChar8 *
 FcPatternFormat (FcPattern *pat, const FcChar8 *format)
 {
-    int len;
     FcStrBuf buf;
+    FcFormatContext c;
 
     FcStrBufInit (&buf, 0, 0);
-    len = strlen ((const char *) format);
+    FcFormatContextInit (&c, format);
-    scratch1 = malloc (len);
-    scratch2 = malloc (len);
-    format_orig = format;
 
-    interpret (pat, &buf, format, '\0');
+    interpret (&c, pat, &buf, '\0');
 
-    free (scratch1);
+    FcFormatContextDone (&c);
-    free (scratch2);
     return FcStrBufDone (&buf);
 }