From: Behdad Esfahbod <behdad@behdad.org>
Date: Mon, 14 Mar 2011 21:21:32 +0000 (-0300)
Subject: Mark constant strings as constant
X-Git-Tag: root-2~24
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=6c7915c10548132c3f7d0c00d08fdb268e5da6d4;p=fontconfig.git

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 017756a..1653009 100644
--- 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 e662c37..a2313df 100644
--- 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;