Fix docs re 'orig' argument of FcPatternBuild and family

Now call it 'p' or 'pattern', since it's modified in place.
There is no copying.

diff --git a/doc/fcpattern.fncs b/doc/fcpattern.fncs
index ed59580e7ee07c0929eea3b23d95f4f1678eb7ce..5a9912f4465a720321fe366dcaf76778fd7056b9 100644 (file)
--- a/doc/fcpattern.fncs
+++ b/doc/fcpattern.fncs
@@ -279,20 +279,20 @@ in preference to FcPatternGet to provide compile-time typechecking.
 
 @RET@          FcPattern *
 @FUNC@         FcPatternBuild
-@TYPE1@                FcPattern *                     @ARG1@          orig
+@TYPE1@                FcPattern *                     @ARG1@          pattern
 @TYPE2@        ...
 
 @PROTOTYPE+@
 @RET+@         FcPattern *
 @FUNC+@                FcPatternVaBuild
-@TYPE1+@       FcPattern *                     @ARG1+@         orig
+@TYPE1+@       FcPattern *                     @ARG1+@         pattern
 @TYPE2+@       va_list%                        @ARG2+@         va
 
 @PROTOTYPE++@
 @RET++@                void
 @FUNC++@       FcPatternVapBuild
 @TYPE1++@      FcPattern *                     @ARG1++@        result
-@TYPE2++@      FcPattern *                     @ARG2++@        orig
+@TYPE2++@      FcPattern *                     @ARG2++@        pattern
 @TYPE3++@      va_list%                        @ARG3++@        va
 
 @PURPOSE@      Create patterns from arguments

diff --git a/fontconfig/fontconfig.h b/fontconfig/fontconfig.h
index 5139bbc043ba5c92ade7d0b4cff2de8135094aa6..55e1763b071b429176b726ee8516a4289d8ee7d1 100644 (file)
--- a/fontconfig/fontconfig.h
+++ b/fontconfig/fontconfig.h
@@ -822,10 +822,10 @@ FcPublic FcResult
 FcPatternGetLangSet (const FcPattern *p, const char *object, int n, FcLangSet **ls);
 
 FcPublic FcPattern *
-FcPatternVaBuild (FcPattern *orig, va_list va);
+FcPatternVaBuild (FcPattern *p, va_list va);
     
 FcPublic FcPattern *
-FcPatternBuild (FcPattern *orig, ...) FC_ATTRIBUTE_SENTINEL(0);
+FcPatternBuild (FcPattern *p, ...) FC_ATTRIBUTE_SENTINEL(0);
 
 /* fcstr.c */
 

diff --git a/src/fcpat.c b/src/fcpat.c
index 350c4c288d48258db9d9602627098c5a15dcd169..f9b533cf3e7c92da7434022194a4040a2010935a 100644 (file)
--- a/src/fcpat.c
+++ b/src/fcpat.c
@@ -954,23 +954,23 @@ FcPatternReference (FcPattern *p)
 }
 
 FcPattern *
-FcPatternVaBuild (FcPattern *orig, va_list va)
+FcPatternVaBuild (FcPattern *p, va_list va)
 {
     FcPattern  *ret;
     
-    FcPatternVapBuild (ret, orig, va);
+    FcPatternVapBuild (ret, p, va);
     return ret;
 }
 
 FcPattern *
-FcPatternBuild (FcPattern *orig, ...)
+FcPatternBuild (FcPattern *p, ...)
 {
     va_list    va;
     
-    va_start (va, orig);
-    FcPatternVapBuild (orig, orig, va);
+    va_start (va, p);
+    FcPatternVapBuild (p, p, va);
     va_end (va);
-    return orig;
+    return p;
 }
 
 /*