From 74e16ceeeab86f50c4b6bea12800f70110cd4794 Mon Sep 17 00:00:00 2001 From: Behdad Esfahbod Date: Thu, 14 Aug 2008 15:27:16 -0400 Subject: [PATCH] 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. --- doc/fcpattern.fncs | 6 +++--- fontconfig/fontconfig.h | 4 ++-- src/fcpat.c | 12 ++++++------ 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/doc/fcpattern.fncs b/doc/fcpattern.fncs index ed59580..5a9912f 100644 --- 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 5139bbc..55e1763 100644 --- 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 350c4c2..f9b533c 100644 --- 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; } /* -- 2.39.5