From e63471b9885d040b9e6db3255432f6cea36144e9 Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Thu, 4 Jan 2024 11:50:17 +0300
Subject: Netlib: more old/unused stuff removed

---
 protocols/Facebook/src/avatars.cpp  | 4 +---
 protocols/JabberG/src/jabber_ft.cpp | 5 +----
 protocols/WhatsApp/src/avatars.cpp  | 3 +--
 3 files changed, 3 insertions(+), 9 deletions(-)

(limited to 'protocols')

diff --git a/protocols/Facebook/src/avatars.cpp b/protocols/Facebook/src/avatars.cpp
index 3f514fca9a..6759d20468 100644
--- a/protocols/Facebook/src/avatars.cpp
+++ b/protocols/Facebook/src/avatars.cpp
@@ -52,7 +52,7 @@ void __cdecl FacebookProto::AvatarsUpdate(void *)
 		CMStringA szUrl(FORMAT, "https://graph.facebook.com/%s/picture?%s", getMStringA(cc, DBKEY_ID).c_str(), szParams.c_str());
 		req.szUrl = szUrl.GetBuffer();
 	
-		NETLIBHTTPREQUEST *pReply = Netlib_HttpTransaction(m_hNetlibUser, &req);
+		NLHR_PTR pReply(Netlib_HttpTransaction(m_hNetlibUser, &req));
 		if (pReply == nullptr) {
 			debugLogA("Failed to retrieve avatar from url: %s", szUrl.c_str());
 			continue;
@@ -82,8 +82,6 @@ void __cdecl FacebookProto::AvatarsUpdate(void *)
 		else debugLogA("Error %d reading avatar from url: %s", pReply->resultCode, szUrl.c_str());
 
 		ProtoBroadcastAck(cc, ACKTYPE_AVATAR, bSuccess ? ACKRESULT_SUCCESS : ACKRESULT_FAILED, &ai);
-
-		Netlib_FreeHttpRequest(pReply);
 	}
 }
 
diff --git a/protocols/JabberG/src/jabber_ft.cpp b/protocols/JabberG/src/jabber_ft.cpp
index e0ede298da..9ca292ca71 100644
--- a/protocols/JabberG/src/jabber_ft.cpp
+++ b/protocols/JabberG/src/jabber_ft.cpp
@@ -756,7 +756,7 @@ LBL_Fail:
 	}
 	_close(fileId);
 
-	NETLIBHTTPREQUEST *res = Netlib_HttpTransaction(m_hNetlibUser, &nlhr);
+	NLHR_PTR res(Netlib_HttpTransaction(m_hNetlibUser, &nlhr));
 	if (res == nullptr) {
 		debugLogA("error uploading file %S", pwszFileName);
 		goto LBL_Fail;
@@ -769,12 +769,9 @@ LBL_Fail:
 
 	default:
 		debugLogA("error uploading file %S: error %d", pwszFileName, res->resultCode);
-		Netlib_FreeHttpRequest(res);
 		goto LBL_Fail;
 	}
 
-	Netlib_FreeHttpRequest(res);
-
 	// this parameter is optional, if not specified we simply use upload URL
 	CMStringA szMessage;
 	if (auto *szGetUrl = version ? XmlGetChildText(slotNode, "get") : XmlGetAttr(XmlFirstChild(slotNode, "get"), "url"))
diff --git a/protocols/WhatsApp/src/avatars.cpp b/protocols/WhatsApp/src/avatars.cpp
index 39e521eff3..9bb7e926aa 100644
--- a/protocols/WhatsApp/src/avatars.cpp
+++ b/protocols/WhatsApp/src/avatars.cpp
@@ -136,7 +136,7 @@ bool CMPlugin::SaveFile(const char *pszUrl, PROTO_AVATAR_INFORMATION &ai)
 	req.szUrl = (char*)pszUrl;
 	req.nlc = hAvatarConn;
 
-	NETLIBHTTPREQUEST *pReply = Netlib_HttpTransaction(hAvatarUser, &req);
+	NLHR_PTR pReply(Netlib_HttpTransaction(hAvatarUser, &req));
 	if (pReply == nullptr) {
 		hAvatarConn = nullptr;
 		debugLogA("Failed to retrieve avatar from url: %s", pszUrl);
@@ -163,6 +163,5 @@ bool CMPlugin::SaveFile(const char *pszUrl, PROTO_AVATAR_INFORMATION &ai)
 	}
 	else debugLogA("Error %d reading avatar from url: %s", pReply->resultCode, pszUrl);
 
-	Netlib_FreeHttpRequest(pReply);
 	return bSuccess;
 }
-- 
cgit v1.2.3