git update 8/7/2010

1 files changed, 69 insertions, 70 deletions

diff --git a/libX11/src/LiProps.c b/libX11/src/LiProps.c
index 344f990d3..52fcb20c6 100644
--- a/libX11/src/LiProps.c
+++ b/libX11/src/LiProps.c
@@ -1,70 +1,69 @@
-/*
-
-Copyright 1986, 1998  The Open Group
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-*/
-
-#define NEED_REPLIES
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-#include "Xlibint.h"
-
-Atom *XListProperties(
-    register Display *dpy,
-    Window window,
-    int *n_props)  /* RETURN */
-{
-    long nbytes;
-    xListPropertiesReply rep;
-    Atom *properties;
-    register xResourceReq *req;
-
-    LockDisplay(dpy);
-    GetResReq(ListProperties, window, req);
-    if (!_XReply(dpy, (xReply *)&rep, 0, xFalse)) {
-	*n_props = 0;
-	UnlockDisplay(dpy);
-        SyncHandle();
-	return ((Atom *) NULL);
-    }
-
-    if (rep.nProperties) {
-	nbytes = rep.nProperties * sizeof(Atom);
-	properties = (Atom *) Xmalloc ((unsigned) nbytes);
-	nbytes = rep.nProperties << 2;
-	if (! properties) {
-	    _XEatData(dpy, (unsigned long) nbytes);
-	    UnlockDisplay(dpy);
-	    SyncHandle();
-	    return (Atom *) NULL;
-	}
-	_XRead32 (dpy, (long *) properties, nbytes);
-    }
-    else properties = (Atom *) NULL;
-
-    *n_props = rep.nProperties;
-    UnlockDisplay(dpy);
-    SyncHandle();
-    return (properties);
-}
+/*

+

+Copyright 1986, 1998  The Open Group

+

+Permission to use, copy, modify, distribute, and sell this software and its

+documentation for any purpose is hereby granted without fee, provided that

+the above copyright notice appear in all copies and that both that

+copyright notice and this permission notice appear in supporting

+documentation.

+

+The above copyright notice and this permission notice shall be included in

+all copies or substantial portions of the Software.

+

+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE

+OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN

+AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN

+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

+

+Except as contained in this notice, the name of The Open Group shall not be

+used in advertising or otherwise to promote the sale, use or other dealings

+in this Software without prior written authorization from The Open Group.

+

+*/

+

+#ifdef HAVE_CONFIG_H

+#include <config.h>

+#endif

+#include "Xlibint.h"

+

+Atom *XListProperties(

+    register Display *dpy,

+    Window window,

+    int *n_props)  /* RETURN */

+{

+    long nbytes;

+    xListPropertiesReply rep;

+    Atom *properties;

+    register xResourceReq *req;

+

+    LockDisplay(dpy);

+    GetResReq(ListProperties, window, req);

+    if (!_XReply(dpy, (xReply *)&rep, 0, xFalse)) {

+	*n_props = 0;

+	UnlockDisplay(dpy);

+        SyncHandle();

+	return ((Atom *) NULL);

+    }

+

+    if (rep.nProperties) {

+	nbytes = rep.nProperties * sizeof(Atom);

+	properties = (Atom *) Xmalloc ((unsigned) nbytes);

+	nbytes = rep.nProperties << 2;

+	if (! properties) {

+	    _XEatData(dpy, (unsigned long) nbytes);

+	    UnlockDisplay(dpy);

+	    SyncHandle();

+	    return (Atom *) NULL;

+	}

+	_XRead32 (dpy, (long *) properties, nbytes);

+    }

+    else properties = (Atom *) NULL;

+

+    *n_props = rep.nProperties;

+    UnlockDisplay(dpy);

+    SyncHandle();

+    return (properties);

+}