diff options
author | George Hazan <george.hazan@gmail.com> | 2013-06-04 14:14:01 +0000 |
---|---|---|
committer | George Hazan <george.hazan@gmail.com> | 2013-06-04 14:14:01 +0000 |
commit | dcf04c9a2c3351896897ac22b797e0d6d3e1145f (patch) | |
tree | 4a8f6609ca589eac5896d25aa03220ed3bf9c670 | |
parent | a83f744f5fdb10989a27e7f27522048bc756b61e (diff) |
MS_NETLIB_URLENCODE isn't used anyway, die the annoying clutch
git-svn-id: http://svn.miranda-ng.org/main/trunk@4882 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
-rw-r--r-- | include/delphi/m_netlib.inc | 10 | ||||
-rw-r--r-- | include/m_netlib.h | 9 | ||||
-rw-r--r-- | src/modules/netlib/netlib.cpp | 16 |
3 files changed, 0 insertions, 35 deletions
diff --git a/include/delphi/m_netlib.inc b/include/delphi/m_netlib.inc index 3c86e7517b..e4b2baf949 100644 --- a/include/delphi/m_netlib.inc +++ b/include/delphi/m_netlib.inc @@ -488,16 +488,6 @@ const }
MS_NETLIB_GETSOCKET:PAnsiChar = 'Netlib/GetSocket';
- {
- wParam : 0
- lParam : Pointer to a null terminated string
- Affects: URL-encodes a string for x-www-form-urlencoded (and other uses) -- see notes
- Returns: A pointer to a null terminated string, NULL(0) on failure
- Notes : The returned string must be freed after it's no longer needed using mir_free
- Errors : ERROR_INVALID_PARAMETER, ERROR_OUTOFMEMORY
- }
- MS_NETLIB_URLENCODE:PAnsiChar = 'Netlib/UrlEncode';
-
{
Converts string representation of IP and port into numerical SOCKADDR_INET
IPv4 could supplied in formats address:port or address
diff --git a/include/m_netlib.h b/include/m_netlib.h index c955d14317..8343ee6c33 100644 --- a/include/m_netlib.h +++ b/include/m_netlib.h @@ -380,15 +380,6 @@ typedef struct { //Errors: ERROR_INVALID_PARAMETER
#define MS_NETLIB_GETSOCKET "Netlib/GetSocket"
-//URL-encode a string for x-www-form-urlencoded (and other) transmission
-//wParam = 0
-//lParam = (LPARAM)(const char *)pszString
-//Returns a char* containing the new string. This must be freed with
-//mir_free() when you're done with it.
-//Returns NULL on error.
-//Errors: ERROR_INVALID_PARAMETER, ERROR_OUTOFMEMORY
-#define MS_NETLIB_URLENCODE "Netlib/UrlEncode"
-
#define Netlib_GetBase64DecodedBufferSize(cchEncoded) (((cchEncoded)>>2)*3)
#define Netlib_GetBase64EncodedBufferSize(cbDecoded) (((cbDecoded)*4+11)/12*4+1)
diff --git a/src/modules/netlib/netlib.cpp b/src/modules/netlib/netlib.cpp index b7a3bc3c2d..701c61cb19 100644 --- a/src/modules/netlib/netlib.cpp +++ b/src/modules/netlib/netlib.cpp @@ -409,21 +409,6 @@ INT_PTR NetlibShutdown(WPARAM wParam, LPARAM) return 0;
}
-INT_PTR NetlibHttpUrlEncode(WPARAM, LPARAM lParam)
-{
- if (lParam == NULL) {
- SetLastError(ERROR_INVALID_PARAMETER);
- return NULL;
- }
-
- char *p = mir_urlEncode((LPCSTR)lParam);
- if (p == NULL) {
- SetLastError(ERROR_OUTOFMEMORY);
- return NULL;
- }
- return (INT_PTR)p;
-}
-
void UnloadNetlibModule(void)
{
if ( !bModuleInitialized) return;
@@ -528,7 +513,6 @@ int LoadNetlibModule(void) CreateServiceFunction(MS_NETLIB_SETHTTPPROXYINFO, NetlibHttpGatewaySetInfo);
CreateServiceFunction(MS_NETLIB_SETSTICKYHEADERS, NetlibHttpSetSticky);
CreateServiceFunction(MS_NETLIB_GETSOCKET, NetlibGetSocket);
- CreateServiceFunction(MS_NETLIB_URLENCODE, NetlibHttpUrlEncode);
CreateServiceFunction(MS_NETLIB_SENDHTTPREQUEST, NetlibHttpSendRequest);
CreateServiceFunction(MS_NETLIB_RECVHTTPHEADERS, NetlibHttpRecvHeaders);
CreateServiceFunction(MS_NETLIB_FREEHTTPREQUESTSTRUCT, NetlibHttpFreeRequestStruct);
|