From 0db449bf70966941453cfbb8ec05fd430a96dc12 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Wed, 24 Jul 2019 13:20:12 +0300 Subject: useless member NETLIBOPENCONNECTION::cbSize removed --- protocols/Sametime/src/conference.cpp | 14 +++++++------- protocols/Sametime/src/files.cpp | 7 ++----- protocols/Sametime/src/messaging.cpp | 2 +- protocols/Sametime/src/places.cpp | 24 ++++++++++++------------ protocols/Sametime/src/sametime_proto.cpp | 4 ++-- protocols/Sametime/src/sametime_proto.h | 2 +- protocols/Sametime/src/sametime_session.cpp | 14 ++++++-------- 7 files changed, 31 insertions(+), 36 deletions(-) (limited to 'protocols/Sametime') diff --git a/protocols/Sametime/src/conference.cpp b/protocols/Sametime/src/conference.cpp index dcba8b5dd6..666ed44cfe 100644 --- a/protocols/Sametime/src/conference.cpp +++ b/protocols/Sametime/src/conference.cpp @@ -146,7 +146,7 @@ void mwServiceConf_conf_opened(mwConference* conf, GList* members) /** triggered when a conference is closed. This is typically when we've left it */ -void mwServiceConf_conf_closed(mwConference* conf, guint32 reason) +void mwServiceConf_conf_closed(mwConference* conf, guint32) { CSametimeProto* proto = getProtoFromMwConference(conf); proto->debugLogW(L"mwServiceConf_conf_closed() start"); @@ -240,7 +240,7 @@ void mwServiceConf_on_text(mwConference* conf, mwLoginInfo* user, const char* wh } /** typing notification */ -void mwServiceConf_on_typing(mwConference* conf, mwLoginInfo* who, gboolean typing) +void mwServiceConf_on_typing(mwConference* conf, mwLoginInfo*, gboolean) { CSametimeProto* proto = getProtoFromMwConference(conf); proto->debugLogW(L"mwServiceConf_on_typing() start"); @@ -248,7 +248,7 @@ void mwServiceConf_on_typing(mwConference* conf, mwLoginInfo* who, gboolean typi } /** optional. called from mwService_free */ -void mwServiceConf_clear(mwServiceConference* srvc) +void mwServiceConf_clear(mwServiceConference*) { } @@ -277,7 +277,7 @@ void CSametimeProto::TerminateConference(char* name) } -int CSametimeProto::GcEventHook(WPARAM wParam, LPARAM lParam) { +int CSametimeProto::GcEventHook(WPARAM, LPARAM lParam) { GCHOOK* gch = (GCHOOK*)lParam; @@ -333,7 +333,7 @@ int CSametimeProto::ChatDeleted(MCONTACT hContact) { } -INT_PTR CSametimeProto::onMenuLeaveChat(WPARAM wParam, LPARAM lParam) +INT_PTR CSametimeProto::onMenuLeaveChat(WPARAM wParam, LPARAM) { MCONTACT hContact = (MCONTACT)wParam; debugLogW(L"CSametimeProto::onMenuLeaveChat() hContact=[%x]", hContact); @@ -342,7 +342,7 @@ INT_PTR CSametimeProto::onMenuLeaveChat(WPARAM wParam, LPARAM lParam) } -INT_PTR CSametimeProto::onMenuCreateChat(WPARAM wParam, LPARAM lParam) +INT_PTR CSametimeProto::onMenuCreateChat(WPARAM wParam, LPARAM) { MCONTACT hContact = (MCONTACT)wParam; debugLogW(L"CSametimeProto::onMenuCreateChat() hContact=[%x]", hContact); @@ -375,7 +375,7 @@ INT_PTR CSametimeProto::onMenuCreateChat(WPARAM wParam, LPARAM lParam) return 0; } -int CSametimeProto::PrebuildContactMenu(WPARAM wParam, LPARAM lParam) +int CSametimeProto::PrebuildContactMenu(WPARAM wParam, LPARAM) { MCONTACT hContact = (MCONTACT)wParam; debugLogW(L"CSametimeProto::PrebuildContactMenu() hContact=[%x]", hContact); diff --git a/protocols/Sametime/src/files.cpp b/protocols/Sametime/src/files.cpp index a0b3d3dd74..e5dde87da3 100644 --- a/protocols/Sametime/src/files.cpp +++ b/protocols/Sametime/src/files.cpp @@ -257,7 +257,7 @@ void mwFileTransfer_handle_ack(mwFileTransfer* ft) } /** optional. called from mwService_free */ -void mwFileTransfer_clear(mwServiceFileTransfer* srvc) +void mwFileTransfer_clear(mwServiceFileTransfer*) { } @@ -280,7 +280,7 @@ HANDLE CSametimeProto::SendFilesToUser(MCONTACT hContact, wchar_t** files, const idb.user = id_block.user; idb.community = id_block.community; - FileTransferClientData *ftcd, *prev_ftcd = nullptr, *first_ftcd = nullptr; + FileTransferClientData *ftcd, *prev_ftcd = nullptr; mwFileTransfer *ft, *first_ft = nullptr; for (int i = 0; files[i]; i++) { @@ -346,7 +346,6 @@ HANDLE CSametimeProto::AcceptFileTransfer(MCONTACT hContact, HANDLE hFt, char* s { mwFileTransfer* ft = (mwFileTransfer*)hFt; - CSametimeProto* proto = getProtoFromMwFileTransfer(ft); debugLogW(L"CSametimeProto::AcceptFileTransfer() start"); FileTransferClientData* ftcd = new FileTransferClientData; @@ -392,7 +391,6 @@ HANDLE CSametimeProto::AcceptFileTransfer(MCONTACT hContact, HANDLE hFt, char* s void CSametimeProto::RejectFileTransfer(HANDLE hFt) { mwFileTransfer* ft = (mwFileTransfer*)hFt; - CSametimeProto* proto = getProtoFromMwFileTransfer(ft); debugLogW(L"CSametimeProto::RejectFileTransfer() start"); mwFileTransfer_reject(ft); @@ -401,7 +399,6 @@ void CSametimeProto::RejectFileTransfer(HANDLE hFt) void CSametimeProto::CancelFileTransfer(HANDLE hFt) { mwFileTransfer* ft = (mwFileTransfer*)hFt; - CSametimeProto* proto = getProtoFromMwFileTransfer(ft); debugLogW(L"CSametimeProto::CancelFileTransfer() start"); FileTransferClientData* ftcd = (FileTransferClientData*)mwFileTransfer_getClientData(ft); diff --git a/protocols/Sametime/src/messaging.cpp b/protocols/Sametime/src/messaging.cpp index cc79c8b9dc..c8c3cb64cb 100644 --- a/protocols/Sametime/src/messaging.cpp +++ b/protocols/Sametime/src/messaging.cpp @@ -88,7 +88,7 @@ void mwIm_conversation_recv(mwConversation* conv, mwImSendType type, gconstpoint ProtoChainRecvMsg(hContact, &pre); } -void mwIm_place_invite(struct mwConversation* conv, const char* message, const char* title, const char* name) +void mwIm_place_invite(struct mwConversation* conv, const char* message, const char*, const char*) { CSametimeProto* proto = getProtoFromMwConversation(conv); proto->debugLogW(L"mwIm_place_invite() start"); diff --git a/protocols/Sametime/src/places.cpp b/protocols/Sametime/src/places.cpp index 8b3a030ed1..2fd862d70d 100644 --- a/protocols/Sametime/src/places.cpp +++ b/protocols/Sametime/src/places.cpp @@ -3,40 +3,40 @@ /* Stubs, NOT IMPLEMENTED NOW */ -void mwServicePlace_opened(struct mwPlace* place) +void mwServicePlace_opened(struct mwPlace*) { } -void mwServicePlace_closed(struct mwPlace* place, guint32 code) +void mwServicePlace_closed(struct mwPlace*, guint32) { } -void mwServicePlace_peerJoined(struct mwPlace* place, const struct mwIdBlock* peer) +void mwServicePlace_peerJoined(struct mwPlace*, const struct mwIdBlock*) { } -void mwServicePlace_peerParted(struct mwPlace* place, const struct mwIdBlock* peer) +void mwServicePlace_peerParted(struct mwPlace*, const struct mwIdBlock*) { } -void mwServicePlace_peerSetAttribute(struct mwPlace* place, const struct mwIdBlock* peer, guint32 attr, struct mwOpaque* o) +void mwServicePlace_peerSetAttribute(struct mwPlace*, const struct mwIdBlock*, guint32, struct mwOpaque*) { } -void mwServicePlace_peerUnsetAttribute(struct mwPlace* place, const struct mwIdBlock* peer, guint32 attr) +void mwServicePlace_peerUnsetAttribute(struct mwPlace*, const struct mwIdBlock*, guint32) { } -void mwServicePlace_message(struct mwPlace* place, const struct mwIdBlock* who, const char* msg) +void mwServicePlace_message(struct mwPlace*, const struct mwIdBlock*, const char*) { } -void mwServicePlace_clear(struct mwServicePlace* srvc) +void mwServicePlace_clear(struct mwServicePlace*) { } @@ -52,16 +52,16 @@ mwPlaceHandler mwPlace_handler = { mwServicePlace_clear }; -void CSametimeProto::InitPlaces(mwSession* session) +void CSametimeProto::InitPlaces(mwSession* pSession) { debugLogW(L"CSametimeProto::InitPlaces()"); - mwSession_addService(session, (mwService*)(service_places = mwServicePlace_new(session, &mwPlace_handler))); + mwSession_addService(pSession, (mwService*)(service_places = mwServicePlace_new(pSession, &mwPlace_handler))); } -void CSametimeProto::DeinitPlaces(mwSession* session) +void CSametimeProto::DeinitPlaces(mwSession* pSession) { debugLogW(L"CSametimeProto::DeinitPlaces()"); - mwSession_removeService(session, mwService_PLACE); + mwSession_removeService(pSession, mwService_PLACE); mwService_free((mwService*)service_places); service_places = nullptr; } diff --git a/protocols/Sametime/src/sametime_proto.cpp b/protocols/Sametime/src/sametime_proto.cpp index 6bae4d5d0a..f47f031ffb 100644 --- a/protocols/Sametime/src/sametime_proto.cpp +++ b/protocols/Sametime/src/sametime_proto.cpp @@ -100,7 +100,7 @@ int CSametimeProto::FileDeny(MCONTACT hContact, HANDLE hTransfer, const wchar_t* return 0; } -INT_PTR CSametimeProto::GetCaps(int type, MCONTACT hContact) +INT_PTR CSametimeProto::GetCaps(int type, MCONTACT) { switch (type) { case PFLAGNUM_1: @@ -233,7 +233,7 @@ int CSametimeProto::SetStatus(int iNewStatus) m_iDesiredStatus = iNewStatus; if (iNewStatus != ID_STATUS_OFFLINE) { if (m_iStatus == ID_STATUS_OFFLINE) - LogIn(iNewStatus, m_hNetlibUser); + LogIn(iNewStatus); else SetSessionStatus(iNewStatus); } diff --git a/protocols/Sametime/src/sametime_proto.h b/protocols/Sametime/src/sametime_proto.h index e81767cfd5..b97a53c40f 100644 --- a/protocols/Sametime/src/sametime_proto.h +++ b/protocols/Sametime/src/sametime_proto.h @@ -102,7 +102,7 @@ struct CSametimeProto : public PROTO void SessionStarted(); void SessionStopping(); void InitSessionMenu(); - int LogIn(int status, HANDLE hNetlibUser); + int LogIn(int status); int LogOut(); int OnLogInRedirect(char* newHost); int SetSessionStatus(int status); diff --git a/protocols/Sametime/src/sametime_session.cpp b/protocols/Sametime/src/sametime_session.cpp index e9cd06818c..2e27b39822 100644 --- a/protocols/Sametime/src/sametime_session.cpp +++ b/protocols/Sametime/src/sametime_session.cpp @@ -142,7 +142,7 @@ void __cdecl SessionAdmin(struct mwSession* session, const char* text) mir_free(tt); } -void __cdecl SessionAnnounce(struct mwSession* session, struct mwLoginInfo* from, gboolean may_reply, const char* text) +void __cdecl SessionAnnounce(struct mwSession* session, struct mwLoginInfo* from, gboolean, const char* text) { CSametimeProto* proto = (CSametimeProto*)mwSession_getProperty(session, "PROTO_STRUCT_PTR"); proto->debugLogW(L"SessionAnnounce()"); @@ -275,7 +275,7 @@ int CSametimeProto::SetSessionStatus(int status) return 0; } -VOID CALLBACK IdleTimerProc(HWND hwnd, UINT uMsg, UINT_PTR idEvent, DWORD dwTime) +VOID CALLBACK IdleTimerProc(HWND, UINT, UINT_PTR idEvent, DWORD) { CSametimeProto* proto = (CSametimeProto*)idEvent; @@ -358,7 +358,7 @@ void __cdecl CSametimeProto::KeepAliveThread(void*) return; } -int waitcallback(unsigned int* timeout) +int waitcallback(unsigned int*) { return continue_connect ? 1 : 0; } @@ -373,7 +373,6 @@ void __cdecl CSametimeProto::SessionThread(LPVOID) // setup NETLIBOPENCONNECTION conn_data = { 0 }; - conn_data.cbSize = sizeof(NETLIBOPENCONNECTION); conn_data.flags = NLOCF_V2; conn_data.szHost = options.server_name; conn_data.wPort = options.port; @@ -470,7 +469,7 @@ WORD CSametimeProto::GetServerVersion() return retval; } -int CSametimeProto::LogIn(int ls, HANDLE hNetlibUser) +int CSametimeProto::LogIn(int ls) { debugLogW(L"LogIn() start"); @@ -483,7 +482,6 @@ int CSametimeProto::LogIn(int ls, HANDLE hNetlibUser) login_status = ls; ForkThread(&CSametimeProto::SessionThread); - return 0; } @@ -515,7 +513,7 @@ int CSametimeProto::OnLogInRedirect(char* newHost) mir_strcpy(options.server_name, newHost); LogOut(); Sleep(50); //wait for SessionThread end - LogIn(login_status, m_hNetlibUser); + LogIn(login_status); return 0; } @@ -543,7 +541,7 @@ void SendAnnouncement(SendAnnouncementFunc_arg* arg) mwSession_sendAnnounce(proto->session, false, T2Utf(arg->msg), arg->recipients); } -INT_PTR CSametimeProto::SessionAnnounce(WPARAM wParam, LPARAM lParam) +INT_PTR CSametimeProto::SessionAnnounce(WPARAM, LPARAM) { debugLogW(L"CSametimeProto::SessionAnnounce() start"); SessionAnnounceDialogProc_arg* sadpArg = (SessionAnnounceDialogProc_arg*)mir_calloc(sizeof(SessionAnnounceDialogProc_arg)); -- cgit v1.2.3