summaryrefslogtreecommitdiff
path: root/Xext
diff options
context:
space:
mode:
Diffstat (limited to 'Xext')
-rw-r--r--Xext/security.c4
-rw-r--r--Xext/sync.c4
-rw-r--r--Xext/syncsrv.h4
-rw-r--r--Xext/xtest.c2
4 files changed, 7 insertions, 7 deletions
diff --git a/Xext/security.c b/Xext/security.c
index 08d8158e3..0a63aa280 100644
--- a/Xext/security.c
+++ b/Xext/security.c
@@ -62,7 +62,7 @@ typedef struct {
} SecurityStateRec;
/* Extensions that untrusted clients shouldn't have access to */
-static char *SecurityTrustedExtensions[] = {
+static const char *SecurityTrustedExtensions[] = {
"XC-MISC",
"BIG-REQUESTS",
"XpExtension",
@@ -98,7 +98,7 @@ static const Mask SecurityClientMask = DixGetAttrAccess;
*/
static void
-SecurityAudit(char *format, ...)
+SecurityAudit(const char *format, ...)
{
va_list args;
diff --git a/Xext/sync.c b/Xext/sync.c
index 3b257f73b..23360f002 100644
--- a/Xext/sync.c
+++ b/Xext/sync.c
@@ -971,7 +971,7 @@ static int FreeCounter(void *, XID);
pointer
SyncCreateSystemCounter(
- char *name,
+ const char *name,
CARD64 initial,
CARD64 resolution,
SyncCounterType counterType,
@@ -1308,7 +1308,7 @@ ProcSyncListSystemCounters(ClientPtr client)
for (i = len = 0; i < SyncNumSystemCounters; i++)
{
- char *name = SysCounterList[i]->pSysCounterInfo->name;
+ const char *name = SysCounterList[i]->pSysCounterInfo->name;
/* pad to 4 byte boundary */
len += pad_to_int32(sz_xSyncSystemCounter + strlen(name));
}
diff --git a/Xext/syncsrv.h b/Xext/syncsrv.h
index 7ca1fba26..2b7077364 100644
--- a/Xext/syncsrv.h
+++ b/Xext/syncsrv.h
@@ -66,7 +66,7 @@ typedef enum {
} SyncCounterType;
typedef struct _SysCounterInfo {
- char *name;
+ const char *name;
CARD64 resolution;
CARD64 bracket_greater;
CARD64 bracket_less;
@@ -118,7 +118,7 @@ typedef union {
} SyncAwaitUnion;
extern pointer SyncCreateSystemCounter(
- char * /* name */,
+ const char */* name */,
CARD64 /* inital_value */,
CARD64 /* resolution */,
SyncCounterType /* change characterization */,
diff --git a/Xext/xtest.c b/Xext/xtest.c
index b69de35f6..bd8e1d3a7 100644
--- a/Xext/xtest.c
+++ b/Xext/xtest.c
@@ -603,7 +603,7 @@ DeviceSetXTestProperty(DeviceIntPtr dev, Atom property,
* This only creates the pair, Activate/Enable Device
* still need to be called.
*/
-int AllocXTestDevice (ClientPtr client, char* name,
+int AllocXTestDevice (ClientPtr client, const char* name,
DeviceIntPtr* ptr, DeviceIntPtr* keybd,
DeviceIntPtr master_ptr, DeviceIntPtr master_keybd)
{