diff options
author | Adam Jackson <ajax@redhat.com> | 2008-10-06 14:19:30 -0400 |
---|---|---|
committer | Adam Jackson <ajax@redhat.com> | 2008-10-06 14:19:30 -0400 |
commit | 0b7b89fbac0b3865b2cf51295c68a5f4c7523f28 (patch) | |
tree | cf24e95113974c482e0cc1bbb6be19c8b25879e7 /hw/kdrive | |
parent | 9187f6ad9ec7ba9569a93d92561aac17eaa83491 (diff) |
xalloc+bzero -> xcalloc
Diffstat (limited to 'hw/kdrive')
-rw-r--r-- | hw/kdrive/src/kinfo.c | 6 | ||||
-rw-r--r-- | hw/kdrive/src/kinput.c | 4 |
2 files changed, 3 insertions, 7 deletions
diff --git a/hw/kdrive/src/kinfo.c b/hw/kdrive/src/kinfo.c index 2621f10dd..d592e6803 100644 --- a/hw/kdrive/src/kinfo.c +++ b/hw/kdrive/src/kinfo.c @@ -34,10 +34,9 @@ KdCardInfoAdd (KdCardFuncs *funcs, { KdCardInfo *ci, **prev; - ci = (KdCardInfo *) xalloc (sizeof (KdCardInfo)); + ci = xcalloc (1, sizeof (KdCardInfo)); if (!ci) return 0; - bzero (ci, sizeof (KdCardInfo)); for (prev = &kdCardInfo; *prev; prev = &(*prev)->next); *prev = ci; ci->cfuncs = funcs; @@ -80,10 +79,9 @@ KdScreenInfoAdd (KdCardInfo *ci) KdScreenInfo *si, **prev; int n; - si = (KdScreenInfo *) xalloc (sizeof (KdScreenInfo)); + si = xcalloc (1, sizeof (KdScreenInfo)); if (!si) return 0; - bzero (si, sizeof (KdScreenInfo)); for (prev = &ci->screenList, n = 0; *prev; prev = &(*prev)->next, n++); *prev = si; si->next = 0; diff --git a/hw/kdrive/src/kinput.c b/hw/kdrive/src/kinput.c index e200c5493..b44218dcf 100644 --- a/hw/kdrive/src/kinput.c +++ b/hw/kdrive/src/kinput.c @@ -1127,12 +1127,10 @@ KdGetOptions (InputOption **options, char *string) InputOption *newopt = NULL, **tmpo = NULL; int tam_key = 0; - newopt = (InputOption *) xalloc(sizeof (InputOption)); + newopt = xcalloc(1, sizeof (InputOption)); if (!newopt) return FALSE; - bzero(newopt, sizeof (InputOption)); - for (tmpo = options; *tmpo; tmpo = &(*tmpo)->next) ; /* Hello, I'm here */ *tmpo = newopt; |