diff options
| author | Alan Coopersmith <alan.coopersmith@oracle.com> | 2011-12-12 16:49:34 -0800 |
|---|---|---|
| committer | Alan Coopersmith <alan.coopersmith@oracle.com> | 2011-12-12 17:03:10 -0800 |
| commit | d5a5eece670dee963765eab1431c21525c16d9ee (patch) | |
| tree | 7ec3c57b2a7eec96e1589d3a1a57061b0a0c3531 | |
| parent | 83ac9502ea9f1dedf3a8002745668af16bb1f2af (diff) | |
CompareISOLatin1Lowered: constify arguments
Allows callers to avoid deconstifying arguments when calling, fixing
gcc warning:
filter.c: In function 'PictureGetFilterId':
filter.c:59:2: warning: cast discards qualifiers from pointer target type
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Jamey Sharp <jamey@minilop.net>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
| -rw-r--r-- | dix/dixutils.c | 4 | ||||
| -rw-r--r-- | include/dix.h | 4 | ||||
| -rw-r--r-- | render/filter.c | 3 |
3 files changed, 6 insertions, 5 deletions
diff --git a/dix/dixutils.c b/dix/dixutils.c index 1e3134663..00bbde67c 100644 --- a/dix/dixutils.c +++ b/dix/dixutils.c @@ -167,8 +167,8 @@ ISOLatin1ToLower (unsigned char source) int -CompareISOLatin1Lowered(unsigned char *s1, int s1len, - unsigned char *s2, int s2len) +CompareISOLatin1Lowered(const unsigned char *s1, int s1len, + const unsigned char *s2, int s2len) { unsigned char c1, c2; diff --git a/include/dix.h b/include/dix.h index cfbfa1f41..2d8d315c5 100644 --- a/include/dix.h +++ b/include/dix.h @@ -175,9 +175,9 @@ extern _X_HIDDEN Bool CreateConnectionBlock(void); /* dixutils.c */ extern _X_EXPORT int CompareISOLatin1Lowered( - unsigned char * /*a*/, + const unsigned char * /*a*/, int alen, - unsigned char * /*b*/, + const unsigned char * /*b*/, int blen); extern _X_EXPORT int dixLookupWindow( diff --git a/render/filter.c b/render/filter.c index 0cbd47bd2..c513ee8f9 100644 --- a/render/filter.c +++ b/render/filter.c @@ -56,7 +56,8 @@ PictureGetFilterId (const char *filter, int len, Bool makeit) if (len < 0) len = strlen (filter); for (i = 0; i < nfilterNames; i++) - if (!CompareISOLatin1Lowered ((unsigned char *) filterNames[i], -1, (unsigned char *) filter, len)) + if (!CompareISOLatin1Lowered ((const unsigned char *) filterNames[i], -1, + (const unsigned char *) filter, len)) return i; if (!makeit) return -1; |