From eb4abe4c55b2ff55c0a252f6f87f28d16be144d0 Mon Sep 17 00:00:00 2001 From: Ulrich Sibiller Date: Sat, 22 Jul 2017 15:58:08 +0200 Subject: Keyboard.c: Use calloc instead of malloc + memset --- nx-X11/programs/Xserver/hw/nxagent/Keyboard.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/nx-X11/programs/Xserver/hw/nxagent/Keyboard.c b/nx-X11/programs/Xserver/hw/nxagent/Keyboard.c index 22cf1b44d..1d3c94189 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Keyboard.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Keyboard.c @@ -1337,11 +1337,7 @@ int nxagentResetKeyboard(void) savedBellPercent, savedBellPitch, savedBellDuration); #endif - if (devBackup = malloc(sizeof(DeviceIntRec))) - { - memset(devBackup, 0, sizeof(DeviceIntRec)); - } - else + if (!(devBackup = calloc(1, sizeof(DeviceIntRec)))) { #ifdef PANIC fprintf(stderr, "nxagentResetKeyboard: PANIC! Can't allocate backup structure.\n"); -- cgit v1.2.3