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/geometry.c | 36 ++++++++++++++++++------------------
 1 file changed, 18 insertions(+), 18 deletions(-)

(limited to 'xkbcomp/geometry.c')

diff --git a/xkbcomp/geometry.c b/xkbcomp/geometry.c
index 7f65c3af4..2daa213ac 100644
--- a/xkbcomp/geometry.c
+++ b/xkbcomp/geometry.c
@@ -258,9 +258,9 @@ ddText(Display * dpy, DoodadInfo * di)
     }
     if (di->section)
     {
-        sprintf(buf, "%s in section %s",
-                XkbAtomText(dpy, di->name, XkbMessage), scText(dpy,
-                                                               di->section));
+        snprintf(buf, sizeof(buf), "%s in section %s",
+                 XkbAtomText(dpy, di->name, XkbMessage),
+                 scText(dpy, di->section));
         return buf;
     }
     return XkbAtomText(dpy, di->name, XkbMessage);
@@ -967,7 +967,7 @@ AddDoodad(SectionInfo * si, GeometryInfo * info, DoodadInfo * new)
 }
 
 static DoodadInfo *
-FindDfltDoodadByTypeName(char *name, SectionInfo * si, GeometryInfo * info)
+FindDfltDoodadByTypeName(const char *name, SectionInfo *si, GeometryInfo *info)
 {
     DoodadInfo *dflt;
     unsigned type;
@@ -1408,7 +1408,7 @@ HandleIncludeGeometry(IncludeStmt * stmt, XkbDescPtr xkb, GeometryInfo * info,
 
 static int
 SetShapeField(ShapeInfo * si,
-              char *field,
+              const char *field,
               ExprDef * arrayNdx, ExprDef * value, GeometryInfo * info)
 {
     ExprResult tmp;
@@ -1440,7 +1440,7 @@ SetShapeField(ShapeInfo * si,
 
 static int
 SetShapeDoodadField(DoodadInfo * di,
-                    char *field,
+                    const char *field,
                     ExprDef * arrayNdx,
                     ExprDef * value, SectionInfo * si, GeometryInfo * info)
 {
@@ -1510,14 +1510,14 @@ SetShapeDoodadField(DoodadInfo * di,
 
 static int
 SetTextDoodadField(DoodadInfo * di,
-                   char *field,
+                   const char *field,
                    ExprDef * arrayNdx,
                    ExprDef * value, SectionInfo * si, GeometryInfo * info)
 {
     ExprResult tmp;
     unsigned def;
     unsigned type;
-    char *typeName = "text doodad";
+    const char *typeName = "text doodad";
     union
     {
         Atom *str;
@@ -1660,7 +1660,7 @@ SetTextDoodadField(DoodadInfo * di,
 
 static int
 SetIndicatorDoodadField(DoodadInfo * di,
-                        char *field,
+                        const char *field,
                         ExprDef * arrayNdx,
                         ExprDef * value,
                         SectionInfo * si, GeometryInfo * info)
@@ -1705,12 +1705,12 @@ SetIndicatorDoodadField(DoodadInfo * di,
 
 static int
 SetLogoDoodadField(DoodadInfo * di,
-                   char *field,
+                   const char *field,
                    ExprDef * arrayNdx,
                    ExprDef * value, SectionInfo * si, GeometryInfo * info)
 {
     ExprResult tmp;
-    char *typeName = "logo doodad";
+    const char *typeName = "logo doodad";
 
     if ((!uStrCaseCmp(field, "corner"))
         || (!uStrCaseCmp(field, "cornerradius")))
@@ -1786,7 +1786,7 @@ SetLogoDoodadField(DoodadInfo * di,
 
 static int
 SetDoodadField(DoodadInfo * di,
-               char *field,
+               const char *field,
                ExprDef * arrayNdx,
                ExprDef * value, SectionInfo * si, GeometryInfo * info)
 {
@@ -1889,7 +1889,7 @@ SetDoodadField(DoodadInfo * di,
 
 static int
 SetSectionField(SectionInfo * si,
-                char *field,
+                const char *field,
                 ExprDef * arrayNdx, ExprDef * value, GeometryInfo * info)
 {
     unsigned short *pField;
@@ -1977,7 +1977,7 @@ SetSectionField(SectionInfo * si,
 
 static int
 SetRowField(RowInfo * row,
-            char *field,
+            const char *field,
             ExprDef * arrayNdx, ExprDef * value, GeometryInfo * info)
 {
     ExprResult tmp;
@@ -2841,7 +2841,7 @@ HandleGeometryFile(XkbFile * file,
                    XkbDescPtr xkb, unsigned merge, GeometryInfo * info)
 {
     ParseCommon *stmt;
-    char *failWhat;
+    const char *failWhat;
 
     if (merge == MergeDefault)
         merge = MergeAugment;
@@ -3273,7 +3273,7 @@ FontFromParts(Atom fontTok,
               Atom setWidthTok, Atom varTok, int size, Atom encodingTok)
 {
     int totalSize;
-    char *font, *weight, *slant, *setWidth, *variant, *encoding;
+    const char *font, *weight, *slant, *setWidth, *variant, *encoding;
     char *rtrn;
 
     font = (fontTok != None ? XkbAtomGetString(NULL, fontTok) : DFLT_FONT);
@@ -3297,8 +3297,8 @@ FontFromParts(Atom fontTok,
     rtrn = uCalloc(totalSize, 1);
     if (rtrn)
     {
-        sprintf(rtrn, FONT_TEMPLATE, font, weight, slant, setWidth, variant,
-                size, encoding);
+        snprintf(rtrn, totalSize, FONT_TEMPLATE, font, weight, slant,
+                 setWidth, variant, size, encoding);
     }
     return rtrn;
 }
-- 
cgit v1.2.3