Bug 41171 - Invalid use of memset

[fontconfig.git] / fontconfig / fcprivate.h

diff --git a/fontconfig/fcprivate.h b/fontconfig/fcprivate.h
index 490ca33657791a8e36adc057ee9472d6916a6090..18b8c08ca77fdb1168df73b5eba0eecd89aa70fe 100644 (file)
--- a/fontconfig/fcprivate.h
+++ b/fontconfig/fcprivate.h
@@ -1,21 +1,21 @@
 /*
- * $XFree86: $
+ * fontconfig/fontconfig/fcprivate.h
  *
- * Copyright © 2001 Keith Packard, member of The XFree86 Project, Inc.
+ * Copyright © 2001 Keith Packard
  *
  * Permission to use, copy, modify, distribute, and sell this software and its
  * documentation for any purpose is hereby granted without fee, provided that
  * the above copyright notice appear in all copies and that both that
  * copyright notice and this permission notice appear in supporting
- * documentation, and that the name of Keith Packard not be used in
+ * documentation, and that the name of the author(s) not be used in
  * advertising or publicity pertaining to distribution of the software without
- * specific, written prior permission.  Keith Packard makes no
+ * specific, written prior permission.  The authors make no
  * representations about the suitability of this software for any purpose.  It
  * is provided "as is" without express or implied warranty.
  *
- * KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+ * THE AUTHOR(S) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
  * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
- * EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+ * EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR
  * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
  * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
  * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
@@ -59,16 +59,22 @@
            __v__.u.d = va_arg (va, double);                        \
            break;                                                  \
        case FcTypeString:                                          \
-           __v__.u.s = va_arg (va, char *);                        \
+           __v__.u.s = va_arg (va, const FcChar8 *);               \
            break;                                                  \
        case FcTypeBool:                                            \
            __v__.u.b = va_arg (va, FcBool);                        \
            break;                                                  \
        case FcTypeMatrix:                                          \
-           __v__.u.m = va_arg (va, FcMatrix *);                    \
+           __v__.u.m = va_arg (va, const FcMatrix *);              \
            break;                                                  \
        case FcTypeCharSet:                                         \
-           __v__.u.c = va_arg (va, FcCharSet *);                   \
+           __v__.u.c = va_arg (va, const FcCharSet *);             \
+           break;                                                  \
+       case FcTypeFTFace:                                          \
+           __v__.u.f = va_arg (va, FT_Face);                       \
+           break;                                                  \
+       case FcTypeLangSet:                                         \
+           __v__.u.l = va_arg (va, const FcLangSet *);             \
            break;                                                  \
        }                                                           \
        if (!FcPatternAdd (__p__, __o__, __v__, FcTrue))            \
@@ -81,7 +87,7 @@ _FcPatternVapBuild_bail1:                                         \
     if (!orig)                                                     \
        FcPatternDestroy (__p__);                                   \
 _FcPatternVapBuild_bail0:                                          \
-    result = 0;                                                            \
+    result = (void*)0;                                             \
                                                                    \
 _FcPatternVapBuild_return:                                         \
     ;                                                              \