Mark constant strings as constant

Fixes a few compiler warnings in fcxml.c and makes it clear that they
should not be freed.

diff --git a/doc/fcatomic.fncs b/doc/fcatomic.fncs
index 017756af1b6de9092094f922433d6e618a62348a..1653009a8ae5cb855d267e2098780a70e8f089d4 100644 (file)
--- a/doc/fcatomic.fncs
+++ b/doc/fcatomic.fncs
@@ -57,7 +57,7 @@ by <parameter>atomic</parameter>.
 @TYPE1@         FcAtomic *                      @ARG1@          atomic
 @PURPOSE@      return original file name
 @DESC@
-Returns the file referenced by <parameter>atomic</parameter>.
+Returns the file refernced by <parameter>atomic</parameter>.
 @@
 
 @RET@           FcBool

diff --git a/src/fcint.h b/src/fcint.h
index e662c37e22905efc8ba8be81a5c8bfaf45aa2cdb..a2313dfe39d05ba2cc802dfba09d0a18ba1d8adf 100644 (file)
--- a/src/fcint.h
+++ b/src/fcint.h
@@ -239,13 +239,13 @@ typedef struct _FcExpr {
     union {
        int         ival;
        double      dval;
-       FcChar8     *sval;
+       const FcChar8       *sval;
        FcMatrix    *mval;
        FcBool      bval;
        FcCharSet   *cval;
        FcLangSet   *lval;
        FcObject    object;
-       FcChar8     *constant;
+       const FcChar8       *constant;
        struct {
            struct _FcExpr *left, *right;
        } tree;