aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/lib/X11/LiProps.c
diff options
context:
space:
mode:
authorAlan Coopersmith <alan.coopersmith@oracle.com>2013-03-02 16:56:16 -0800
committerUlrich Sibiller <uli42@gmx.de>2016-10-12 09:34:38 +0200
commit05b72b8da17d6077b085608c128ec9e698473bb6 (patch)
tree937b878302e892ebf9de2464a523cf8ecaf8edea /nx-X11/lib/X11/LiProps.c
parent306ca006a54c5f74a6fe90eb794efa06ff33b259 (diff)
downloadnx-libs-05b72b8da17d6077b085608c128ec9e698473bb6.tar.gz
nx-libs-05b72b8da17d6077b085608c128ec9e698473bb6.tar.bz2
nx-libs-05b72b8da17d6077b085608c128ec9e698473bb6.zip
Convert more _XEatData callers to _XEatDataWords
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> Reviewed-by: Matthieu Herrb <matthieu.herrb@laas.fr> Signed-off-by: Julien Cristau <jcristau@debian.org> Backported-to-NX-by: Ulrich Sibiller <uli42@gmx.de>
Diffstat (limited to 'nx-X11/lib/X11/LiProps.c')
-rw-r--r--nx-X11/lib/X11/LiProps.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/nx-X11/lib/X11/LiProps.c b/nx-X11/lib/X11/LiProps.c
index 72560aba7..d9c746563 100644
--- a/nx-X11/lib/X11/LiProps.c
+++ b/nx-X11/lib/X11/LiProps.c
@@ -34,7 +34,7 @@ Atom *XListProperties(
Window window,
int *n_props) /* RETURN */
{
- long nbytes;
+ unsigned long nbytes;
xListPropertiesReply rep;
Atom *properties;
register xResourceReq *req;
@@ -50,14 +50,14 @@ Atom *XListProperties(
if (rep.nProperties) {
nbytes = rep.nProperties * sizeof(Atom);
- properties = (Atom *) Xmalloc ((unsigned) nbytes);
- nbytes = rep.nProperties << 2;
+ properties = Xmalloc (nbytes);
if (! properties) {
- _XEatData(dpy, (unsigned long) nbytes);
+ _XEatDataWords(dpy, rep.length);
UnlockDisplay(dpy);
SyncHandle();
return (Atom *) NULL;
}
+ nbytes = rep.nProperties << 2;
_XRead32 (dpy, (long *) properties, nbytes);
}
else properties = (Atom *) NULL;