From 31fd4c5654595a4763e492e4ec26f66ca3a8a405 Mon Sep 17 00:00:00 2001
From: marha <marha@users.sourceforge.net>
Date: Mon, 4 Nov 2013 12:08:23 +0100
Subject: libxtrans fontconfig mesa xserver pixman xkbcomp git update 4 nov
 2013

xserver          commit 33c85beed521c9db140cadd8c5aa9992398ee1fe
xkbcomp          commit e3e6e938535532bfad175c1635256ab7fb3ac943
pixman           commit 8cbc7da4e525c96a8e089e4c1baee75dc8315218
libxtrans        commit 1fb0fd555a16dd8fce4abc6d3fd22b315f46762a
fontconfig       commit 767108aa1327cf0156dfc6f024dbc8fb783ae067
mesa             commit 2f896627175384fd5943f21804700a155ba4e8a0
---
 xkbcomp/expr.c | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'xkbcomp/expr.c')

diff --git a/xkbcomp/expr.c b/xkbcomp/expr.c
index 96fd95675..e0f957c15 100644
--- a/xkbcomp/expr.c
+++ b/xkbcomp/expr.c
@@ -292,7 +292,7 @@ ExprResolveModIndex(ExprDef * expr,
                     IdentLookupFunc lookup, XPointer lookupPriv)
 {
     int ok = 0;
-    char *bogus = NULL;
+    const char *bogus = NULL;
 
     switch (expr->op)
     {
@@ -382,7 +382,7 @@ ExprResolveBoolean(ExprDef * expr,
                    IdentLookupFunc lookup, XPointer lookupPriv)
 {
     int ok = 0;
-    char *bogus = NULL;
+    const char *bogus = NULL;
 
     switch (expr->op)
     {
@@ -715,7 +715,7 @@ ExprResolveString(ExprDef * expr,
     ExprResult leftRtrn, rightRtrn;
     ExprDef *left;
     ExprDef *right;
-    char *bogus = NULL;
+    const char *bogus = NULL;
 
     switch (expr->op)
     {
@@ -729,7 +729,7 @@ ExprResolveString(ExprDef * expr,
         val_rtrn->str = XkbAtomGetString(NULL, expr->value.str);
         if (val_rtrn->str == NULL)
         {
-            static char *empty = "";
+            static const char *empty = "";
             val_rtrn->str = empty;
         }
         return True;
@@ -767,7 +767,7 @@ ExprResolveString(ExprDef * expr,
             new = (char *) uAlloc(len);
             if (new)
             {
-                sprintf(new, "%s%s", leftRtrn.str, rightRtrn.str);
+                snprintf(new, len, "%s%s", leftRtrn.str, rightRtrn.str);
                 val_rtrn->str = new;
                 return True;
             }
@@ -822,7 +822,7 @@ ExprResolveKeyName(ExprDef * expr,
     int ok = 0;
     ExprDef *left;
     ExprResult leftRtrn;
-    char *bogus = NULL;
+    const char *bogus = NULL;
 
     switch (expr->op)
     {
@@ -941,7 +941,7 @@ ExprResolveMask(ExprDef * expr,
     int ok = 0;
     ExprResult leftRtrn, rightRtrn;
     ExprDef *left, *right;
-    char *bogus = NULL;
+    const char *bogus = NULL;
 
     switch (expr->op)
     {
-- 
cgit v1.2.3