summaryrefslogtreecommitdiff
path: root/protocols/Yahoo/src
diff options
context:
space:
mode:
authorGeorge Hazan <george.hazan@gmail.com>2013-08-16 10:57:40 +0000
committerGeorge Hazan <george.hazan@gmail.com>2013-08-16 10:57:40 +0000
commit30ee89a6764a8d38a078374c6ed5de70635b42c0 (patch)
tree464bbd4c8e32200107d42c5f95b13134edf42888 /protocols/Yahoo/src
parente3c401f192327347151a70596a6b0b493bc762b1 (diff)
rest or mir_*printf in protocols
git-svn-id: http://svn.miranda-ng.org/main/trunk@5715 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'protocols/Yahoo/src')
-rw-r--r--protocols/Yahoo/src/services.cpp8
-rw-r--r--protocols/Yahoo/src/yahoo.cpp2
-rw-r--r--protocols/Yahoo/src/yahoo.h6
3 files changed, 5 insertions, 11 deletions
diff --git a/protocols/Yahoo/src/services.cpp b/protocols/Yahoo/src/services.cpp
index d8fdc1883a..2f88106ea1 100644
--- a/protocols/Yahoo/src/services.cpp
+++ b/protocols/Yahoo/src/services.cpp
@@ -227,7 +227,7 @@ void CYahooProto::OpenURL(const char *url, int autoLogin)
y = yahoo_urlencode(yahoo_get_cookie(m_id, "y"));
t = yahoo_urlencode(yahoo_get_cookie(m_id, "t"));
u = yahoo_urlencode(url);
- _snprintf( tUrl, sizeof( tUrl ),
+ mir_snprintf(tUrl, sizeof(tUrl),
"http://msg.edit.yahoo.com/config/reset_cookies?&.y=Y=%s&.t=T=%s&.ver=2&.done=http%%3a//us.rd.yahoo.com/messenger/client/%%3f%s",
y, t, u);
@@ -235,7 +235,7 @@ void CYahooProto::OpenURL(const char *url, int autoLogin)
FREE(t);
FREE(u);
} else {
- _snprintf( tUrl, sizeof( tUrl ), url );
+ mir_snprintf(tUrl, sizeof(tUrl), url);
}
DebugLog("[YahooOpenURL] url: %s Final URL: %s", url, tUrl);
@@ -261,7 +261,7 @@ INT_PTR __cdecl CYahooProto::OnShowProfileCommand( WPARAM wParam, LPARAM lParam
if (getString((HANDLE)wParam, YAHOO_LOGINID, &dbv))
return 0;
- _snprintf( tUrl, sizeof( tUrl ), "http://profiles.yahoo.com/%s", dbv.pszVal );
+ mir_snprintf(tUrl, sizeof(tUrl), "http://profiles.yahoo.com/%s", dbv.pszVal);
db_free(&dbv);
OpenURL(tUrl, 0);
@@ -287,7 +287,7 @@ INT_PTR __cdecl CYahooProto::OnShowMyProfileCommand( WPARAM wParam, LPARAM lPara
}
char tUrl[ 4096 ];
- _snprintf( tUrl, sizeof( tUrl ), "http://profiles.yahoo.com/%s", dbv.pszVal );
+ mir_snprintf(tUrl, sizeof(tUrl), "http://profiles.yahoo.com/%s", dbv.pszVal);
db_free(&dbv);
OpenURL(tUrl, 0);
diff --git a/protocols/Yahoo/src/yahoo.cpp b/protocols/Yahoo/src/yahoo.cpp
index 71b9359b99..21d36e7b91 100644
--- a/protocols/Yahoo/src/yahoo.cpp
+++ b/protocols/Yahoo/src/yahoo.cpp
@@ -1043,7 +1043,7 @@ void ext_yahoo_got_cookies(int id)
//wsprintfA(z, "Cookie: %s; C=%s; Y=%s; T=%s", Bcookie, yahoo_get_cookie(id, "c"), yahoo_get_cookie(id, "y"), yahoo_get_cookie(id, "t"));
//wsprintfA(z, "Cookie: %s; Y=%s", Bcookie, yahoo_get_cookie(id, "y"), yahoo_get_cookie(id, "t"));
- wsprintfA(z, "Cookie: Y=%s; T=%s", yahoo_get_cookie(id, "y"), yahoo_get_cookie(id, "t"));
+ mir_snprintf(z, SIZEOF(z), "Cookie: Y=%s; T=%s", yahoo_get_cookie(id, "y"), yahoo_get_cookie(id, "t"));
LOG(("Our Cookie: '%s'", z));
CallService(MS_NETLIB_SETSTICKYHEADERS, (WPARAM)hnuMain, (LPARAM)z);*/
diff --git a/protocols/Yahoo/src/yahoo.h b/protocols/Yahoo/src/yahoo.h
index 5c17ed2f5a..ac60c1cc1c 100644
--- a/protocols/Yahoo/src/yahoo.h
+++ b/protocols/Yahoo/src/yahoo.h
@@ -13,12 +13,6 @@
#ifndef _YAHOO_YAHOO_H_
#define _YAHOO_YAHOO_H_
-#define MIRANDA_VER 0x0A00
-
-#ifdef _MSC_VER
- #define snprintf _snprintf
-#endif
-
#include <windows.h>
#include <shlwapi.h>