Keyboard.c: Use calloc instead of malloc + memset

eb4abe4c · Ulrich Sibiller · Mike Gabriel · 5c4a001a · eb4abe4c
Commit eb4abe4c authored Jul 22, 2017 by Ulrich Sibiller Committed by Mike Gabriel Dec 14, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 5 deletions

Keyboard.c nx-X11/programs/Xserver/hw/nxagent/Keyboard.c +1 -5

No files found.
--- 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");