From 496bae429aa29bf7a32e622789298a2ba38f9938 Mon Sep 17 00:00:00 2001 From: Michael Jerris Date: Sat, 24 Mar 2007 19:54:38 +0000 Subject: [PATCH] a bit cleaner. git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@4763 d0543943-73ff-0310-b7d9-9358b9ac24b2 --- src/switch_apr.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/src/switch_apr.c b/src/switch_apr.c index 2844cb31c3..2f2c650ff8 100644 --- a/src/switch_apr.c +++ b/src/switch_apr.c @@ -618,17 +618,15 @@ SWITCH_DECLARE(int) switch_vasprintf(char **ret, const char *fmt, va_list ap) size_t buflen; len = vsnprintf(NULL, 0, fmt, ap); - if (len > 0) { - buflen = (size_t)(len + 1); - if ((buf = malloc(buflen)) == NULL) { - *ret = NULL; - return -1; - } + + if (len > 0 && (buf = malloc((buflen = (size_t)(len + 1)))) != NULL) { len = vsnprintf(buf, buflen, fmt, ap); *ret = buf; } else { *ret = NULL; + len = -1; } + return len; #endif