aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/lib/X11/KeyBind.c
diff options
context:
space:
mode:
authorAlan Coopersmith <alan.coopersmith@oracle.com>2013-03-07 23:46:05 -0800
committerUlrich Sibiller <uli42@gmx.de>2016-10-19 21:40:27 +0200
commite15023b2ad2a5ca8742cbb93fe10cb38ab079831 (patch)
treeac6b9de01f8f71b15392cc5216e53220da288e75 /nx-X11/lib/X11/KeyBind.c
parent47d0ea1ba5bdd53d5df2cd06ffb637c889cf5e03 (diff)
downloadnx-libs-e15023b2ad2a5ca8742cbb93fe10cb38ab079831.tar.gz
nx-libs-e15023b2ad2a5ca8742cbb93fe10cb38ab079831.tar.bz2
nx-libs-e15023b2ad2a5ca8742cbb93fe10cb38ab079831.zip
Remove more unnecessary casts from Xmalloc/calloc calls
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> Backported-to-NX-by: Ulrich Sibiller <uli42@gmx.de>
Diffstat (limited to 'nx-X11/lib/X11/KeyBind.c')
-rw-r--r--nx-X11/lib/X11/KeyBind.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/nx-X11/lib/X11/KeyBind.c b/nx-X11/lib/X11/KeyBind.c
index d473f907c..e29aeddc0 100644
--- a/nx-X11/lib/X11/KeyBind.c
+++ b/nx-X11/lib/X11/KeyBind.c
@@ -997,11 +997,9 @@ XRebindKeysym (
tmp = dpy->key_bindings;
nb = sizeof(KeySym) * nm;
- if ((! (p = (struct _XKeytrans *) Xcalloc( 1, sizeof(struct _XKeytrans)))) ||
- ((! (p->string = (char *) Xmalloc( (unsigned) nbytes))) &&
- (nbytes > 0)) ||
- ((! (p->modifiers = (KeySym *) Xmalloc( (unsigned) nb))) &&
- (nb > 0))) {
+ if ((! (p = Xcalloc( 1, sizeof(struct _XKeytrans)))) ||
+ ((! (p->string = Xmalloc(nbytes))) && (nbytes > 0)) ||
+ ((! (p->modifiers = Xmalloc(nb))) && (nb > 0))) {
if (p) {
if (p->string) Xfree(p->string);
if (p->modifiers) Xfree((char *) p->modifiers);