X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=lib%2Fxmalloc.c;h=4e79aff98ea0c7d6abe8df170de91ada67d96f34;hp=e1ab3140b79e08c5b2c0077deb564afe041b2c2d;hb=87364c16564c897b1a2d306615804d68ea5a9ba1;hpb=8ea23d9ec3f2fe0c113eac5caafb7c2bd03f3016

diff --git a/lib/xmalloc.c b/lib/xmalloc.c
index e1ab3140..4e79aff9 100644
--- a/lib/xmalloc.c
+++ b/lib/xmalloc.c
@@ -11,9 +11,9 @@
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   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., Foundation,
+   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.  */
 
 #if HAVE_CONFIG_H
 # include <config.h>
@@ -22,6 +22,8 @@
 #include <sys/types.h>
 #include <stdio.h>
 #include <string.h>
+#include <stdarg.h>
+#include <errno.h>
 
 #if STDC_HEADERS
 # include <stdlib.h>
@@ -32,15 +34,7 @@ void *realloc ();
 void free ();
 #endif
 
-#if ENABLE_NLS
-# include <libintl.h>
-# define _(Text) gettext (Text)
-#else
-# define textdomain(Domain)
-# define _(Text) Text
-#endif
-#define N_(Text) Text
-
+#include "dropin.h"
 #include "xalloc.h"
 
 #ifndef EXIT_FAILURE
@@ -54,20 +48,12 @@ void *xcalloc (size_t n, size_t s);
 void *xrealloc (void *p, size_t n);
 #endif
 
-#ifndef HAVE_DONE_WORKING_MALLOC_CHECK
-#error you must run the autoconf test for a properly working malloc -- see malloc.m4
-#endif
-
-#ifndef HAVE_DONE_WORKING_REALLOC_CHECK
-#error you must run the autoconf test for a properly working realloc -- see realloc.m4
-#endif
-
 /* Exit value when the requested amount of memory is not available.
    The caller may set it to some other value.  */
 int xalloc_exit_failure = EXIT_FAILURE;
 
 /* FIXME: describe */
-char *const xalloc_msg_memory_exhausted = N_("Memory exhausted");
+char *const xalloc_msg_memory_exhausted = "Memory exhausted";
 
 /* FIXME: describe */
 void (*xalloc_fail_func) (int) = 0;
@@ -154,3 +140,21 @@ xcalloc (n, s)
 }
 
 #endif /* NOT_USED */
+
+int xasprintf(char **strp, const char *fmt, ...) {
+	int result;
+	va_list ap;
+	va_start(ap, fmt);
+	result = xvasprintf(strp, fmt, ap);
+	va_end(ap);
+	return result;
+}
+
+int xvasprintf(char **strp, const char *fmt, va_list ap) {
+	int result = vasprintf(strp, fmt, ap);
+	if(result < 0) {
+		fprintf(stderr, "vasprintf() failed: %s\n", strerror(errno));
+  		exit(xalloc_exit_failure);
+	}
+	return result;
+}