From 6acbfab33133a92dbd7f128284d26f94bfeb1af2 Mon Sep 17 00:00:00 2001
From: Ulrich Sibiller <uli42@gmx.de>
Date: Sun, 10 Dec 2017 23:57:35 +0100
Subject: reduce usage of uninitialised bytes

as reported by valgrind
---
 nx-X11/programs/Xserver/hw/nxagent/NXdispatch.c |  2 +-
 nx-X11/programs/Xserver/hw/nxagent/NXwindow.c   | 17 ++++++-----------
 2 files changed, 7 insertions(+), 12 deletions(-)

(limited to 'nx-X11/programs/Xserver/hw')

diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXdispatch.c b/nx-X11/programs/Xserver/hw/nxagent/NXdispatch.c
index 1c2cd42ac..ca7086d62 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/NXdispatch.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/NXdispatch.c
@@ -719,7 +719,7 @@ ProcSetSelectionOwner(register ClientPtr client)
             i++;
         if (i < NumCurrentSelections)
         {        
-	    xEvent event;
+	    xEvent event = {0};
 
 	    /* If the timestamp in client's request is in the past relative
 		to the time stamp indicating the last time the owner of the
diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXwindow.c b/nx-X11/programs/Xserver/hw/nxagent/NXwindow.c
index 44d398304..5df252d34 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/NXwindow.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/NXwindow.c
@@ -310,7 +310,6 @@ DeleteWindow(void * value, XID wid)
  {
     register WindowPtr pParent;
     register WindowPtr pWin = (WindowPtr)value;
-    xEvent event;
 
     UnmapWindow(pWin, FALSE);
 
@@ -319,7 +318,7 @@ DeleteWindow(void * value, XID wid)
     pParent = pWin->parent;
     if (wid && pParent && SubStrSend(pWin, pParent))
     {
-	memset(&event, 0, sizeof(xEvent));
+	xEvent event = {0};
 	event.u.u.type = DestroyNotify;
 	event.u.destroyNotify.window = pWin->drawable.id;
 	DeliverEvents(pWin, &event, 1, NullWindow);		
@@ -371,8 +370,7 @@ ResizeChildrenWinSize(register WindowPtr pWin, int dx, int dy, int dw, int dh)
 			pSib->winGravity, &cwsx, &cwsy);
 	    if (cwsx != pSib->origin.x || cwsy != pSib->origin.y)
 	    {
-		xEvent event;
-
+		xEvent event = {0};
 		event.u.u.type = GravityNotify;
 		event.u.gravity.window = pSib->drawable.id;
 		event.u.gravity.x = cwsx - wBorderWidth (pSib);
@@ -450,7 +448,7 @@ ConfigureWindow(register WindowPtr pWin, register Mask mask, XID *vlist, ClientP
 		   h = pWin->drawable.height,
 		   bw = pWin->borderWidth;
     int action, smode = Above;
-    xEvent event;
+    xEvent event = {0};
 
     if ((pWin->drawable.class == InputOnly) && (mask & IllegalInputOnlyConfigureMask))
 	return(BadMatch);
@@ -607,8 +605,7 @@ ConfigureWindow(register WindowPtr pWin, register Mask mask, XID *vlist, ClientP
 			|| (h != pWin->drawable.height);
 	if (size_change && ((pWin->eventMask|wOtherEventMasks(pWin)) & ResizeRedirectMask))
 	{
-	    xEvent eventT;
-	    memset(&eventT, 0, sizeof(xEvent));
+	    xEvent eventT = {0};
 	    eventT.u.u.type = ResizeRequest;
 	    eventT.u.resizeRequest.window = pWin->drawable.id;
 	    eventT.u.resizeRequest.width = w;
@@ -723,7 +720,7 @@ ReparentWindow(register WindowPtr pWin, register WindowPtr pParent,
 {
     WindowPtr pPrev, pPriorParent;
     Bool WasMapped = (Bool)(pWin->mapped);
-    xEvent event;
+    xEvent event = {0};
     int bw = wBorderWidth (pWin);
     register ScreenPtr pScreen;
 
@@ -736,7 +733,6 @@ ReparentWindow(register WindowPtr pWin, register WindowPtr pParent,
     if (WasMapped)
        UnmapWindow(pWin, FALSE);
 
-    memset(&event, 0, sizeof(xEvent));
     event.u.u.type = ReparentNotify;
     event.u.reparent.window = pWin->drawable.id;
     event.u.reparent.parent = pParent->drawable.id;
@@ -949,7 +945,6 @@ int
 UnmapWindow(register WindowPtr pWin, Bool fromConfigure)
 {
     register WindowPtr pParent;
-    xEvent event;
     Bool wasRealized = (Bool)pWin->realized;
     Bool wasViewable = (Bool)pWin->viewable;
     ScreenPtr pScreen = pWin->drawable.pScreen;
@@ -967,7 +962,7 @@ UnmapWindow(register WindowPtr pWin, Bool fromConfigure)
 	return(Success);
     if (SubStrSend(pWin, pParent))
     {
-	memset(&event, 0, sizeof(xEvent));
+	xEvent event = {0};
 	event.u.u.type = UnmapNotify;
 	event.u.unmapNotify.window = pWin->drawable.id;
 	event.u.unmapNotify.fromConfigure = fromConfigure;
-- 
cgit v1.2.3