From a15cd68f0412e1b211e746a2e4d5682e96f5a113 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Tue, 11 Aug 2015 13:52:01 +0000 Subject: code cleaning git-svn-id: http://svn.miranda-ng.org/main/trunk@14911 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- protocols/Yahoo/src/avatar.cpp | 14 ++-- protocols/Yahoo/src/chat.cpp | 107 ++++++++++++++-------------- protocols/Yahoo/src/file_transfer.cpp | 12 ++-- protocols/Yahoo/src/im.cpp | 2 +- protocols/Yahoo/src/libyahoo2/libyahoo2.cpp | 14 ++-- protocols/Yahoo/src/links.cpp | 2 +- protocols/Yahoo/src/main.cpp | 2 +- protocols/Yahoo/src/proto.cpp | 10 +-- protocols/Yahoo/src/search.cpp | 2 +- protocols/Yahoo/src/server.cpp | 4 +- protocols/Yahoo/src/services.cpp | 8 +-- protocols/Yahoo/src/user_info.cpp | 2 +- protocols/Yahoo/src/webcam.cpp | 12 ++-- protocols/Yahoo/src/yahoo.cpp | 8 +-- 14 files changed, 98 insertions(+), 101 deletions(-) (limited to 'protocols') diff --git a/protocols/Yahoo/src/avatar.cpp b/protocols/Yahoo/src/avatar.cpp index e0ea4d6f15..846325cf3e 100644 --- a/protocols/Yahoo/src/avatar.cpp +++ b/protocols/Yahoo/src/avatar.cpp @@ -41,7 +41,7 @@ int YAHOO_avt_hash(const char *key, DWORD len) /**************** Send Avatar ********************/ -void upload_avt(int id, INT_PTR fd, int error, void *data) +void upload_avt(int, INT_PTR fd, int error, void *data) { struct yahoo_file_info *sf = (struct yahoo_file_info*) data; unsigned long size = 0; @@ -250,7 +250,7 @@ void __cdecl CYahooProto::recv_avatarthread(void *pavt) ProtoBroadcastAck(hContact, ACKTYPE_AVATAR, !error ? ACKRESULT_SUCCESS : ACKRESULT_FAILED, (HANDLE)&ai, 0); } -void CYahooProto::ext_got_picture(const char *me, const char *who, const char *pic_url, int cksum, int type) +void CYahooProto::ext_got_picture(const char*, const char *who, const char *pic_url, int cksum, int type) { MCONTACT hContact = 0; @@ -446,7 +446,7 @@ void CYahooProto::ext_got_picture(const char *me, const char *who, const char *p LOG(("ext_yahoo_got_picture exiting")); } -void CYahooProto::ext_got_picture_checksum(const char *me, const char *who, int cksum) +void CYahooProto::ext_got_picture_checksum(const char*, const char *who, int cksum) { LOG(("ext_yahoo_got_picture_checksum for %s checksum: %d", who, cksum)); @@ -482,7 +482,7 @@ void CYahooProto::ext_got_picture_checksum(const char *me, const char *who, int } } -void CYahooProto::ext_got_picture_update(const char *me, const char *who, int buddy_icon) +void CYahooProto::ext_got_picture_update(const char*, const char *who, int buddy_icon) { LOG(("ext_got_picture_update for %s buddy_icon: %d", who, buddy_icon)); @@ -498,7 +498,7 @@ void CYahooProto::ext_got_picture_update(const char *me, const char *who, int bu reset_avatar(hContact); } -void CYahooProto::ext_got_picture_status(const char *me, const char *who, int buddy_icon) +void CYahooProto::ext_got_picture_status(const char*, const char *who, int buddy_icon) { MCONTACT hContact = 0; @@ -516,7 +516,7 @@ void CYahooProto::ext_got_picture_status(const char *me, const char *who, int bu reset_avatar(hContact); } -void CYahooProto::ext_got_picture_upload(const char *me, const char *url, unsigned int ts) +void CYahooProto::ext_got_picture_upload(const char*, const char *url, unsigned int ts) { int cksum = 0; DBVARIANT dbv; @@ -782,7 +782,7 @@ lParam=(const char *)Avatar file name return=0 for sucess */ -INT_PTR __cdecl CYahooProto::SetMyAvatar(WPARAM wParam, LPARAM lParam) +INT_PTR __cdecl CYahooProto::SetMyAvatar(WPARAM, LPARAM lParam) { TCHAR* tszFile = (TCHAR*)lParam; TCHAR tszMyFile[MAX_PATH + 1]; diff --git a/protocols/Yahoo/src/chat.cpp b/protocols/Yahoo/src/chat.cpp index 906c1f1804..a65041b2be 100644 --- a/protocols/Yahoo/src/chat.cpp +++ b/protocols/Yahoo/src/chat.cpp @@ -48,45 +48,8 @@ struct InviteChatReqParam }; INT_PTR CALLBACK InviteToChatDialog(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam); -void CALLBACK ConferenceRequestCB(PVOID dwParam); -/* Conference handlers */ -void ext_yahoo_got_conf_invite(int id, const char *me, const char *who, const char *room, const char *msg, YList *members) -{ - char z[1024]; - mir_snprintf(z, _countof(z), Translate("[miranda] Got conference invite to room: %s with msg: %s"), room ? room : "", msg ? msg : ""); - LOG(("[ext_yahoo_got_conf_invite] %s", z)); - - CYahooProto* ppro = getProtoById(id); - if (!ppro) return; - - bool freeList = true; - CYahooProto::ChatRoom *cm = ppro->m_chatrooms.find((CYahooProto::ChatRoom*)&room); - if (!cm) { - if (mir_strcmp(who, me)) { - cm = new CYahooProto::ChatRoom(room, members); - ppro->m_chatrooms.insert(cm); - - InviteChatReqParam* req = new InviteChatReqParam(room, who, msg, ppro); - CallFunctionAsync(ConferenceRequestCB, req); - freeList = false; - } - else { - cm = new CYahooProto::ChatRoom(room, NULL); - ppro->m_chatrooms.insert(cm); - ppro->ChatStart(room); - - yahoo_conference_logon(id, NULL, members, room); - } - } - - if (freeList) { - for (YList *l = members; l; l = l->next) free(l->data); - y_list_free(members); - } -} - -void ext_yahoo_conf_userdecline(int id, const char *me, const char *who, const char *room, const char *msg) +void ext_yahoo_conf_userdecline(int id, const char*, const char *who, const char *room, const char *msg) { TCHAR info[1024]; TCHAR *whot = mir_utf8decodeT(who); @@ -97,7 +60,7 @@ void ext_yahoo_conf_userdecline(int id, const char *me, const char *who, const c mir_free(whot); } -void ext_yahoo_conf_userjoin(int id, const char *me, const char *who, const char *room) +void ext_yahoo_conf_userjoin(int id, const char*, const char *who, const char *room) { CYahooProto* ppro = getProtoById(id); if (!ppro) return; @@ -113,7 +76,7 @@ void ext_yahoo_conf_userjoin(int id, const char *me, const char *who, const char ppro->ChatEvent(room, who, GC_EVENT_JOIN); } -void ext_yahoo_conf_userleave(int id, const char *me, const char *who, const char *room) +void ext_yahoo_conf_userleave(int id, const char*, const char *who, const char *room) { CYahooProto* ppro = getProtoById(id); if (!ppro) return; @@ -133,7 +96,7 @@ void ext_yahoo_conf_userleave(int id, const char *me, const char *who, const cha ppro->ChatEvent(room, who, GC_EVENT_PART); } -void ext_yahoo_conf_message(int id, const char *me, const char *who, const char *room, const char *msg, int utf8) +void ext_yahoo_conf_message(int id, const char*, const char *who, const char *room, const char *msg, int utf8) { TCHAR *msgt = utf8 ? mir_utf8decodeT(msg) : mir_a2t(msg); GETPROTOBYID(id)->ChatEvent(room, who, GC_EVENT_MESSAGE, msgt); @@ -141,29 +104,30 @@ void ext_yahoo_conf_message(int id, const char *me, const char *who, const char } /* chat handlers */ -void ext_yahoo_chat_cat_xml(int id, const char *xml) +void ext_yahoo_chat_cat_xml(int, const char*) {} -void ext_yahoo_chat_join(int id, const char *me, const char *room, const char * topic, YList *members, INT_PTR fd) +void ext_yahoo_chat_join(int, const char*, const char*, const char*, YList *members, INT_PTR) { for (YList *l = members; l; l = l->next) free(l->data); y_list_free(members); } -void ext_yahoo_chat_userjoin(int id, const char *me, const char *room, struct yahoo_chat_member *who) +void ext_yahoo_chat_userjoin(int, const char*, const char*, struct yahoo_chat_member*) {} -void ext_yahoo_chat_userleave(int id, const char *me, const char *room, const char *who) +void ext_yahoo_chat_userleave(int, const char*, const char*, const char*) {} -void ext_yahoo_chat_message(int id, const char *me, const char *who, const char *room, const char *msg, int msgtype, int utf8) +void ext_yahoo_chat_message(int, const char*, const char*, const char*, const char*, int, int) {} -void ext_yahoo_chat_yahoologout(int id, const char *me) +void ext_yahoo_chat_yahoologout(int, const char*) { LOG(("got chat logout")); } -void ext_yahoo_chat_yahooerror(int id, const char *me) + +void ext_yahoo_chat_yahooerror(int, const char*) { LOG(("got chat error")); } @@ -603,12 +567,6 @@ INT_PTR CALLBACK ChatRequestDialog(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM return FALSE; } -static void CALLBACK ConferenceRequestCB(PVOID pParam) -{ - CreateDialogParam(hInstance, MAKEINTRESOURCE(IDD_CHATROOM_INVITE_REQ), - NULL, ChatRequestDialog, (LPARAM)pParam); -} - INT_PTR __cdecl CYahooProto::CreateConference(WPARAM /*wParam*/, LPARAM /*lParam*/) { char room[128]; @@ -619,3 +577,44 @@ INT_PTR __cdecl CYahooProto::CreateConference(WPARAM /*wParam*/, LPARAM /*lParam InviteToChatDialog, LPARAM(param)); return 0; } + +void CALLBACK ConferenceRequestCB(PVOID pParam) +{ + CreateDialogParam(hInstance, MAKEINTRESOURCE(IDD_CHATROOM_INVITE_REQ), NULL, ChatRequestDialog, (LPARAM)pParam); +} + +/* Conference handlers */ +void ext_yahoo_got_conf_invite(int id, const char *me, const char *who, const char *room, const char *msg, YList *members) +{ + char z[1024]; + mir_snprintf(z, _countof(z), Translate("[miranda] Got conference invite to room: %s with msg: %s"), room ? room : "", msg ? msg : ""); + LOG(("[ext_yahoo_got_conf_invite] %s", z)); + + CYahooProto* ppro = getProtoById(id); + if (!ppro) return; + + bool freeList = true; + CYahooProto::ChatRoom *cm = ppro->m_chatrooms.find((CYahooProto::ChatRoom*)&room); + if (!cm) { + if (mir_strcmp(who, me)) { + cm = new CYahooProto::ChatRoom(room, members); + ppro->m_chatrooms.insert(cm); + + InviteChatReqParam* req = new InviteChatReqParam(room, who, msg, ppro); + CallFunctionAsync(ConferenceRequestCB, req); + freeList = false; + } + else { + cm = new CYahooProto::ChatRoom(room, NULL); + ppro->m_chatrooms.insert(cm); + ppro->ChatStart(room); + + yahoo_conference_logon(id, NULL, members, room); + } + } + + if (freeList) { + for (YList *l = members; l; l = l->next) free(l->data); + y_list_free(members); + } +} diff --git a/protocols/Yahoo/src/file_transfer.cpp b/protocols/Yahoo/src/file_transfer.cpp index 649b9ce855..ba81c5c10f 100644 --- a/protocols/Yahoo/src/file_transfer.cpp +++ b/protocols/Yahoo/src/file_transfer.cpp @@ -138,7 +138,7 @@ static void free_ft(y_filetransfer *ft) LOG(("[/free_ft]")); } -static void upload_file(int id, INT_PTR fd, int error, void *data) +static void upload_file(int, INT_PTR fd, int error, void *data) { y_filetransfer *sf = (y_filetransfer*)data; struct yahoo_file_info *fi = (struct yahoo_file_info *)sf->files->data; @@ -271,7 +271,7 @@ static void upload_file(int id, INT_PTR fd, int error, void *data) } } -static void dl_file(int id, INT_PTR fd, int error, const char *filename, unsigned long size, void *data) +static void dl_file(int id, INT_PTR fd, int error, const char*, unsigned long size, void *data) { y_filetransfer *sf = (y_filetransfer*)data; struct yahoo_file_info *fi = (struct yahoo_file_info *)sf->files->data; @@ -626,7 +626,7 @@ struct _sfs{ y_filetransfer *sf; }; -void CYahooProto::ext_ft7_send_file(const char *me, const char *who, const char *filename, const char *token, const char *ft_token) +void CYahooProto::ext_ft7_send_file(const char *me, const char *who, const char*, const char *token, const char *ft_token) { LOG(("[ext_yahoo_send_file7info] ident:%s, who: %s, ft_token: %s", me, who, ft_token)); @@ -729,7 +729,7 @@ HANDLE __cdecl CYahooProto::SendFile(MCONTACT hContact, const TCHAR *szDescripti //////////////////////////////////////////////////////////////////////////////////////// // FileAllow - starts a file transfer -HANDLE __cdecl CYahooProto::FileAllow(MCONTACT hContact, HANDLE hTransfer, const TCHAR* szPath) +HANDLE __cdecl CYahooProto::FileAllow(MCONTACT, HANDLE hTransfer, const TCHAR* szPath) { y_filetransfer *ft = (y_filetransfer *)hTransfer; @@ -757,7 +757,7 @@ HANDLE __cdecl CYahooProto::FileAllow(MCONTACT hContact, HANDLE hTransfer, const //////////////////////////////////////////////////////////////////////////////////////// // FileCancel - cancels a file transfer -int __cdecl CYahooProto::FileCancel(MCONTACT hContact, HANDLE hTransfer) +int __cdecl CYahooProto::FileCancel(MCONTACT, HANDLE hTransfer) { debugLogA("[YahooFileCancel]"); @@ -780,7 +780,7 @@ int __cdecl CYahooProto::FileCancel(MCONTACT hContact, HANDLE hTransfer) //////////////////////////////////////////////////////////////////////////////////////// // FileDeny - denies a file transfer -int __cdecl CYahooProto::FileDeny(MCONTACT hContact, HANDLE hTransfer, const TCHAR*) +int __cdecl CYahooProto::FileDeny(MCONTACT, HANDLE hTransfer, const TCHAR*) { /* deny file receive request.. just ignore it! */ y_filetransfer *ft = (y_filetransfer *)hTransfer; diff --git a/protocols/Yahoo/src/im.cpp b/protocols/Yahoo/src/im.cpp index 11c6a4de5f..29d980c996 100644 --- a/protocols/Yahoo/src/im.cpp +++ b/protocols/Yahoo/src/im.cpp @@ -217,7 +217,7 @@ int __cdecl CYahooProto::RecvMsg(MCONTACT hContact, PROTORECVEVENT* pre) // Send a nudge //======================================================= -INT_PTR __cdecl CYahooProto::SendNudge(WPARAM hContact, LPARAM lParam) +INT_PTR __cdecl CYahooProto::SendNudge(WPARAM hContact, LPARAM) { debugLogA("[YAHOO_SENDNUDGE]"); diff --git a/protocols/Yahoo/src/libyahoo2/libyahoo2.cpp b/protocols/Yahoo/src/libyahoo2/libyahoo2.cpp index 22343fbc4b..a808d10e5e 100644 --- a/protocols/Yahoo/src/libyahoo2/libyahoo2.cpp +++ b/protocols/Yahoo/src/libyahoo2/libyahoo2.cpp @@ -3167,7 +3167,7 @@ static void yahoo_process_ignore(struct yahoo_input_data *yid, struct yahoo_pack } } -static void yahoo_process_stealth(struct yahoo_input_data *yid, struct yahoo_packet *pkt) +static void yahoo_process_stealth(struct yahoo_input_data*, struct yahoo_packet *pkt) { //struct yahoo_data *yd = yid->yd; char *who = NULL; @@ -3187,7 +3187,7 @@ static void yahoo_process_stealth(struct yahoo_input_data *yid, struct yahoo_pac NOTICE(("got %s stealth info for %s with value: %d", pkt->service == YAHOO_SERVICE_STEALTH_PERM ? "permanent": "session" , who, status == 1)); } -static void yahoo_process_voicechat(struct yahoo_input_data *yid, struct yahoo_packet *pkt) +static void yahoo_process_voicechat(struct yahoo_input_data*, struct yahoo_packet *pkt) { char *who = NULL; char *me = NULL; @@ -3564,7 +3564,7 @@ static void yahoo_process_ping(struct yahoo_input_data *yid, struct yahoo_packet YAHOO_CALLBACK(ext_yahoo_got_ping)(yid->yd->client_id, errormsg); } -static void yahoo_process_yab_update(struct yahoo_input_data *yid, struct yahoo_packet *pkt) +static void yahoo_process_yab_update(struct yahoo_input_data*, struct yahoo_packet *pkt) { char *who=NULL,*yentry=NULL; int svc=0; @@ -4340,7 +4340,7 @@ static void yahoo_process_pager_connection(struct yahoo_input_data *yid, int ove } } -static void yahoo_process_ft_connection(struct yahoo_input_data *yid, int over) +static void yahoo_process_ft_connection(struct yahoo_input_data*, int) { } @@ -4676,7 +4676,7 @@ static void (*yahoo_process_connection[])(struct yahoo_input_data *, int over) = yahoo_process_search_connection }; -int yahoo_read_ready(int id, INT_PTR fd, void *data) +int yahoo_read_ready(int, INT_PTR fd, void *data) { struct yahoo_input_data *yid = (struct yahoo_input_data *) data; struct yahoo_server_settings *yss; @@ -5138,7 +5138,7 @@ void yahoo_get_list(int id) } } -static void _yahoo_http_connected(int id, INT_PTR fd, int error, void *data) +static void _yahoo_http_connected(int, INT_PTR fd, int, void *data) { struct yahoo_input_data *yid = (struct yahoo_input_data *) data; if (fd <= 0) { @@ -5942,7 +5942,7 @@ void yahoo_webcam_invite(int id, const char *who) yahoo_packet_free(pkt); } -static void yahoo_search_internal(int id, int t, const char *text, int g, int ar, int photo, int yahoo_only, int startpos, int total) +static void yahoo_search_internal(int id, int t, const char *text, int g, int, int photo, int yahoo_only, int startpos, int total) { struct yahoo_data *yd = find_conn_by_id(id); struct yahoo_input_data *yid; diff --git a/protocols/Yahoo/src/links.cpp b/protocols/Yahoo/src/links.cpp index c9c6bd76dc..48af9ef88e 100644 --- a/protocols/Yahoo/src/links.cpp +++ b/protocols/Yahoo/src/links.cpp @@ -72,7 +72,7 @@ static char* get_buddy(TCHAR ** arg) send message: ymsgr:sendim?ID&m=MESSAGE add chatroom: ymsgr:chat?ROOM */ -static INT_PTR ServiceParseYmsgrLink(WPARAM wParam, LPARAM lParam) +static INT_PTR ServiceParseYmsgrLink(WPARAM, LPARAM lParam) { TCHAR *arg = (TCHAR*)lParam; if (arg == NULL) return 1; /* sanity check */ diff --git a/protocols/Yahoo/src/main.cpp b/protocols/Yahoo/src/main.cpp index 1672312335..b89e7d0199 100644 --- a/protocols/Yahoo/src/main.cpp +++ b/protocols/Yahoo/src/main.cpp @@ -141,7 +141,7 @@ extern "C" int __declspec(dllexport) Unload(void) * MirandaPluginInfoEx - Sets plugin info * Parameters: (DWORD mirandaVersion) */ -extern "C" __declspec(dllexport) PLUGININFOEX* MirandaPluginInfoEx(DWORD mirandaVersion) +extern "C" __declspec(dllexport) PLUGININFOEX* MirandaPluginInfoEx(DWORD) { return &pluginInfo; } diff --git a/protocols/Yahoo/src/proto.cpp b/protocols/Yahoo/src/proto.cpp index 70ebc1cdcc..eb84f7dd0e 100644 --- a/protocols/Yahoo/src/proto.cpp +++ b/protocols/Yahoo/src/proto.cpp @@ -138,7 +138,7 @@ MCONTACT CYahooProto::AddToList(int flags, PROTOSEARCHRESULT *psr) return hContact; } -MCONTACT __cdecl CYahooProto::AddToListByEvent(int flags, int /*iContact*/, MEVENT hDbEvent) +MCONTACT __cdecl CYahooProto::AddToListByEvent(int, int, MEVENT hDbEvent) { debugLogA("[YahooAddToListByEvent]"); if (!m_bLoggedIn) @@ -292,7 +292,7 @@ int __cdecl CYahooProto::AuthRequest(MCONTACT hContact, const TCHAR* msg) //////////////////////////////////////////////////////////////////////////////////////// // GetCaps - return protocol capabilities bits -DWORD_PTR __cdecl CYahooProto::GetCaps(int type, MCONTACT hContact) +DWORD_PTR __cdecl CYahooProto::GetCaps(int type, MCONTACT) { switch (type) { case PFLAGNUM_1: @@ -480,7 +480,7 @@ void __cdecl CYahooProto::get_status_thread(void *param) db_free(&dbv); } else { - int status = getWord(hContact, "YStatus", (WORD)YAHOO_STATUS_OFFLINE); + int status = getDword(hContact, "YStatus", YAHOO_STATUS_OFFLINE); sm = yahoo_status_code(yahoo_status(status)); if (sm) sm = strdup(sm); /* we need this to go global FREE later */ } @@ -589,7 +589,7 @@ int __cdecl CYahooProto::SetAwayMsg(int status, const TCHAR* msg) //////////////////////////////////////////////////////////////////////////////////////// // PS_GETMYAWAYMSG -INT_PTR __cdecl CYahooProto::GetMyAwayMsg(WPARAM wParam, LPARAM lParam) +INT_PTR __cdecl CYahooProto::GetMyAwayMsg(WPARAM, LPARAM lParam) { if (!m_bLoggedIn || !m_startMsg) return 0; @@ -733,7 +733,7 @@ INT_PTR CALLBACK first_run_dialog(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM return FALSE; } -INT_PTR CYahooProto::SvcCreateAccMgrUI(WPARAM wParam, LPARAM lParam) +INT_PTR CYahooProto::SvcCreateAccMgrUI(WPARAM, LPARAM lParam) { return (INT_PTR)CreateDialogParam(hInstance, MAKEINTRESOURCE(IDD_YAHOOACCOUNT), (HWND)lParam, first_run_dialog, (LPARAM)this); diff --git a/protocols/Yahoo/src/search.cpp b/protocols/Yahoo/src/search.cpp index 08feebb998..bd219e0e29 100644 --- a/protocols/Yahoo/src/search.cpp +++ b/protocols/Yahoo/src/search.cpp @@ -117,7 +117,7 @@ void CYahooProto::ext_got_search_result(int found, int start, int total, YList * * Returns: 0 on failure or HWND on success */ -static INT_PTR CALLBACK YahooSearchAdvancedDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam) +static INT_PTR CALLBACK YahooSearchAdvancedDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM) { switch (msg) { case WM_INITDIALOG: diff --git a/protocols/Yahoo/src/server.cpp b/protocols/Yahoo/src/server.cpp index 5c99d2d1b4..2d6b6c1853 100644 --- a/protocols/Yahoo/src/server.cpp +++ b/protocols/Yahoo/src/server.cpp @@ -13,7 +13,7 @@ #include "stdafx.h" #include -int PASCAL send(SOCKET s, const char FAR *buf, int len, int flags) +int PASCAL send(SOCKET s, const char FAR *buf, int len, int) { int rlen = Netlib_Send((HANDLE)s, buf, len, 0); @@ -30,7 +30,7 @@ int PASCAL send(SOCKET s, const char FAR *buf, int len, int flags) return len; } -int PASCAL recv(SOCKET s, char FAR *buf, int len, int flags) +int PASCAL recv(SOCKET s, char FAR *buf, int len, int) { int RecvResult = Netlib_Recv((HANDLE)s, buf, len, (len == 1) ? MSG_NODUMP : 0); diff --git a/protocols/Yahoo/src/services.cpp b/protocols/Yahoo/src/services.cpp index d3210ba217..158f024364 100644 --- a/protocols/Yahoo/src/services.cpp +++ b/protocols/Yahoo/src/services.cpp @@ -79,7 +79,7 @@ void CYahooProto::BroadcastStatus(int s) //======================================================= //Contact deletion event //======================================================= -int __cdecl CYahooProto::OnContactDeleted(WPARAM hContact, LPARAM lParam) +int __cdecl CYahooProto::OnContactDeleted(WPARAM hContact, LPARAM) { debugLogA("[YahooContactDeleted]"); @@ -195,7 +195,7 @@ static INT_PTR CALLBACK DlgProcSetCustStat(HWND hwndDlg, UINT msg, WPARAM wParam return FALSE; } -INT_PTR __cdecl CYahooProto::SetCustomStatCommand(WPARAM wParam, LPARAM lParam) +INT_PTR __cdecl CYahooProto::SetCustomStatCommand(WPARAM, LPARAM) { if (!m_bLoggedIn) { ShowNotification(TranslateT("Yahoo Error"), TranslateT("You need to be connected to set the custom message"), NIIF_ERROR); @@ -243,7 +243,7 @@ void CYahooProto::OpenURL(const char *url, int autoLogin) //======================================================= // Show buddy profile //======================================================= -INT_PTR __cdecl CYahooProto::OnShowProfileCommand(WPARAM wParam, LPARAM lParam) +INT_PTR __cdecl CYahooProto::OnShowProfileCommand(WPARAM wParam, LPARAM) { char tUrl[4096]; DBVARIANT dbv; @@ -326,7 +326,7 @@ INT_PTR __cdecl CYahooProto::OnRefreshCommand(WPARAM, LPARAM) return 0; } -int __cdecl CYahooProto::OnIdleEvent(WPARAM wParam, LPARAM lParam) +int __cdecl CYahooProto::OnIdleEvent(WPARAM, LPARAM lParam) { BOOL bIdle = (lParam & IDF_ISIDLE); diff --git a/protocols/Yahoo/src/user_info.cpp b/protocols/Yahoo/src/user_info.cpp index 5c4e573ce0..a6a8c89f1a 100644 --- a/protocols/Yahoo/src/user_info.cpp +++ b/protocols/Yahoo/src/user_info.cpp @@ -21,7 +21,7 @@ #include -static INT_PTR CALLBACK YahooUserInfoDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam) +static INT_PTR CALLBACK YahooUserInfoDlgProc(HWND hwndDlg, UINT msg, WPARAM, LPARAM lParam) { switch (msg) { case WM_INITDIALOG: diff --git a/protocols/Yahoo/src/webcam.cpp b/protocols/Yahoo/src/webcam.cpp index b52bdcff68..49888e7da0 100644 --- a/protocols/Yahoo/src/webcam.cpp +++ b/protocols/Yahoo/src/webcam.cpp @@ -24,24 +24,22 @@ #include /* WEBCAM callbacks */ -void ext_yahoo_got_webcam_image(int id, const char *who, - const unsigned char *image, unsigned int image_size, unsigned int real_size, - unsigned int timestamp) +void ext_yahoo_got_webcam_image(int, const char*, const unsigned char*, unsigned int, unsigned int, unsigned int) { LOG(("ext_yahoo_got_webcam_image")); } -void ext_yahoo_webcam_viewer(int id, const char *who, int connect) +void ext_yahoo_webcam_viewer(int, const char*, int) { LOG(("ext_yahoo_webcam_viewer")); } -void ext_yahoo_webcam_closed(int id, const char *who, int reason) +void ext_yahoo_webcam_closed(int, const char*, int) { LOG(("ext_yahoo_webcam_closed")); } -void ext_yahoo_webcam_data_request(int id, int send) +void ext_yahoo_webcam_data_request(int, int) { LOG(("ext_yahoo_webcam_data_request")); } @@ -53,7 +51,7 @@ void ext_yahoo_webcam_invite(int id, const char *me, const char *from) GETPROTOBYID(id)->ext_got_im(me, from, 0, Translate("[miranda] Got webcam invite. (not currently supported)"), 0, 0, 0, -1); } -void ext_yahoo_webcam_invite_reply(int id, const char *me, const char *from, int accept) +void ext_yahoo_webcam_invite_reply(int, const char*, const char*, int) { LOG(("ext_yahoo_webcam_invite_reply")); } diff --git a/protocols/Yahoo/src/yahoo.cpp b/protocols/Yahoo/src/yahoo.cpp index b9ffedfdd9..76a9eeb05a 100644 --- a/protocols/Yahoo/src/yahoo.cpp +++ b/protocols/Yahoo/src/yahoo.cpp @@ -323,7 +323,7 @@ void CYahooProto::ext_status_changed(const char *who, int protocol, int stat, co else setWord(hContact, "Status", ID_STATUS_ONTHEPHONE); - setWord(hContact, "YStatus", stat); + setDword(hContact, "YStatus", stat); setWord(hContact, "YAway", away); setWord(hContact, "Mobile", mobile); @@ -953,7 +953,7 @@ void CYahooProto::ext_system_message(const char *me, const char *who, const char ShowPopup((who != NULL) ? tszWho : TranslateT("Yahoo System Message"), tszMsg, NULL); } -void CYahooProto::ext_got_identities(const char *nick, const char *fname, const char *lname, YList * ids) +void CYahooProto::ext_got_identities(const char*, const char *fname, const char *lname, YList*) { LOG(("[ext_got_identities] First Name: %s, Last Name: %s", fname, lname)); @@ -1296,7 +1296,7 @@ struct connect_callback_data { void ext_yahoo_remove_handler(int id, unsigned int tag); -static void connect_complete(void *data, int source, yahoo_input_condition condition) +static void connect_complete(void *data, int source, yahoo_input_condition) { struct connect_callback_data *ccd = (connect_callback_data*)data; int error = 0;//, err_size = sizeof(error); @@ -1596,7 +1596,7 @@ void ext_yahoo_buddy_added(int id, char *myid, char *who, char *group, int statu GETPROTOBYID(id)->ext_buddy_added(myid, who, group, status, auth); } -void ext_yahoo_buddy_group_changed(int id, char *myid, char *who, char *old_group, char *new_group) +void ext_yahoo_buddy_group_changed(int, char*, char *who, char *old_group, char *new_group) { LOG(("[ext_yahoo_buddy_group_changed] %s has been moved from group: %s to: %s", who, old_group, new_group)); } -- cgit v1.2.3