Merge branch 'uli42-pr/reduce_uninitialised' into 3.6.x

3 files changed, 15 insertions, 15 deletions

diff --git a/nx-X11/programs/Xserver/Xext/dpms.c b/nx-X11/programs/Xserver/Xext/dpms.c
index ea9781353..e05a70621 100644
--- a/nx-X11/programs/Xserver/Xext/dpms.c
+++ b/nx-X11/programs/Xserver/Xext/dpms.c
@@ -101,7 +101,7 @@ ProcDPMSGetVersion(client)
     register ClientPtr client;
 {
     /* REQUEST(xDPMSGetVersionReq); */
-    xDPMSGetVersionReply rep;
+    xDPMSGetVersionReply rep = {0};
 
     REQUEST_SIZE_MATCH(xDPMSGetVersionReq);
 
@@ -123,7 +123,7 @@ static int
 ProcDPMSCapable(register ClientPtr client)
 {
     /* REQUEST(xDPMSCapableReq); */
-    xDPMSCapableReply rep;
+    xDPMSCapableReply rep = {0};
 
     REQUEST_SIZE_MATCH(xDPMSCapableReq);
 
@@ -144,7 +144,7 @@ ProcDPMSGetTimeouts(client)
     register ClientPtr client;
 {
     /* REQUEST(xDPMSGetTimeoutsReq); */
-    xDPMSGetTimeoutsReply rep;
+    xDPMSGetTimeoutsReply rep = {0};
 
     REQUEST_SIZE_MATCH(xDPMSGetTimeoutsReq);
 
@@ -258,7 +258,7 @@ static int
 ProcDPMSInfo(register ClientPtr client)
 {
     /* REQUEST(xDPMSInfoReq); */
-    xDPMSInfoReply rep;
+    xDPMSInfoReply rep = {0};
 
     REQUEST_SIZE_MATCH(xDPMSInfoReq);
 
diff --git a/nx-X11/programs/Xserver/Xext/shape.c b/nx-X11/programs/Xserver/Xext/shape.c
index 693495b57..48a3e952d 100644
--- a/nx-X11/programs/Xserver/Xext/shape.c
+++ b/nx-X11/programs/Xserver/Xext/shape.c
@@ -266,7 +266,7 @@ RegionPtr
 CreateBoundingShape (pWin)
     WindowPtr	pWin;
 {
-    BoxRec	extents;
+    BoxRec	extents = {0};
 
     extents.x1 = -wBorderWidth (pWin);
     extents.y1 = -wBorderWidth (pWin);
@@ -279,7 +279,7 @@ RegionPtr
 CreateClipShape (pWin)
     WindowPtr	pWin;
 {
-    BoxRec	extents;
+    BoxRec	extents = {0};
 
     extents.x1 = 0;
     extents.y1 = 0;
@@ -292,7 +292,7 @@ static int
 ProcShapeQueryVersion (client)
     register ClientPtr	client;
 {
-    xShapeQueryVersionReply	rep;
+    xShapeQueryVersionReply	rep = {0};
 
     REQUEST_SIZE_MATCH (xShapeQueryVersionReq);
     memset(&rep, 0, sizeof(xShapeQueryVersionReply));
@@ -713,8 +713,8 @@ ProcShapeQueryExtents (client)
 {
     REQUEST(xShapeQueryExtentsReq);
     WindowPtr		pWin;
-    xShapeQueryExtentsReply	rep;
-    BoxRec		extents, *pExtents;
+    xShapeQueryExtentsReply	rep = {0};
+    BoxRec		extents = {0}, *pExtents;
     RegionPtr		region;
 
     REQUEST_SIZE_MATCH (xShapeQueryExtentsReq);
@@ -919,8 +919,8 @@ SendShapeNotify (pWin, which)
     int		which;
 {
     ShapeEventPtr	*pHead, pShapeEvent;
-    xShapeNotifyEvent	se;
-    BoxRec		extents;
+    xShapeNotifyEvent	se = {0};
+    BoxRec		extents = {0};
     RegionPtr		region;
     BYTE		shaped;
 
@@ -992,7 +992,7 @@ ProcShapeInputSelected (client)
     WindowPtr		pWin;
     ShapeEventPtr	pShapeEvent, *pHead;
     int			enabled;
-    xShapeInputSelectedReply	rep;
+    xShapeInputSelectedReply	rep = {0};
 
     REQUEST_SIZE_MATCH (xShapeInputSelectedReq);
     pWin = LookupWindow (stuff->window, client);
@@ -1030,7 +1030,7 @@ ProcShapeGetRectangles (client)
 {
     REQUEST(xShapeGetRectanglesReq);
     WindowPtr			pWin;
-    xShapeGetRectanglesReply	rep;
+    xShapeGetRectanglesReply	rep = {0};
     xRectangle			*rects;
     int				nrects, i;
     RegionPtr			region;
diff --git a/nx-X11/programs/Xserver/Xext/xtest.c b/nx-X11/programs/Xserver/Xext/xtest.c
index d78efd39b..a392599ea 100644
--- a/nx-X11/programs/Xserver/Xext/xtest.c
+++ b/nx-X11/programs/Xserver/Xext/xtest.c
@@ -111,7 +111,7 @@ static int
 ProcXTestGetVersion(client)
     register ClientPtr client;
 {
-    xXTestGetVersionReply rep;
+    xXTestGetVersionReply rep = {0};
 
     REQUEST_SIZE_MATCH(xXTestGetVersionReq);
     rep.type = X_Reply;
@@ -132,7 +132,7 @@ ProcXTestCompareCursor(client)
     register ClientPtr client;
 {
     REQUEST(xXTestCompareCursorReq);
-    xXTestCompareCursorReply rep;
+    xXTestCompareCursorReply rep = {0};
     WindowPtr pWin;
     CursorPtr pCursor;