aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/Xext
diff options
context:
space:
mode:
Diffstat (limited to 'xorg-server/Xext')
-rw-r--r--xorg-server/Xext/security.c5
-rw-r--r--xorg-server/Xext/xres.c4
2 files changed, 5 insertions, 4 deletions
diff --git a/xorg-server/Xext/security.c b/xorg-server/Xext/security.c
index 6fc1eafdd..df5bd5822 100644
--- a/xorg-server/Xext/security.c
+++ b/xorg-server/Xext/security.c
@@ -97,7 +97,7 @@ static const Mask SecurityClientMask = DixGetAttrAccess;
* Writes the message to the log file if security logging is on.
*/
-static void
+static void _X_ATTRIBUTE_PRINTF(1,2)
SecurityAudit(const char *format, ...)
{
va_list args;
@@ -171,7 +171,8 @@ SecurityDeleteAuthorization(
{
SecurityAuthorizationPtr pAuth = (SecurityAuthorizationPtr)value;
unsigned short name_len, data_len;
- char *name, *data;
+ const char *name;
+ char *data;
int status;
int i;
OtherClientsPtr pEventClient;
diff --git a/xorg-server/Xext/xres.c b/xorg-server/Xext/xres.c
index b95272882..232fbab5b 100644
--- a/xorg-server/Xext/xres.c
+++ b/xorg-server/Xext/xres.c
@@ -147,12 +147,12 @@ ProcXResQueryClientResources (ClientPtr client)
if(num_types) {
xXResType scratch;
- char *name;
+ const char *name;
for(i = 0; i < lastResourceType; i++) {
if(!counts[i]) continue;
- name = (char *)LookupResourceName(i + 1);
+ name = LookupResourceName(i + 1);
if (strcmp(name, XREGISTRY_UNKNOWN))
scratch.resource_type = MakeAtom(name, strlen(name), TRUE);
else {