From 0772f62be798c46ae4234ae348339ba61a741fb1 Mon Sep 17 00:00:00 2001
From: Joshua Colp <jcolp@digium.com>
Date: Wed, 18 Jul 2007 14:59:20 +0000
Subject: [PATCH] Clean up func_curl a bit.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@75586 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---
funcs/func_curl.c | 14 ++++++--------
1 file changed, 6 insertions(+), 8 deletions(-)
diff --git a/funcs/func_curl.c b/funcs/func_curl.c
index b32d5f748e..a33b8db64d 100644
--- a/funcs/func_curl.c
+++ b/funcs/func_curl.c
@@ -60,14 +60,12 @@ struct MemoryStruct {
size_t size;
};
+/* There might be a realloc() out there that doesn't like reallocing
+ * NULL pointers, so we take care of it here
+ */
static void *myrealloc(void *ptr, size_t size)
{
- /* There might be a realloc() out there that doesn't like reallocing
- NULL pointers, so we take care of it here */
- if (ptr)
- return ast_realloc(ptr, size);
- else
- return ast_malloc(size);
+ return (ptr ? ast_realloc(ptr, size) : ast_malloc(size));
}
static size_t WriteMemoryCallback(void *ptr, size_t size, size_t nmemb, void *data)
@@ -75,12 +73,12 @@ static size_t WriteMemoryCallback(void *ptr, size_t size, size_t nmemb, void *da
register int realsize = size * nmemb;
struct MemoryStruct *mem = (struct MemoryStruct *)data;
- mem->memory = (char *)myrealloc(mem->memory, mem->size + realsize + 1);
- if (mem->memory) {
+ if ((mem->memory = (char *)myrealloc(mem->memory, mem->size + realsize + 1))) {
memcpy(&(mem->memory[mem->size]), ptr, realsize);
mem->size += realsize;
mem->memory[mem->size] = 0;
}
+
return realsize;
}
--
GitLab