From ecb177cadbcff850a16c4b9e306beb15f61ac6f9 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Sun, 4 Nov 2012 18:51:53 +0000 Subject: kernel extraicons, part II git-svn-id: http://svn.miranda-ng.org/main/trunk@2188 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- src/modules/netlib/netlibautoproxy.cpp | 6 +++--- src/modules/netlib/netliblog.cpp | 2 +- src/modules/netlib/netlibopts.cpp | 14 +++++++------- src/modules/netlib/netlibsock.cpp | 2 +- src/modules/netlib/netlibupnp.cpp | 12 ++++++------ 5 files changed, 18 insertions(+), 18 deletions(-) (limited to 'src/modules/netlib') diff --git a/src/modules/netlib/netlibautoproxy.cpp b/src/modules/netlib/netlibautoproxy.cpp index 292a743109..e25b1ef17e 100644 --- a/src/modules/netlib/netlibautoproxy.cpp +++ b/src/modules/netlib/netlibautoproxy.cpp @@ -325,7 +325,7 @@ char* NetlibGetIeProxy(char *szUrl) if (bEnabled) { - for (int i=0; i < proxyBypass.getCount(); ++i) + for (int i=0; i < proxyBypass.getCount(); i++) { if (strcmp(proxyBypass[i], "") == 0) { @@ -447,10 +447,10 @@ void NetlibUnloadIeProxy(void) { int i; - for (i=0; i < 3; ++i) + for (i=0; i < 3; i++) mir_free(szProxyHost[i]); - for (i=0; i < proxyBypass.getCount(); ++i) + for (i=0; i < proxyBypass.getCount(); i++) mir_free(proxyBypass[i]); proxyBypass.destroy(); diff --git a/src/modules/netlib/netliblog.cpp b/src/modules/netlib/netliblog.cpp index 72b98f20e0..6c7c63e2bd 100644 --- a/src/modules/netlib/netliblog.cpp +++ b/src/modules/netlib/netliblog.cpp @@ -107,7 +107,7 @@ static INT_PTR CALLBACK LogOptionsDlgProc(HWND hwndDlg, UINT message, WPARAM wPa tvis.item.mask = TVIF_PARAM|TVIF_TEXT|TVIF_STATE; tvis.item.stateMask = TVIS_STATEIMAGEMASK; - for (i=0; i < netlibUser.getCount(); ++i) + for (i=0; i < netlibUser.getCount(); i++) { tvis.item.pszText = netlibUser[i]->user.ptszDescriptiveName; tvis.item.lParam = i; diff --git a/src/modules/netlib/netlibopts.cpp b/src/modules/netlib/netlibopts.cpp index 386de096f2..c2427c951e 100644 --- a/src/modules/netlib/netlibopts.cpp +++ b/src/modules/netlib/netlibopts.cpp @@ -177,7 +177,7 @@ static void ChangeSettingStringByEdit(HWND hwndDlg, UINT ctrlId, int iUser, int char *szNewValue = (char*)mir_alloc(newValueLen+1); GetDlgItemTextA(hwndDlg, ctrlId, szNewValue, newValueLen+1); if (iUser == -1) { - for (int i=0; iflags & NUF_NOOPTIONS)) { char **ppszNew = (char**)(((PBYTE)&tempSettings[i]->settings)+memberOffset); mir_free(*ppszNew); @@ -235,7 +235,7 @@ void NetlibSaveUserSettingsStruct(const char *szSettingsModule, NETLIBUSERSETTIN combinedSettings.cbSize = sizeof(combinedSettings); DWORD flags = 0; - for (int i=0; i < netlibUser.getCount(); ++i) { + for (int i=0; i < netlibUser.getCount(); i++) { if (thisUser->user.flags & NUF_NOOPTIONS) continue; CombineSettingsStructs(&combinedSettings, &flags, &thisUser->settings, thisUser->user.flags); @@ -290,7 +290,7 @@ static INT_PTR CALLBACK DlgProcNetlibOpts(HWND hwndDlg, UINT msg, WPARAM wParam, if (iUser == -1) { settings.cbSize = sizeof(settings); - for (int i=0; i < tempSettings.getCount(); ++i) { + for (int i=0; i < tempSettings.getCount(); i++) { if (tempSettings[i]->flags & NUF_NOOPTIONS) continue; CombineSettingsStructs(&settings, &flags, &tempSettings[i]->settings, tempSettings[i]->flags); } @@ -344,7 +344,7 @@ static INT_PTR CALLBACK DlgProcNetlibOpts(HWND hwndDlg, UINT msg, WPARAM wParam, int enableAuth = 0, enableUser = 0, enablePass = 0, enableServer = 1; EnableMultipleControls(hwndDlg, useProxyControls, SIZEOF(useProxyControls), TRUE); if (selectedProxyType == 0) { - for (int i=0; i < tempSettings.getCount(); ++i) { + for (int i=0; i < tempSettings.getCount(); i++) { if ( !tempSettings[i]->settings.useProxy || tempSettings[i]->flags & NUF_NOOPTIONS || !(tempSettings[i]->flags & NUF_OUTGOING)) continue; @@ -397,7 +397,7 @@ static INT_PTR CALLBACK DlgProcNetlibOpts(HWND hwndDlg, UINT msg, WPARAM wParam, int newValue = SendDlgItemMessage(hwndDlg, IDC_PROXYTYPE, CB_GETITEMDATA, SendDlgItemMessage(hwndDlg, IDC_PROXYTYPE, CB_GETCURSEL, 0, 0), 0); if (iUser == -1) { if (newValue == 0) return 0; - for (int i=0; i < tempSettings.getCount(); ++i) { + for (int i=0; i < tempSettings.getCount(); i++) { if (tempSettings[i]->flags & NUF_NOOPTIONS) continue; if (newValue == PROXYTYPE_HTTP && !(tempSettings[i]->flags & (NUF_HTTPCONNS|NUF_HTTPGATEWAY))) tempSettings[i]->settings.proxyType = PROXYTYPE_HTTPS; @@ -444,7 +444,7 @@ static INT_PTR CALLBACK DlgProcNetlibOpts(HWND hwndDlg, UINT msg, WPARAM wParam, { int newValue = GetDlgItemInt(hwndDlg, LOWORD(wParam), NULL, FALSE); if (iUser == -1) { - for (int i=0; i < tempSettings.getCount(); ++i) + for (int i=0; i < tempSettings.getCount(); i++) if ( !(tempSettings[i]->flags & NUF_NOOPTIONS)) tempSettings[i]->settings.wProxyPort = newValue; } @@ -503,7 +503,7 @@ int NetlibOptInitialise(WPARAM wParam, LPARAM) int optionsCount = 0; { mir_cslock lck(csNetlibUser); - for (int i=0; i < netlibUser.getCount(); ++i) + for (int i=0; i < netlibUser.getCount(); i++) if ( !(netlibUser[i]->user.flags & NUF_NOOPTIONS)) ++optionsCount; } diff --git a/src/modules/netlib/netlibsock.cpp b/src/modules/netlib/netlibsock.cpp index ac0435564e..5918263110 100644 --- a/src/modules/netlib/netlibsock.cpp +++ b/src/modules/netlib/netlibsock.cpp @@ -336,7 +336,7 @@ static NETLIBIPLIST* GetMyIpv4(void) NETLIBIPLIST *addr = (NETLIBIPLIST*)mir_calloc(n * 64 + 4); addr->cbNum = n; - for (unsigned i=0; i < n; ++i) + for (unsigned i=0; i < n; i++) strcpy(addr->szIp[i], inet_ntoa(*(PIN_ADDR)he->h_addr_list[i])); return addr; diff --git a/src/modules/netlib/netlibupnp.cpp b/src/modules/netlib/netlibupnp.cpp index 31b52bb433..33f48221c3 100644 --- a/src/modules/netlib/netlibupnp.cpp +++ b/src/modules/netlib/netlibupnp.cpp @@ -626,7 +626,7 @@ static void discoverUPnP(void) ips = (unsigned*)mir_alloc(nip * sizeof(unsigned)); - for (j = 0; j < nip; ++j) + for (j = 0; j < nip; j++) ips[j] = *(unsigned*)he->h_addr_list[j]; } @@ -634,7 +634,7 @@ static void discoverUPnP(void) for (i = 3; --i && szUrl[0] == 0;) { - for (j = 0; j < nip; ++j) + for (j = 0; j < nip; j++) { if (ips) setsockopt(sock, IPPROTO_IP, IP_MULTICAST_IF, (char *)&ips[j], sizeof(unsigned)); @@ -784,7 +784,7 @@ void NetlibUPnPDeletePortMapping(WORD extport, char* proto) mir_snprintf(szData, 4096, delete_port_mapping, extport, proto); httpTransact(szCtlUrl, szData, 4096, "DeletePortMapping", ControlAction); - for (i=0; i < numports; ++i) + for (i=0; i < numports; i++) if (portList[i] == extport && --numports > 0) memmove(&portList[i], &portList[i+1], (numports - i) * sizeof(WORD)); @@ -802,7 +802,7 @@ void NetlibUPnPCleanup(void*) { int incoming = 0; mir_cslock lck(csNetlibUser); - for (int i=0; i < netlibUser.getCount(); ++i) + for (int i=0; i < netlibUser.getCount(); i++) if (netlibUser[i]->user.flags & NUF_INCOMING) { incoming = 1; break; @@ -828,7 +828,7 @@ void NetlibUPnPCleanup(void*) txtParseParam(szData, "QueryStateVariableResponse", "", "<", buf, sizeof(buf))) num = atol(buf); - for (i=0; i