projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
maint: change "can not" to "cannot"
[gnulib.git]
/
lib
/
calloc.c
diff --git
a/lib/calloc.c
b/lib/calloc.c
index
554a58d
..
4ac06d2
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 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-2011
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
@@
-20,8
+20,11
@@
#include <config.h>
/* Only the AC_FUNC_CALLOC macro defines 'calloc' already in config.h. */
#ifdef calloc
#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. */
@@
-40,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;
@@
-49,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