aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--desiredata/src/desire.h4
-rw-r--r--desiredata/src/kernel.c14
2 files changed, 6 insertions, 12 deletions
diff --git a/desiredata/src/desire.h b/desiredata/src/desire.h
index 8dc4cac4..cbe28e4c 100644
--- a/desiredata/src/desire.h
+++ b/desiredata/src/desire.h
@@ -54,11 +54,11 @@ extern "C" {
/* ----------------------- (v)asprintf missing on mingw... ---------------------------------------------------*/
#ifndef HAVE_VASPRINTF
-extern int vasprintf(char **str, const char *fmt, va_list ap);
+extern int vasprintf(char **str, const char *fmt, va_list ap) throw ();
#endif
#ifndef HAVE_ASPRINTF
-extern int asprintf(char **str, const char *fmt, ...);
+extern int asprintf(char **str, const char *fmt, ...) throw ();
#endif
/* ----------------------- m_imp.h ---------------------------------------------------*/
diff --git a/desiredata/src/kernel.c b/desiredata/src/kernel.c
index 19e5b223..88a1b403 100644
--- a/desiredata/src/kernel.c
+++ b/desiredata/src/kernel.c
@@ -2350,15 +2350,13 @@ void pd_init() {
#ifndef HAVE_ASPRINTF
#define HAVE_ASPRINTF
-int asprintf(char **str, const char *fmt, ...)
-{
+int asprintf(char **str, const char *fmt, ...) throw () {
va_list ap;
int ret;
*str = NULL;
va_start(ap, fmt);
ret = vasprintf(str, fmt, ap);
va_end(ap);
-
return ret;
}
#endif /* HAVE_ASPRINTF */
@@ -2384,17 +2382,14 @@ int asprintf(char **str, const char *fmt, ...)
#define INIT_SZ 128
-int vasprintf(char **str, const char *fmt, va_list ap)
-{
+int vasprintf(char **str, const char *fmt, va_list ap) throw () {
int ret = -1;
va_list ap2;
char *string, *newstr;
size_t len;
-
VA_COPY(ap2, ap);
if ((string = (char *)malloc(INIT_SZ)) == NULL)
goto fail;
-
ret = vsnprintf(string, INIT_SZ, fmt, ap2);
if (ret >= 0 && ret < INIT_SZ) { /* succeeded with initial alloc */
*str = string;
@@ -2418,12 +2413,11 @@ int vasprintf(char **str, const char *fmt, va_list ap)
}
}
va_end(ap2);
- return (ret);
-
+ return ret;
fail:
*str = NULL;
errno = ENOMEM;
va_end(ap2);
- return (-1);
+ return -1;
}
#endif /* HAVE_VASPRINTF */