aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/os
diff options
context:
space:
mode:
Diffstat (limited to 'xorg-server/os')
-rw-r--r--[-rwxr-xr-x]xorg-server/os/access.c0
-rw-r--r--xorg-server/os/log.c4
-rw-r--r--xorg-server/os/utils.c6
-rw-r--r--[-rwxr-xr-x]xorg-server/os/xdmcp.c0
4 files changed, 7 insertions, 3 deletions
diff --git a/xorg-server/os/access.c b/xorg-server/os/access.c
index 62c3d9925..62c3d9925 100755..100644
--- a/xorg-server/os/access.c
+++ b/xorg-server/os/access.c
diff --git a/xorg-server/os/log.c b/xorg-server/os/log.c
index 97b93632b..67c27eefa 100644
--- a/xorg-server/os/log.c
+++ b/xorg-server/os/log.c
@@ -201,7 +201,9 @@ LogInit(const char *fname, const char *backup)
char *logFileName = NULL;
if (fname && *fname) {
+#if __GNUC__ > 4 || __GNUC__ == 4 && __GNUC_MINOR__ > 2
#pragma GCC diagnostic ignored "-Wformat-nonliteral"
+#endif
if (asprintf(&logFileName, fname, display) == -1)
FatalError("Cannot allocate space for the log file name\n");
@@ -212,7 +214,9 @@ LogInit(const char *fname, const char *backup)
char *suffix;
char *oldLog;
+#if __GNUC__ > 4 || __GNUC__ == 4 && __GNUC_MINOR__ > 2
#pragma GCC diagnostic ignored "-Wformat-nonliteral"
+#endif
if ((asprintf(&suffix, backup, display) == -1) ||
(asprintf(&oldLog, "%s%s", logFileName, suffix) == -1))
FatalError("Cannot allocate space for the log file name\n");
diff --git a/xorg-server/os/utils.c b/xorg-server/os/utils.c
index d73ef1903..cbd5c7ad5 100644
--- a/xorg-server/os/utils.c
+++ b/xorg-server/os/utils.c
@@ -2031,10 +2031,10 @@ CheckUserAuthorization(void)
* Tokenize a string into a NULL terminated array of strings. Always returns
* an allocated array unless an error occurs.
*/
-const char **
+char **
xstrtokenize(const char *str, const char *separators)
{
- const char **list, **nlist;
+ char **list, **nlist;
char *tok, *tmp;
unsigned num = 0, n;
@@ -2062,7 +2062,7 @@ xstrtokenize(const char *str, const char *separators)
error:
free(tmp);
for (n = 0; n < num; n++)
- free((void *) list[n]);
+ free(list[n]);
free(list);
return NULL;
}
diff --git a/xorg-server/os/xdmcp.c b/xorg-server/os/xdmcp.c
index bc7dcb3df..bc7dcb3df 100755..100644
--- a/xorg-server/os/xdmcp.c
+++ b/xorg-server/os/xdmcp.c