From c4ffab658f422e84259a0a9769f0003b33a013bd Mon Sep 17 00:00:00 2001 From: George Hazan Date: Sat, 7 May 2022 15:00:02 +0300 Subject: Netlib_OpenConnection - finally old stupid structure NETLIBOPENCONNECTION died and converted into a set of parameters + code cleaning --- plugins/CrashDumper/src/crshdmp.cpp | 2 +- plugins/Ping/src/utils.cpp | 9 +-------- plugins/Watrack_MPD/src/main.cpp | 8 +------- 3 files changed, 3 insertions(+), 16 deletions(-) (limited to 'plugins') diff --git a/plugins/CrashDumper/src/crshdmp.cpp b/plugins/CrashDumper/src/crshdmp.cpp index 6d59149c3f..d204008dc1 100644 --- a/plugins/CrashDumper/src/crshdmp.cpp +++ b/plugins/CrashDumper/src/crshdmp.cpp @@ -111,7 +111,7 @@ INT_PTR GetVersionInfo(WPARAM wParam, LPARAM lParam) return result; } -INT_PTR OpenUrl(WPARAM wParam, LPARAM) +INT_PTR OpenUrl(WPARAM, LPARAM) { ShellExecute(nullptr, L"explore", CrashLogFolder, nullptr, nullptr, SW_SHOW); return 0; diff --git a/plugins/Ping/src/utils.cpp b/plugins/Ping/src/utils.cpp index cf263026b5..e225d1f864 100644 --- a/plugins/Ping/src/utils.cpp +++ b/plugins/Ping/src/utils.cpp @@ -52,14 +52,7 @@ INT_PTR PluginPing(WPARAM, LPARAM lParam) clock_t start_tcp = clock(); - //GetLocalTime(&systime); - NETLIBOPENCONNECTION conn = {}; - conn.szHost = mir_u2a(pa->pszName); - conn.wPort = pa->port; - conn.timeout = options.ping_timeout; - - HNETLIBCONN s = Netlib_OpenConnection(hNetlibUser, &conn); - mir_free((void *)conn.szHost); + HNETLIBCONN s = Netlib_OpenConnection(hNetlibUser, _T2A(pa->pszName), pa->port, options.ping_timeout); clock_t end_tcp = clock(); diff --git a/plugins/Watrack_MPD/src/main.cpp b/plugins/Watrack_MPD/src/main.cpp index fb5d454ab5..821e2f4074 100644 --- a/plugins/Watrack_MPD/src/main.cpp +++ b/plugins/Watrack_MPD/src/main.cpp @@ -24,14 +24,8 @@ SONGINFO SongInfo = {}; void Start(void*) { - NETLIBOPENCONNECTION nloc = {}; - char *tmp = (char*)mir_u2a(gbHost); - nloc.szHost = tmp; - nloc.timeout = 5; - nloc.flags = NLOCF_V2; - nloc.wPort = gbPort; Connected = FALSE; - ghConnection = Netlib_OpenConnection(ghNetlibUser, &nloc); + ghConnection = Netlib_OpenConnection(ghNetlibUser, _T2A(gbHost), gbPort, 5); if (ghConnection) ghPacketReciever = Netlib_CreatePacketReceiver(ghConnection, 2048); } -- cgit v1.2.3