diff options
| author |   djm <djm@openbsd.org> | 2006-04-02 21:38:55 +0000 |
|---|---|---|
| committer | djm <djm@openbsd.org> | 2006-04-02 21:38:55 +0000 |
| commit | ad4287e4204c02b0e79cb4b7bbcb41e8bc21ac49 (patch) | |
| tree | f8d1e648b70424b1586a748392751de1ee7a0269 /lib | |
| parent | some characters are in fact allowed in symbol names, don't freak (diff) | |
| download | wireguard-openbsd-ad4287e4204c02b0e79cb4b7bbcb41e8bc21ac49.tar.xz wireguard-openbsd-ad4287e4204c02b0e79cb4b7bbcb41e8bc21ac49.zip | |
malloc(x * y) -> calloc(x, y) from adobriyan AT gmail.com, with tweaks
suggested by kjell@; ok otto@ pat@ millert@ jaredy@
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/libc/locale/rune.c | 5 | ||||
| -rw-r--r-- | lib/libpcap/optimize.c | 9 | ||||
| -rw-r--r-- | lib/libpthread/uthread/uthread_spec.c | 8 |
3 files changed, 8 insertions, 14 deletions
diff --git a/lib/libc/locale/rune.c b/lib/libc/locale/rune.c index cb0805e08b8..1ccd0871a61 100644 --- a/lib/libc/locale/rune.c +++ b/lib/libc/locale/rune.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rune.c,v 1.1 2005/08/07 10:16:23 espie Exp $ */ +/* $OpenBSD: rune.c,v 1.2 2006/04/02 21:38:57 djm Exp $ */ /* $NetBSD: rune.c,v 1.26 2004/05/09 11:26:33 kleink Exp $ */ /*- @@ -124,12 +124,11 @@ readentry(_RuneRange *rr, FILE *fp) } l = re[i].re_max - re[i].re_min + 1; - re[i].re_rune_types = malloc(l * sizeof(_RuneType)); + re[i].re_rune_types = calloc(l, sizeof(_RuneType)); if (!re[i].re_rune_types) { error = ENOMEM; goto fail; } - memset(re[i].re_rune_types, 0, l * sizeof(_RuneType)); if (fread(re[i].re_rune_types, sizeof(_RuneType), l, fp) != l) goto fail2; diff --git a/lib/libpcap/optimize.c b/lib/libpcap/optimize.c index 48fc0dc6e94..3c5fa1eb795 100644 --- a/lib/libpcap/optimize.c +++ b/lib/libpcap/optimize.c @@ -1,4 +1,4 @@ -/* $OpenBSD: optimize.c,v 1.11 2005/11/19 01:51:11 aaron Exp $ */ +/* $OpenBSD: optimize.c,v 1.12 2006/04/02 21:38:57 djm Exp $ */ /* * Copyright (c) 1988, 1989, 1990, 1991, 1993, 1994, 1995, 1996 @@ -1922,7 +1922,7 @@ convert_code_r(p) /* generate offset[] for convenience */ if (slen) { - offset = (struct slist **)calloc(slen, sizeof(struct slist *)); + offset = calloc(slen, sizeof(struct slist *)); if (!offset) { bpf_error("not enough core"); /*NOTREACHED*/ @@ -2069,11 +2069,10 @@ icode_to_fcode(root, lenp) unMarkAll(); n = *lenp = count_stmts(root); - fp = (struct bpf_insn *)malloc(sizeof(*fp) * n); + fp = calloc(n, sizeof(*fp)); if (fp == NULL) - bpf_error("malloc"); + bpf_error("calloc"); - memset((char *)fp, 0, sizeof(*fp) * n); fstart = fp; ftail = fp + n; diff --git a/lib/libpthread/uthread/uthread_spec.c b/lib/libpthread/uthread/uthread_spec.c index b1fdeb9dfa5..41f66a7e1ac 100644 --- a/lib/libpthread/uthread/uthread_spec.c +++ b/lib/libpthread/uthread/uthread_spec.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uthread_spec.c,v 1.7 2001/08/21 19:24:53 fgsch Exp $ */ +/* $OpenBSD: uthread_spec.c,v 1.8 2006/04/02 21:38:57 djm Exp $ */ /* * Copyright (c) 1995 John Birrell <jb@cimlogic.com.au>. * All rights reserved. @@ -134,11 +134,7 @@ _thread_cleanupspecific(void) static inline const void ** pthread_key_allocate_data(void) { - const void **new_data; - if ((new_data = (const void **) malloc(sizeof(void *) * PTHREAD_KEYS_MAX)) != NULL) { - memset((void *) new_data, 0, sizeof(void *) * PTHREAD_KEYS_MAX); - } - return (new_data); + return calloc(PTHREAD_KEYS_MAX, sizeof(void *)); } int |