diff options
| author | Alan Coopersmith <alan.coopersmith@oracle.com> | 2011-09-26 15:41:49 -0700 |
|---|---|---|
| committer | Alan Coopersmith <alan.coopersmith@oracle.com> | 2011-09-28 09:10:02 -0700 |
| commit | 0e0efb8b26a241f8370053bc3686f7abc69357c1 (patch) | |
| tree | 980e1d7c78c53ed480754207237dc310fe9dd2ee | |
| parent | df353cc7fe40fadc6e48586e95a0cbf1d2e33cfa (diff) | |
Add const attributes to fix gcc -Wwrite-strings warnings
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Aaron Plattner <aplattner@nvidia.com>
| -rw-r--r-- | src/xftdpy.c | 8 | ||||
| -rw-r--r-- | src/xftfreetype.c | 2 | ||||
| -rw-r--r-- | src/xftinit.c | 2 | ||||
| -rw-r--r-- | src/xftint.h | 2 |
4 files changed, 7 insertions, 7 deletions
diff --git a/src/xftdpy.c b/src/xftdpy.c index 747b8db..8f453b3 100644 --- a/src/xftdpy.c +++ b/src/xftdpy.c @@ -282,7 +282,7 @@ XftDefaultSet (Display *dpy, FcPattern *defaults) } _X_HIDDEN int -XftDefaultParseBool (char *v) +XftDefaultParseBool (const char *v) { char c0, c1; @@ -307,7 +307,7 @@ XftDefaultParseBool (char *v) } static Bool -_XftDefaultInitBool (Display *dpy, FcPattern *pat, char *option) +_XftDefaultInitBool (Display *dpy, FcPattern *pat, const char *option) { char *v; int i; @@ -319,7 +319,7 @@ _XftDefaultInitBool (Display *dpy, FcPattern *pat, char *option) } static Bool -_XftDefaultInitDouble (Display *dpy, FcPattern *pat, char *option) +_XftDefaultInitDouble (Display *dpy, FcPattern *pat, const char *option) { char *v, *e; double d; @@ -335,7 +335,7 @@ _XftDefaultInitDouble (Display *dpy, FcPattern *pat, char *option) } static Bool -_XftDefaultInitInteger (Display *dpy, FcPattern *pat, char *option) +_XftDefaultInitInteger (Display *dpy, FcPattern *pat, const char *option) { char *v, *e; int i; diff --git a/src/xftfreetype.c b/src/xftfreetype.c index 3d930be..3f8dfef 100644 --- a/src/xftfreetype.c +++ b/src/xftfreetype.c @@ -164,7 +164,7 @@ _XftLockFile (XftFtFile *f) } static void -_XftLockError (char *reason) +_XftLockError (const char *reason) { fprintf (stderr, "Xft: locking error %s\n", reason); } diff --git a/src/xftinit.c b/src/xftinit.c index 0205e4b..ff23722 100644 --- a/src/xftinit.c +++ b/src/xftinit.c @@ -43,7 +43,7 @@ XftGetVersion (void) } static struct { - char *name; + const char *name; int alloc_count; int alloc_mem; int free_count; diff --git a/src/xftint.h b/src/xftint.h index 43f9ebe..eb9257e 100644 --- a/src/xftint.h +++ b/src/xftint.h @@ -376,7 +376,7 @@ void _XftDisplayManageMemory (Display *dpy); int -XftDefaultParseBool (char *v); +XftDefaultParseBool (const char *v); FcBool XftDefaultGetBool (Display *dpy, const char *object, int screen, FcBool def); |