diff options
| author | Alexandr Shadchin <alexandr.shadchin@gmail.com> | 2011-01-08 17:09:38 +0500 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2011-01-10 10:02:34 +1000 |
| commit | 78652023a9f7758635e5507255826d79fbb2b028 (patch) | |
| tree | db6e6207c1760057a1b3d888b1e0568d531521cf | |
| parent | f7a81ab4225e14a50e26a49a0a17a2cf773a4ab1 (diff) | |
| download | xorg-driver-xf86-input-keyboard-78652023a9f7758635e5507255826d79fbb2b028.tar.gz | |
bsd: Replace deprecated xfree/xcalloc with free & calloc
Signed-off-by: Alexandr Shadchin <Alexandr.Shadchin@gmail.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
| -rw-r--r-- | src/bsd_kbd.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/bsd_kbd.c b/src/bsd_kbd.c index ebaeae5..127b6ab 100644 --- a/src/bsd_kbd.c +++ b/src/bsd_kbd.c @@ -354,11 +354,11 @@ OpenKeyboard(InputInfoPtr pInfo) #endif default: xf86Msg(X_ERROR,"\"%s\" is not a valid keyboard protocol name\n", s); - xfree(s); + free(s); return FALSE; } xf86Msg(X_CONFIG, "%s: Protocol: %s\n", pInfo->name, s); - xfree(s); + free(s); s = xf86SetStrOption(pInfo->options, "Device", NULL); if (s == NULL) { @@ -375,12 +375,12 @@ OpenKeyboard(InputInfoPtr pInfo) pInfo->fd = open(s, O_RDONLY | O_NONBLOCK | O_EXCL); if (pInfo->fd == -1) { xf86Msg(X_ERROR, "%s: cannot open \"%s\"\n", pInfo->name, s); - xfree(s); + free(s); return FALSE; } pKbd->isConsole = FALSE; pKbd->consType = xf86Info.consType; - xfree(s); + free(s); } #ifdef WSCONS_SUPPORT @@ -445,8 +445,8 @@ xf86OSKbdPreInit(InputInfoPtr pInfo) pKbd->OpenKeyboard = OpenKeyboard; pKbd->CustomKeycodes = FALSE; - - pKbd->private = xcalloc(sizeof(BsdKbdPrivRec), 1); + + pKbd->private = calloc(sizeof(BsdKbdPrivRec), 1); if (pKbd->private == NULL) { xf86Msg(X_ERROR,"can't allocate keyboard OS private data\n"); return FALSE; |