diff options
author | Alan Coopersmith <alan.coopersmith@oracle.com> | 2011-09-16 19:10:04 -0700 |
---|---|---|
committer | Alan Coopersmith <alan.coopersmith@oracle.com> | 2011-09-19 17:28:59 -0700 |
commit | c57e65406a7447930f701a319ba518acf9b4b5d3 (patch) | |
tree | ab0bc7eef84ee7634638cc3403f282f84d3b6b1c /include | |
parent | 12463ed04068716ef8e9cf53eddaf8e78d0688dd (diff) |
Fix gcc -Wwrite-strings warnings for initialization with string literals
Many warnings of the form:
os/config.c:92:5: warning: initialization discards qualifiers from pointer target type
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Diffstat (limited to 'include')
-rw-r--r-- | include/difsutils.h | 2 | ||||
-rw-r--r-- | include/os.h | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/include/difsutils.h b/include/difsutils.h index 3913358..43f1f8b 100644 --- a/include/difsutils.h +++ b/include/difsutils.h @@ -52,7 +52,7 @@ extern int SetDefaultResolutions (char *str); extern int client_auth_generation (ClientPtr client); #endif extern int set_font_authorizations (char **authorizations, int *authlen, ClientPtr client); -extern int strncmpnocase (char *first, char *second, int n); +extern int strncmpnocase (const char *first, const char *second, int n); extern pointer Xalloc (unsigned long m); extern pointer Xrealloc (pointer n, unsigned long m); extern void BlockHandler (OSTimePtr pTimeout, pointer pReadmask); diff --git a/include/os.h b/include/os.h index 8f99186..58238ec 100644 --- a/include/os.h +++ b/include/os.h @@ -95,12 +95,12 @@ extern void BecomeDaemon(void); extern void DetachStdio(void); /* os/error.c */ -extern void Error(char *str); +extern void Error(const char *str); extern void InitErrors(void); extern void CloseErrors(void); -extern void NoticeF(char *f, ...); -extern void ErrorF(char * f, ...); -extern void FatalError(char* f, ...); +extern void NoticeF(const char *f, ...); +extern void ErrorF(const char * f, ...); +extern void FatalError(const char* f, ...); /* os/io.c */ extern Bool InsertFakeRequest(ClientPtr client, char *data, int count); @@ -114,7 +114,7 @@ extern void WriteToClient(ClientPtr client, int count, char *buf); extern void WriteToClientUnpadded(ClientPtr client, int count, char *buf); /* os/osglue.c */ -extern int ListCatalogues(char *pattern, int patlen, int maxnames, char **catalogues, int *len); +extern int ListCatalogues(const char *pattern, int patlen, int maxnames, char **catalogues, int *len); extern int ValidateCatalogues(int *num, char *cats); extern int SetAlternateServers(char *list); extern int ListAlternateServers(AlternateServerPtr *svrs); |