diff options
| author | Alan Coopersmith <alan.coopersmith@sun.com> | 2009-02-02 19:25:14 -0800 |
|---|---|---|
| committer | Alan Coopersmith <alan.coopersmith@sun.com> | 2009-02-03 10:06:00 -0800 |
| commit | 5623c27700b7b23a8dbbd8c8f45e5d4fa0c667e3 (patch) | |
| tree | 5ef32d8457f859742bcf2aa12019306db49d5c25 /xfixes | |
| parent | 6869efae74381e5305b2d6517bf286e3ef7fdcb7 (diff) | |
Constify atom name strings
Changes MakeAtom to take a const char * and NameForAtom to return them,
since many callers pass pointers to constant strings stored in read-only
ELF sections. Updates in-tree callers as necessary to clear const
mismatch warnings introduced by this change.
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
Acked-by: Peter Hutterer <peter.hutterer@who-t.net>
Diffstat (limited to 'xfixes')
| -rw-r--r-- | xfixes/cursor.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/xfixes/cursor.c b/xfixes/cursor.c index 2c584f9f4..cd3df12bc 100644 --- a/xfixes/cursor.c +++ b/xfixes/cursor.c @@ -457,7 +457,7 @@ ProcXFixesGetCursorName (ClientPtr client) CursorPtr pCursor; xXFixesGetCursorNameReply reply; REQUEST(xXFixesGetCursorNameReq); - char *str; + const char *str; int len; REQUEST_SIZE_MATCH(xXFixesGetCursorNameReq); @@ -507,7 +507,7 @@ ProcXFixesGetCursorImageAndName (ClientPtr client) CursorPtr pCursor; CARD32 *image; int npixels; - char *name; + const char *name; int nbytes, nbytesRound; int width, height; int rc, x, y; |