projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Replaced with <unistd.h>.
[gnulib.git]
/
lib
/
calloc.c
diff --git
a/lib/calloc.c
b/lib/calloc.c
index
1ff0f1c
..
c8b1e1e
100644
(file)
--- a/
lib/calloc.c
+++ b/
lib/calloc.c
@@
-1,6
+1,6
@@
/* calloc() function that is glibc compatible.
This wrapper function is required at least on Tru64 UNIX 5.1.
/* calloc() function that is glibc compatible.
This wrapper function is required at least on Tru64 UNIX 5.1.
- Copyright (C) 2004 Free Software Foundation, Inc.
+ Copyright (C) 2004
, 2005, 2006
Free Software Foundation, Inc.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@
-14,13
+14,11
@@
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software Foundation,
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software Foundation,
- Inc., 5
9 Temple Place - Suite 330, Boston, MA 02111-1307
, USA. */
+ Inc., 5
1 Franklin Street, Fifth Floor, Boston, MA 02110-1301
, USA. */
/* written by Jim Meyering */
/* written by Jim Meyering */
-#if HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
#undef calloc
#include <stdlib.h>
#undef calloc
#include <stdlib.h>
@@
-32,10
+30,9
@@
void *
rpl_calloc (size_t n, size_t s)
{
size_t bytes;
rpl_calloc (size_t n, size_t s)
{
size_t bytes;
- if (n == 0)
- n = 1;
- if (s == 0)
- s = 1;
+
+ if (n == 0 || s == 0)
+ return calloc (1, 1);
/* Defend against buggy calloc implementations that mishandle
size_t overflow. */
/* Defend against buggy calloc implementations that mishandle
size_t overflow. */