From 858fb2dfc3f198d5c0c861528115411d4d6904d6 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Mon, 12 Aug 2013 22:17:40 +0000 Subject: netlib moved to the core logger git-svn-id: http://svn.miranda-ng.org/main/trunk@5665 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- src/modules/netlib/netlib.cpp | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'src/modules/netlib/netlib.cpp') diff --git a/src/modules/netlib/netlib.cpp b/src/modules/netlib/netlib.cpp index 701c61cb19..e56cf59811 100644 --- a/src/modules/netlib/netlib.cpp +++ b/src/modules/netlib/netlib.cpp @@ -52,21 +52,21 @@ void NetlibFreeUserSettingsStruct(NETLIBUSERSETTINGS *settings) mir_free(settings->szProxyServer); } -void NetlibInitializeNestedCS(struct NetlibNestedCriticalSection *nlncs) +void NetlibInitializeNestedCS(NetlibNestedCriticalSection *nlncs) { nlncs->dwOwningThreadId = 0; nlncs->lockCount = 0; nlncs->hMutex = CreateMutex(NULL, FALSE, NULL); } -void NetlibDeleteNestedCS(struct NetlibNestedCriticalSection *nlncs) +void NetlibDeleteNestedCS(NetlibNestedCriticalSection *nlncs) { CloseHandle(nlncs->hMutex); } -int NetlibEnterNestedCS(struct NetlibConnection *nlc, int which) +int NetlibEnterNestedCS(NetlibConnection *nlc, int which) { - struct NetlibNestedCriticalSection *nlncs; + NetlibNestedCriticalSection *nlncs; DWORD dwCurrentThreadId = GetCurrentThreadId(); WaitForSingleObject(hConnectionHeaderMutex, INFINITE); @@ -92,7 +92,7 @@ int NetlibEnterNestedCS(struct NetlibConnection *nlc, int which) return 1; } -void NetlibLeaveNestedCS(struct NetlibNestedCriticalSection *nlncs) +void NetlibLeaveNestedCS(NetlibNestedCriticalSection *nlncs) { if (--nlncs->lockCount == 0) { nlncs->dwOwningThreadId = 0; @@ -138,7 +138,7 @@ static INT_PTR NetlibRegisterUser(WPARAM, LPARAM lParam) return 0; } - NetlibUser *thisUser = (struct NetlibUser*)mir_calloc(sizeof(struct NetlibUser)); + NetlibUser *thisUser = (NetlibUser*)mir_calloc(sizeof(NetlibUser)); thisUser->handleType = NLH_USER; thisUser->user = *nlu; @@ -201,7 +201,7 @@ static INT_PTR NetlibRegisterUser(WPARAM, LPARAM lParam) static INT_PTR NetlibGetUserSettings(WPARAM wParam, LPARAM lParam) { NETLIBUSERSETTINGS *nlus = (NETLIBUSERSETTINGS*)lParam; - struct NetlibUser *nlu = (struct NetlibUser*)wParam; + NetlibUser *nlu = (NetlibUser*)wParam; if (GetNetlibHandleType(nlu) != NLH_USER || nlus == NULL || nlus->cbSize != sizeof(NETLIBUSERSETTINGS)) { SetLastError(ERROR_INVALID_PARAMETER); @@ -214,7 +214,7 @@ static INT_PTR NetlibGetUserSettings(WPARAM wParam, LPARAM lParam) static INT_PTR NetlibSetUserSettings(WPARAM wParam, LPARAM lParam) { NETLIBUSERSETTINGS *nlus = (NETLIBUSERSETTINGS*)lParam; - struct NetlibUser *nlu = (struct NetlibUser*)wParam; + NetlibUser *nlu = (NetlibUser*)wParam; if (GetNetlibHandleType(nlu) != NLH_USER || nlus == NULL || nlus->cbSize != sizeof(NETLIBUSERSETTINGS)) { SetLastError(ERROR_INVALID_PARAMETER); @@ -245,7 +245,7 @@ INT_PTR NetlibCloseHandle(WPARAM wParam, LPARAM) { case NLH_USER: { - struct NetlibUser *nlu = (struct NetlibUser*)wParam; + NetlibUser *nlu = (NetlibUser*)wParam; { mir_cslock lck(csNetlibUser); int i = netlibUser.getIndex(nlu); @@ -263,7 +263,7 @@ INT_PTR NetlibCloseHandle(WPARAM wParam, LPARAM) } case NLH_CONNECTION: { - struct NetlibConnection *nlc = (struct NetlibConnection*)wParam; + NetlibConnection *nlc = (struct NetlibConnection*)wParam; HANDLE waitHandles[4]; DWORD waitResult; -- cgit v1.2.3