projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
md5, sha1, sha256, sha512: add gl_SET_CRYPTO_CHECK_DEFAULT
[gnulib.git]
/
lib
/
calloc.c
diff --git
a/lib/calloc.c
b/lib/calloc.c
index
72045db
..
475d0ae
100644
(file)
--- a/
lib/calloc.c
+++ b/
lib/calloc.c
@@
-1,11
+1,11
@@
/* calloc() function that is glibc compatible.
This wrapper function is required at least on Tru64 UNIX 5.1 and mingw.
/* calloc() function that is glibc compatible.
This wrapper function is required at least on Tru64 UNIX 5.1 and mingw.
- Copyright (C) 2004
, 2005, 2006, 2007
Free Software Foundation, Inc.
+ Copyright (C) 2004
-2007, 2009-2013
Free Software Foundation, Inc.
- This program is free software
;
you can redistribute it and/or modify
+ 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
it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version
2, or (at your option)
- any later version.
+ the Free Software Foundation; either version
3 of the License, or
+
(at your option)
any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
@@
-13,16
+13,18
@@
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
GNU General Public License for more details.
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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
+ along with this program. If not, see <http://www.gnu.org/licenses/>. */
/* written by Jim Meyering and Bruno Haible */
#include <config.h>
/* Only the AC_FUNC_CALLOC macro defines 'calloc' already in config.h. */
#ifdef calloc
/* written by Jim Meyering and Bruno Haible */
#include <config.h>
/* Only the AC_FUNC_CALLOC macro defines 'calloc' already in config.h. */
#ifdef calloc
-# define NEED_CALLOC_GNU
+# define NEED_CALLOC_GNU
1
# undef calloc
# undef calloc
+/* Whereas the gnulib module 'calloc-gnu' defines HAVE_CALLOC_GNU. */
+#elif GNULIB_CALLOC_GNU && !HAVE_CALLOC_GNU
+# define NEED_CALLOC_GNU 1
#endif
/* Specification. */
#endif
/* Specification. */
@@
-41,7
+43,7
@@
rpl_calloc (size_t n, size_t s)
{
void *result;
{
void *result;
-#if
def
NEED_CALLOC_GNU
+#if NEED_CALLOC_GNU
if (n == 0 || s == 0)
{
n = 1;
if (n == 0 || s == 0)
{
n = 1;
@@
-50,13
+52,13
@@
rpl_calloc (size_t n, size_t s)
else
{
/* Defend against buggy calloc implementations that mishandle
else
{
/* Defend against buggy calloc implementations that mishandle
- size_t overflow. */
+
size_t overflow. */
size_t bytes = n * s;
if (bytes / s != n)
size_t bytes = n * s;
if (bytes / s != n)
- {
- errno = ENOMEM;
- return NULL;
- }
+
{
+
errno = ENOMEM;
+
return NULL;
+
}
}
#endif
}
#endif