From e021b02022a37bd23b599801026d631f5fd9f48c Mon Sep 17 00:00:00 2001
From: George Hazan <ghazan@miranda.im>
Date: Mon, 16 Jan 2017 18:19:49 +0300
Subject: function prototypes to match headers

---
 src/mir_app/src/netlibhttpproxy.cpp | 19 ++++---------------
 src/mir_app/src/netlibpktrecver.cpp |  3 +--
 2 files changed, 5 insertions(+), 17 deletions(-)

(limited to 'src')

diff --git a/src/mir_app/src/netlibhttpproxy.cpp b/src/mir_app/src/netlibhttpproxy.cpp
index 445193f1bd..47ceabe978 100644
--- a/src/mir_app/src/netlibhttpproxy.cpp
+++ b/src/mir_app/src/netlibhttpproxy.cpp
@@ -223,10 +223,7 @@ int NetlibHttpGatewayPost(NetlibConnection *nlc, const char *buf, int len, int f
 	p->dataBufferLen = len;
 	p->next = NULL;
 
-	/*
-	 * Now check to see where to insert this in our queue
-	 */
-
+	// Now check to see where to insert this in our queue
 	mir_cslock lck(nlc->csHttpSequenceNums);
 	if (nlc->pHttpProxyPacketQueue == NULL)
 		nlc->pHttpProxyPacketQueue = p;
@@ -237,9 +234,6 @@ int NetlibHttpGatewayPost(NetlibConnection *nlc, const char *buf, int len, int f
 		t->next = p;
 	}
 
-	/*
-	 * Gena01 - fake a Send!! tell 'em all is ok. We catch errors in Recv.
-	 */
 	return len;
 }
 
@@ -357,7 +351,7 @@ int NetlibHttpGatewayRecv(NetlibConnection *nlc, char *buf, int len, int flags)
 
 /////////////////////////////////////////////////////////////////////////////////////////
 
-int NetlibInitHttpConnection(NetlibConnection *nlc, NetlibUser *nlu, NETLIBOPENCONNECTION *nloc)
+int NetlibInitHttpConnection(HNETLIBCONN nlc, NetlibUser *nlu, NETLIBOPENCONNECTION *nloc)
 {
 	NETLIBHTTPREQUEST *nlhrReply = NULL;
 	{
@@ -385,9 +379,6 @@ int NetlibInitHttpConnection(NetlibConnection *nlc, NetlibUser *nlu, NETLIBOPENC
 	}
 	Netlib_FreeHttpRequest(nlhrReply);
 
-	/*
-	 * Gena01 - Ok, we should be able to use just POST. Needed for Yahoo, NO GET requests
-	 */
 	if (nlc->nlhpi.szHttpPostUrl == NULL) {
 		SetLastError(ERROR_BAD_FORMAT);
 		return 0;
@@ -404,9 +395,8 @@ int NetlibInitHttpConnection(NetlibConnection *nlc, NetlibUser *nlu, NETLIBOPENC
 
 /////////////////////////////////////////////////////////////////////////////////////////
 
-MIR_APP_DLL(int) Netlib_SetHttpProxyInfo(HANDLE hConnection, const NETLIBHTTPPROXYINFO *nlhpi)
+MIR_APP_DLL(int) Netlib_SetHttpProxyInfo(HNETLIBCONN nlc, const NETLIBHTTPPROXYINFO *nlhpi)
 {
-	NetlibConnection *nlc = (NetlibConnection*)hConnection;
 	if (GetNetlibHandleType(nlc) != NLH_CONNECTION || nlhpi == NULL || nlhpi->szHttpPostUrl == NULL) {
 		SetLastError(ERROR_INVALID_PARAMETER);
 		return 0;
@@ -438,9 +428,8 @@ MIR_APP_DLL(int) Netlib_SetStickyHeaders(HNETLIBUSER nlu, const char *szHeaders)
 
 /////////////////////////////////////////////////////////////////////////////////////////
 
-MIR_APP_DLL(int) Netlib_SetPollingTimeout(HANDLE hConnection, int iTimeout)
+MIR_APP_DLL(int) Netlib_SetPollingTimeout(HNETLIBCONN nlc, int iTimeout)
 {
-	NetlibConnection *nlc = (NetlibConnection*)hConnection;
 	if (GetNetlibHandleType(nlc) != NLH_CONNECTION)
 		return -1;
 	
diff --git a/src/mir_app/src/netlibpktrecver.cpp b/src/mir_app/src/netlibpktrecver.cpp
index c7d90dc058..abf5b91b0d 100644
--- a/src/mir_app/src/netlibpktrecver.cpp
+++ b/src/mir_app/src/netlibpktrecver.cpp
@@ -25,9 +25,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include "stdafx.h"
 #include "netlib.h"
 
-MIR_APP_DLL(HANDLE) Netlib_CreatePacketReceiver(HANDLE hConnection, int iMaxSize)
+MIR_APP_DLL(HANDLE) Netlib_CreatePacketReceiver(HNETLIBCONN nlc, int iMaxSize)
 {
-	NetlibConnection *nlc = (NetlibConnection*)hConnection;
 	if (GetNetlibHandleType(nlc) != NLH_CONNECTION || iMaxSize == 0) {
 		SetLastError(ERROR_INVALID_PARAMETER);
 		return NULL;
-- 
cgit v1.2.3