From 27e84852f0071b4ab832fb3a61d51ee126ad778e Mon Sep 17 00:00:00 2001 From: George Hazan Date: Sat, 23 Jun 2018 13:47:58 +0300 Subject: Netlib: - fix for function names - code cleaning --- libs/win32/mir_app.lib | Bin 171894 -> 172462 bytes libs/win64/mir_app.lib | Bin 167008 -> 167540 bytes src/mir_app/src/mir_app.def | 2 ++ src/mir_app/src/mir_app64.def | 2 ++ src/mir_app/src/netlib.cpp | 24 ++++++++++++------------ 5 files changed, 16 insertions(+), 12 deletions(-) diff --git a/libs/win32/mir_app.lib b/libs/win32/mir_app.lib index 1374ef6c75..3fced1bb1f 100644 Binary files a/libs/win32/mir_app.lib and b/libs/win32/mir_app.lib differ diff --git a/libs/win64/mir_app.lib b/libs/win64/mir_app.lib index 05175c2bd9..fdca68a76e 100644 Binary files a/libs/win64/mir_app.lib and b/libs/win64/mir_app.lib differ diff --git a/src/mir_app/src/mir_app.def b/src/mir_app/src/mir_app.def index 27bf47e3d9..7b06a851ec 100644 --- a/src/mir_app/src/mir_app.def +++ b/src/mir_app/src/mir_app.def @@ -626,3 +626,5 @@ Idle_Enter @654 NONAME Idle_GetInfo @655 NONAME Profile_GetSetting @656 Profile_GetSettingInt @657 +Netlib_GetUserSettingsByName @658 +Netlib_SetUserSettingsByName @659 diff --git a/src/mir_app/src/mir_app64.def b/src/mir_app/src/mir_app64.def index 263896f0b0..a58eaaa30d 100644 --- a/src/mir_app/src/mir_app64.def +++ b/src/mir_app/src/mir_app64.def @@ -626,3 +626,5 @@ Idle_Enter @654 NONAME Idle_GetInfo @655 NONAME Profile_GetSetting @656 Profile_GetSettingInt @657 +Netlib_GetUserSettingsByName @658 +Netlib_SetUserSettingsByName @659 diff --git a/src/mir_app/src/netlib.cpp b/src/mir_app/src/netlib.cpp index 02c7c0d7d7..4e35fc8f66 100644 --- a/src/mir_app/src/netlib.cpp +++ b/src/mir_app/src/netlib.cpp @@ -210,18 +210,18 @@ MIR_APP_DLL(int) Netlib_GetUserSettings(HNETLIBUSER nlu, NETLIBUSERSETTINGS *nlu SetLastError(ERROR_INVALID_PARAMETER); return 0; } + *nlus = nlu->settings; return 1; } -MIR_APP_DLL(int) NetlibGetUserSettingsByName(char * UserSettingsName, NETLIBUSERSETTINGS *nlus) +MIR_APP_DLL(int) Netlib_GetUserSettingsByName(char * UserSettingsName, NETLIBUSERSETTINGS *nlus) { mir_cslock lck(csNetlibUser); - for (int i = 0; i < netlibUser.getCount(); i++) - if (!mir_strcmp(netlibUser[i]->user.szSettingsModule, UserSettingsName)) { - int out = Netlib_GetUserSettings(netlibUser[i], nlus); - return out; - } + for (auto &it : netlibUser) + if (!mir_strcmp(it->user.szSettingsModule, UserSettingsName)) + return Netlib_GetUserSettings(it, nlus); + SetLastError(ERROR_INVALID_PARAMETER); return 0; } @@ -232,18 +232,18 @@ MIR_APP_DLL(int) Netlib_SetUserSettings(HNETLIBUSER nlu, const NETLIBUSERSETTING SetLastError(ERROR_INVALID_PARAMETER); return 0; } + NetlibSaveUserSettingsStruct(nlu->user.szSettingsModule, nlus); return 1; } -MIR_APP_DLL(int) NetlibSetUserSettingsByName(char * UserSettingsName, NETLIBUSERSETTINGS *nlus) +MIR_APP_DLL(int) Netlib_SetUserSettingsByName(char * UserSettingsName, NETLIBUSERSETTINGS *nlus) { mir_cslock lck(csNetlibUser); - for (int i = 0; i < netlibUser.getCount(); i++) - if (!mir_strcmp(netlibUser[i]->user.szSettingsModule, UserSettingsName)) { - int out = Netlib_SetUserSettings(netlibUser[i], nlus); - return out; - } + for (auto &it : netlibUser) + if (!mir_strcmp(it->user.szSettingsModule, UserSettingsName)) + return Netlib_SetUserSettings(it, nlus); + SetLastError(ERROR_INVALID_PARAMETER); return 0; } -- cgit v1.2.3