projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Don't use the HAVE_ macros that we used to define.
[gnulib.git]
/
lib
/
vasprintf.c
diff --git
a/lib/vasprintf.c
b/lib/vasprintf.c
index
7c8f212
..
149c292
100644
(file)
--- a/
lib/vasprintf.c
+++ b/
lib/vasprintf.c
@@
-13,7
+13,7
@@
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. */
#ifdef HAVE_CONFIG_H
# include <config.h>
#ifdef HAVE_CONFIG_H
# include <config.h>
@@
-22,6
+22,8
@@
/* Specification. */
#include "vasprintf.h"
/* Specification. */
#include "vasprintf.h"
+#include <stdlib.h>
+
#include "vasnprintf.h"
int
#include "vasnprintf.h"
int
@@
-31,7
+33,10
@@
vasprintf (char **resultp, const char *format, va_list args)
char *result = vasnprintf (NULL, &length, format, args);
if (result == NULL)
return -1;
char *result = vasnprintf (NULL, &length, format, args);
if (result == NULL)
return -1;
+
*resultp = result;
*resultp = result;
- /* Return the number of resulting bytes, excluding the trailing NUL. */
+ /* Return the number of resulting bytes, excluding the trailing NUL.
+ If it wouldn't fit in an 'int', vasnprintf() would have returned NULL
+ and set errno to EOVERFLOW. */
return length;
}
return length;
}