From c539e0ca5c9d23567e7cd9a60a375f73ee4166d7 Mon Sep 17 00:00:00 2001
From: Ulrich Sibiller <uli42@gmx.de>
Date: Sun, 30 Jun 2019 15:55:26 +0200
Subject: NXproperty.c: reformat GetWindowProperty to increase readability

---
 nx-X11/programs/Xserver/hw/nxagent/NXproperty.c | 47 +++++++++++++------------
 1 file changed, 24 insertions(+), 23 deletions(-)

diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXproperty.c b/nx-X11/programs/Xserver/hw/nxagent/NXproperty.c
index 9d8a46c4f..a0c355b41 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/NXproperty.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/NXproperty.c
@@ -549,14 +549,17 @@ ProcGetProperty(ClientPtr client)
 
 #ifdef NXAGENT_CLIPBOARD
 /* GetWindowProperty clipboard use only */
+/* FIXME: that's wrong, it is also called in Window.c and Events. */
+/* FIXME: should be moved to a different file, is not derived from
+   dix */
 int
 GetWindowProperty(pWin, property, longOffset, longLength, delete,
             type, actualType, format, nItems, bytesAfter, propData )
     WindowPtr	        pWin;
     Atom		property;
-    long			longOffset;
-    long			longLength;
-    Bool			delete;
+    long		longOffset;
+    long		longLength;
+    Bool		delete;
     Atom		type;
     Atom		*actualType;
     int			*format;
@@ -569,24 +572,24 @@ GetWindowProperty(pWin, property, longOffset, longLength, delete,
 
     if (!pWin)
     {
-#ifdef DEBUG
+        #ifdef DEBUG
 	fprintf(stderr, "%s: invalid window\n", __func__);
-#endif
+        #endif
 	return BadWindow;
     }
 
     if (!ValidAtom(property))
     {
-#ifdef DEBUG
+        #ifdef DEBUG
 	fprintf(stderr, "%s: invalid atom [%d]\n", __func__, property);
-#endif
+        #endif
 	return(BadAtom);
     }
     if ((type != AnyPropertyType) && !ValidAtom(type))
     {
-#ifdef DEBUG
+        #ifdef DEBUG
 	fprintf(stderr, "%s: invalid type [%d]\n", __func__, type);
-#endif
+        #endif
 	return(BadAtom);
     }
 
@@ -604,14 +607,14 @@ GetWindowProperty(pWin, property, longOffset, longLength, delete,
 
     if (!pProp)
     {
-#ifdef DEBUG
+        #ifdef DEBUG
 	fprintf(stderr, "%s: property not found [%d]\n", __func__, property);
-#endif
+        #endif
 	return (BadAtom);
     }
 
     /* If the request type and actual type don't match. Return the
-    property information, but not the data. */
+       property information, but not the data. */
 
     if (((type != pProp->type) &&
 	 (type != AnyPropertyType))
@@ -624,20 +627,20 @@ GetWindowProperty(pWin, property, longOffset, longLength, delete,
 	return(Success);
     }
 
-/*
- *  Return type, format, value to client
- */
+    /*
+     *  Return type, format, value to client
+     */
     n = (pProp->format/8) * pProp->size; /* size (bytes) of prop */
     ind = longOffset << 2;
 
-   /* If longOffset is invalid such that it causes "len" to
-	    be negative, it's a value error. */
+    /* If longOffset is invalid such that it causes "len" to
+       be negative, it's a value error. */
 
     if (n < ind)
     {
-#ifdef DEBUG
+        #ifdef DEBUG
 	fprintf(stderr, "%s: negative property len\n", __func__);
-#endif
+        #endif
 	return BadValue;
     }
 
@@ -650,9 +653,7 @@ GetWindowProperty(pWin, property, longOffset, longLength, delete,
 
     if (delete && (*bytesAfter == 0))
     { /* send the event */
-	xEvent event;
-
-	memset(&event, 0, sizeof(xEvent));
+	xEvent event = {0};
 	event.u.u.type = PropertyNotify;
 	event.u.property.window = pWin->drawable.id;
 	event.u.property.state = PropertyDelete;
@@ -663,7 +664,7 @@ GetWindowProperty(pWin, property, longOffset, longLength, delete,
 
     if (len)
     {
-	 *propData = (unsigned char *)(pProp->data) + ind;
+	*propData = (unsigned char *)(pProp->data) + ind;
     }
 
     if (delete && (*bytesAfter == 0))
-- 
cgit v1.2.3