From 2c084f9b57f1b1d85d524bc77c6cef70c3e3151e Mon Sep 17 00:00:00 2001
From: Dan Goodliffe <dan@randomdan.homeip.net>
Date: Sun, 25 Dec 2022 11:55:57 +0000
Subject: Update deprecated libcurl usage

---
 libadhocutil/curlHandle.cpp | 12 ++++++------
 libadhocutil/curlHandle.h   |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/libadhocutil/curlHandle.cpp b/libadhocutil/curlHandle.cpp
index d7a91ae..2f375b5 100644
--- a/libadhocutil/curlHandle.cpp
+++ b/libadhocutil/curlHandle.cpp
@@ -24,8 +24,8 @@ namespace AdHoc::Net {
 		if (curl_headers) {
 			curl_slist_free_all(curl_headers);
 		}
-		if (postS) {
-			curl_formfree(postS);
+		if (mime) {
+			curl_mime_free(mime);
 		}
 		curl_easy_cleanup(curl_handle);
 	}
@@ -65,10 +65,10 @@ namespace AdHoc::Net {
 	void
 	CurlHandle::appendPost(const char * name, const char * value)
 	{
-		CURLFORMcode r
-				= curl_formadd(&postS, &postE, CURLFORM_PTRNAME, name, CURLFORM_PTRCONTENTS, value, CURLFORM_END);
-		if (r == 0) {
-			curl_easy_setopt(curl_handle, CURLOPT_HTTPPOST, postS);
+		if (auto part = curl_mime_addpart(mime)) {
+			curl_mime_name(part, name);
+			curl_mime_data(part, value, CURL_ZERO_TERMINATED);
+			curl_easy_setopt(curl_handle, CURLOPT_MIMEPOST, mime);
 		}
 	}
 
diff --git a/libadhocutil/curlHandle.h b/libadhocutil/curlHandle.h
index dd81989..dc6ff23 100644
--- a/libadhocutil/curlHandle.h
+++ b/libadhocutil/curlHandle.h
@@ -53,7 +53,7 @@ namespace AdHoc::Net {
 
 		CURL * curl_handle;
 		curl_slist * curl_headers {nullptr};
-		curl_httppost *postS {nullptr}, *postE {nullptr};
+		curl_mime *mime{nullptr};
 		/// @endcond
 	};
 	using CurlHandlePtr = std::shared_ptr<CurlHandle>;
-- 
cgit v1.2.3