diff options
| author | jdolecek <jdolecek@NetBSD.org> | 2002-07-31 12:57:36 +0000 |
|---|---|---|
| committer | jdolecek <jdolecek@NetBSD.org> | 2002-07-31 12:57:36 +0000 |
| commit | 06a4a821343855697bacd603424e4fc55c8bfedc (patch) | |
| tree | 5df374b6fa639630316d89086e612e26a23df969 /lib/libc/stdlib | |
| parent | c8c81b4a576e326b297aa2af5a5ad6073b376b3e (diff) | |
restore the previous form of the condition checking malloc() return value, which
was changed in previous revision
Diffstat (limited to 'lib/libc/stdlib')
| -rw-r--r-- | lib/libc/stdlib/calloc.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/lib/libc/stdlib/calloc.c b/lib/libc/stdlib/calloc.c index b071c4d0d1d..cd31d49a57b 100644 --- a/lib/libc/stdlib/calloc.c +++ b/lib/libc/stdlib/calloc.c @@ -1,4 +1,4 @@ -/* $NetBSD: calloc.c,v 1.11 2002/07/31 09:26:49 itojun Exp $ */ +/* $NetBSD: calloc.c,v 1.12 2002/07/31 12:57:36 jdolecek Exp $ */ /*- * Copyright (c) 1990, 1993 @@ -38,7 +38,7 @@ #if 0 static char sccsid[] = "@(#)calloc.c 8.1 (Berkeley) 6/4/93"; #else -__RCSID("$NetBSD: calloc.c,v 1.11 2002/07/31 09:26:49 itojun Exp $"); +__RCSID("$NetBSD: calloc.c,v 1.12 2002/07/31 12:57:36 jdolecek Exp $"); #endif #endif /* LIBC_SCCS and not lint */ @@ -59,8 +59,7 @@ calloc(num, size) return NULL; } size *= num; - p = malloc(size); - if (p) - memset(p, 0, size); + if ((p = malloc(size)) != NULL) + memset(p, '\0', size); return(p); } |
