From: Bastian Dehn <hhaalo@arcor.de>
Date: Sun, 2 Feb 2025 16:48:18 +0000 (+0100)
Subject: Revert "change only custom strdup callback"
X-Git-Tag: v1.0.30^2~3
X-Git-Url: https://gitweb.hhaalo.de/?a=commitdiff_plain;h=df55461f1086012d451e1fda8d615295abec91b4;p=sane-kds-s2000w-net.git

Revert "change only custom strdup callback"

This reverts commit 3513b4b432295757070e992fa361190564707fe6.
---

diff --git a/src/kds_s2000w_client.c b/src/kds_s2000w_client.c
index 164437d..799b740 100644
--- a/src/kds_s2000w_client.c
+++ b/src/kds_s2000w_client.c
@@ -26,6 +26,18 @@ CURL* curl = NULL;
 program_config* config = NULL;
 char* errbuf = NULL;
 
+void *_kds_s2000w_client_malloc_cb(size_t size)
+{
+	return malloc(size);
+}
+void _kds_s2000w_client_free_cb(void * ptr)
+{
+	free(ptr);
+}
+void *_kds_s2000w_client_realloc_cb(void * ptr, size_t size)
+{
+	return realloc(ptr, size);
+}
 char *_kds_s2000w_client_strdup_cb(const char * str)
 {
 	if (strlen(str) == 0) {
@@ -34,6 +46,10 @@ char *_kds_s2000w_client_strdup_cb(const char * str)
 
 	return strdup(str);
 }
+void *_kds_s2000w_client_calloc_cb(size_t nmemb, size_t size)
+{
+	return calloc(nmemb, size);
+}
 
 void _kds_s2000w_client_print_error_status(CURL* curl)
 {
@@ -77,11 +93,11 @@ void kds_s2000w_client_init()
 	char* config_stream = kds_s2000w_config_read(CONFIG_FILE);
 	config = kds_s2000w_load_config(config_stream);
 	curl_global_init_mem(CURL_GLOBAL_DEFAULT,
-		malloc,
-		free,
-		realloc,
+		_kds_s2000w_client_malloc_cb,
+		_kds_s2000w_client_free_cb,
+		_kds_s2000w_client_realloc_cb,
 		_kds_s2000w_client_strdup_cb,
-		calloc);
+		_kds_s2000w_client_calloc_cb);
 	curl = curl_easy_init();
 	errbuf = malloc(CURL_ERROR_SIZE);
 	memset(errbuf, 0, CURL_ERROR_SIZE);