From 2b6d50f7fdfaca84c3ee82909800ad67d2e99bdc Mon Sep 17 00:00:00 2001 From: George Hazan Date: Thu, 4 Jan 2024 11:24:49 +0300 Subject: NETLIBHTTPREQUEST::cbSize = old unused field removed --- plugins/HTTPServer/src/GuiElements.cpp | 1 - plugins/MirLua/src/Modules/m_http.cpp | 2 -- plugins/PackUpdater/Src/Utils.cpp | 1 - plugins/PasteIt/src/PasteToWeb.cpp | 4 ++-- plugins/PluginUpdater/src/Utils.cpp | 1 - plugins/SendScreenshotPlus/src/CSend.cpp | 1 - plugins/SmileyAdd/src/download.cpp | 1 - plugins/Utils.pas/mirutils.pas | 3 --- plugins/Watrack/myshows/i_cookies.inc | 1 - 9 files changed, 2 insertions(+), 13 deletions(-) (limited to 'plugins') diff --git a/plugins/HTTPServer/src/GuiElements.cpp b/plugins/HTTPServer/src/GuiElements.cpp index 963a1cd223..329258e1b9 100644 --- a/plugins/HTTPServer/src/GuiElements.cpp +++ b/plugins/HTTPServer/src/GuiElements.cpp @@ -143,7 +143,6 @@ unsigned long GetExternIP(const char *szURL, const char *szPattern) NETLIBHTTPREQUEST nlhr; memset(&nlhr, 0, sizeof(nlhr)); - nlhr.cbSize = sizeof(nlhr); nlhr.requestType = REQUEST_GET; nlhr.flags = NLHRF_DUMPASTEXT; nlhr.szUrl = (char*)szURL; diff --git a/plugins/MirLua/src/Modules/m_http.cpp b/plugins/MirLua/src/Modules/m_http.cpp index a3c501c44e..7526b29612 100644 --- a/plugins/MirLua/src/Modules/m_http.cpp +++ b/plugins/MirLua/src/Modules/m_http.cpp @@ -5,7 +5,6 @@ static NETLIBHTTPREQUEST* CreateRequest() { NETLIBHTTPREQUEST *request = (NETLIBHTTPREQUEST*)mir_calloc(sizeof(NETLIBHTTPREQUEST)); - request->cbSize = sizeof(NETLIBHTTPREQUEST); request->flags = NLHRF_HTTP11 | NLHRF_NODUMP; return request; } @@ -403,7 +402,6 @@ static int request_Send(lua_State *L) NETLIBHTTPREQUEST *request = *(NETLIBHTTPREQUEST**)luaL_checkudata(L, 1, MT_NETLIBHTTPREQUEST); NETLIBHTTPREQUEST *newRequest = (NETLIBHTTPREQUEST*)mir_calloc(sizeof(NETLIBHTTPREQUEST)); - newRequest->cbSize = sizeof(NETLIBHTTPREQUEST); newRequest->flags = request->flags; newRequest->requestType = request->requestType; newRequest->szUrl = mir_strdup(request->szUrl); diff --git a/plugins/PackUpdater/Src/Utils.cpp b/plugins/PackUpdater/Src/Utils.cpp index 57a1c7db82..1c24905cac 100644 --- a/plugins/PackUpdater/Src/Utils.cpp +++ b/plugins/PackUpdater/Src/Utils.cpp @@ -108,7 +108,6 @@ void LoadOptions() BOOL DownloadFile(LPCTSTR tszURL, LPCTSTR tszLocal) { NETLIBHTTPREQUEST nlhr = { 0 }; - nlhr.cbSize = sizeof(nlhr); nlhr.requestType = REQUEST_GET; nlhr.flags = NLHRF_REDIRECT | NLHRF_DUMPASTEXT | NLHRF_HTTP11; char* szUrl = mir_u2a(tszURL); diff --git a/plugins/PasteIt/src/PasteToWeb.cpp b/plugins/PasteIt/src/PasteToWeb.cpp index a350ca3bbb..9d1ad7ac5f 100644 --- a/plugins/PasteIt/src/PasteToWeb.cpp +++ b/plugins/PasteIt/src/PasteToWeb.cpp @@ -431,9 +431,9 @@ char *PasteToWeb::SendToWeb(char *url, std::map &heade ++nHeaders; } - NETLIBHTTPREQUEST nlhr = { 0 }; NETLIBHTTPHEADER *httpHeaders = new NETLIBHTTPHEADER[nHeaders]; - nlhr.cbSize = sizeof(nlhr); + + NETLIBHTTPREQUEST nlhr = { 0 }; nlhr.requestType = REQUEST_POST; nlhr.flags = NLHRF_NODUMPSEND | NLHRF_DUMPASTEXT | NLHPIF_HTTP11; nlhr.szUrl = url; diff --git a/plugins/PluginUpdater/src/Utils.cpp b/plugins/PluginUpdater/src/Utils.cpp index b4c7afb6f9..9a30007c66 100644 --- a/plugins/PluginUpdater/src/Utils.cpp +++ b/plugins/PluginUpdater/src/Utils.cpp @@ -153,7 +153,6 @@ int DownloadFile(FILEURL *pFileURL, HNETLIBCONN &nlc) ptrA szUrl(mir_u2a(pFileURL->wszDownloadURL)); NETLIBHTTPREQUEST nlhr = {}; - nlhr.cbSize = sizeof(nlhr); nlhr.flags = NLHRF_DUMPASTEXT | NLHRF_HTTP11 | NLHRF_PERSISTENT; nlhr.requestType = REQUEST_GET; nlhr.nlc = nlc; diff --git a/plugins/SendScreenshotPlus/src/CSend.cpp b/plugins/SendScreenshotPlus/src/CSend.cpp index 378bb0ac6c..9290e8d923 100644 --- a/plugins/SendScreenshotPlus/src/CSend.cpp +++ b/plugins/SendScreenshotPlus/src/CSend.cpp @@ -465,7 +465,6 @@ int CSend::HTTPFormCreate(NETLIBHTTPREQUEST* nlhr, int requestType, const char* boundary[9 + i * 2] = (chcode < 0x0a ? '0' : 'a' - 0x0a) + chcode; } } - nlhr->cbSize = sizeof(NETLIBHTTPREQUEST); nlhr->requestType = requestType; nlhr->flags = NLHRF_HTTP11; if (!strncmp(url, "https://", 8)) nlhr->flags |= NLHRF_SSL; diff --git a/plugins/SmileyAdd/src/download.cpp b/plugins/SmileyAdd/src/download.cpp index 4235e312b2..ef0e4a0682 100644 --- a/plugins/SmileyAdd/src/download.cpp +++ b/plugins/SmileyAdd/src/download.cpp @@ -46,7 +46,6 @@ bool InternetDownloadFile(const char *szUrl, char *szDest, HNETLIBCONN &hHttpDwn NETLIBHTTPREQUEST nlhr = {}; // initialize the netlib request - nlhr.cbSize = sizeof(nlhr); nlhr.requestType = REQUEST_GET; nlhr.flags = NLHRF_NODUMP | NLHRF_HTTP11 | NLHRF_PERSISTENT | NLHRF_REDIRECT; nlhr.szUrl = (char*)szUrl; diff --git a/plugins/Utils.pas/mirutils.pas b/plugins/Utils.pas/mirutils.pas index 852223cbda..c6066c8ee9 100644 --- a/plugins/Utils.pas/mirutils.pas +++ b/plugins/Utils.pas/mirutils.pas @@ -412,7 +412,6 @@ begin result:=nil; FillChar(req,SizeOf(req),0); - req.cbSize :=NETLIBHTTPREQUEST_V1_SIZE;//SizeOf(req); req.requestType:=rtype; req.szUrl :=url; req.flags :=NLHRF_NODUMP or NLHRF_HTTP11; @@ -476,7 +475,6 @@ begin exit; FillChar(req,SizeOf(req),0); - req.cbSize :=NETLIBHTTPREQUEST_V1_SIZE;//SizeOf(req); req.requestType:=REQUEST_GET; req.szUrl :=url; req.flags :=NLHRF_NODUMP; @@ -593,7 +591,6 @@ begin exit; FillChar(req,SizeOf(req),0); - req.cbSize :=NETLIBHTTPREQUEST_V1_SIZE;//SizeOf(req); req.requestType:=REQUEST_GET; req.szUrl :=url; req.flags :=NLHRF_NODUMP; diff --git a/plugins/Watrack/myshows/i_cookies.inc b/plugins/Watrack/myshows/i_cookies.inc index 24c90216b9..cd01ef6621 100644 --- a/plugins/Watrack/myshows/i_cookies.inc +++ b/plugins/Watrack/myshows/i_cookies.inc @@ -47,7 +47,6 @@ begin result:=nil; FillChar(req,SizeOf(req),0); - req.cbSize :=NETLIBHTTPREQUEST_V1_SIZE;//SizeOf(req); req.requestType:=REQUEST_GET; req.szUrl :=url; req.flags :=NLHRF_NODUMP or NLHRF_HTTP11; -- cgit v1.2.3