aboutsummaryrefslogtreecommitdiff
path: root/src/port/asprintf.c
diff options
context:
space:
mode:
authorTom Lane <tgl@sss.pgh.pa.us>2013-10-22 18:42:13 -0400
committerTom Lane <tgl@sss.pgh.pa.us>2013-10-22 18:42:13 -0400
commit09a89cb5fc29b47c26d151e82293fd3bef592b7b (patch)
tree0ac288fac9c8b34730cca74bd90afa06752988ce /src/port/asprintf.c
parent586a8fc75bf266214d635cdcf527176b80f808ea (diff)
downloadpostgresql-09a89cb5fc29b47c26d151e82293fd3bef592b7b.tar.gz
postgresql-09a89cb5fc29b47c26d151e82293fd3bef592b7b.zip
Get rid of use of asprintf() in favor of a more portable implementation.
asprintf(), aside from not being particularly portable, has a fundamentally badly-designed API; the psprintf() function that was added in passing in the previous patch has a much better API choice. Moreover, the NetBSD implementation that was borrowed for the previous patch doesn't work with non-C99-compliant vsnprintf, which is something we still have to cope with on some platforms; and it depends on va_copy which isn't all that portable either. Get rid of that code in favor of an implementation similar to what we've used for many years in stringinfo.c. Also, move it into libpgcommon since it's not really libpgport material. I think this patch will be enough to turn the buildfarm green again, but there's still cosmetic work left to do, namely get rid of pg_asprintf() in favor of using psprintf(). That will come in a followon patch.
Diffstat (limited to 'src/port/asprintf.c')
-rw-r--r--src/port/asprintf.c111
1 files changed, 0 insertions, 111 deletions
diff --git a/src/port/asprintf.c b/src/port/asprintf.c
deleted file mode 100644
index fafc03aa9e3..00000000000
--- a/src/port/asprintf.c
+++ /dev/null
@@ -1,111 +0,0 @@
-/* src/port/asprintf.c */
-
-/* $NetBSD: asprintf.c,v 1.3 2012/07/02 16:02:53 joerg Exp $ */
-
-/*-
- * Copyright (c) 2007 Joerg Sonnenberger <joerg@NetBSD.org>.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in
- * the documentation and/or other materials provided with the
- * distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- * COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY OR CONSEQUENTIAL DAMAGES (INCLUDING,
- * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
- * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
- * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include "c.h"
-
-#define HAVE_VA_COPY 1
-
-int
-asprintf(char **ret, const char *fmt, ...)
-{
- va_list ap;
- int retval;
-
- va_start(ap, fmt);
- retval = vasprintf(ret, fmt, ap);
- va_end(ap);
-
- return retval;
-}
-
-int
-vasprintf(char **ret, const char *fmt, va_list ap)
-{
- char *buf, *new_buf;
- size_t len;
- int retval;
- va_list ap2;
-
- len = 128;
- buf = malloc(len);
- if (buf == NULL) {
- *ret = NULL;
- return -1;
- }
-
-#if defined(HAVE_VA_COPY)
- va_copy(ap2, ap);
-#define my_va_end(ap2) va_end(ap2)
-#elif defined(HAVE___BUILTIN_VA_COPY)
- __builtin_va_copy(ap2, ap);
-#define my_va_end(ap2) __builtin_va_end(ap2)
-#else
- ap2 = ap;
-#define my_va_end(ap2) do {} while (0)
-#endif
- retval = vsnprintf(buf, len, fmt, ap);
- if (retval < 0) {
- free(buf);
- *ret = NULL;
- va_end(ap2);
- return -1;
- }
-
- if (retval < len) {
- new_buf = realloc(buf, retval + 1);
- if (new_buf == NULL)
- *ret = buf;
- else
- *ret = new_buf;
- my_va_end(ap2);
- return retval;
- }
-
- len = (size_t)retval + 1;
- free(buf);
- buf = malloc(len);
- if (buf == NULL) {
- *ret = NULL;
- my_va_end(ap2);
- return -1;
- }
- retval = vsnprintf(buf, len, fmt, ap2);
- my_va_end(ap2);
- if (retval != len - 1) {
- free(buf);
- *ret = NULL;
- return -1;
- }
- *ret = buf;
- return retval;
-}