mir_*printf patch for protocols

git-svn-id: http://svn.miranda-ng.org/main/trunk@5690 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

5 files changed, 9 insertions, 9 deletions

diff --git a/protocols/Yahoo/src/chat.cpp b/protocols/Yahoo/src/chat.cpp
index d5a0010ff4..e4edd7cc3d 100644
--- a/protocols/Yahoo/src/chat.cpp
+++ b/protocols/Yahoo/src/chat.cpp
@@ -53,7 +53,7 @@ void CALLBACK ConferenceRequestCB(PVOID dwParam);
 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];

-	_snprintf(z, sizeof(z), Translate("[miranda] Got conference invite to room: %s with msg: %s"), room ?room:"", msg ?msg:"");

+	mir_snprintf(z, sizeof(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);

diff --git a/protocols/Yahoo/src/file_transfer.cpp b/protocols/Yahoo/src/file_transfer.cpp
index 4c74801976..b629e39a7b 100644
--- a/protocols/Yahoo/src/file_transfer.cpp
+++ b/protocols/Yahoo/src/file_transfer.cpp
@@ -556,7 +556,7 @@ void CYahooProto::ext_got_files(const char *me, const char *who, const char *ft_
 		char z[1024];

 		struct yahoo_file_info *fi = (struct yahoo_file_info *) f->data;

 

-		snprintf(z, 1024, "%s (%lu)\r\n", fi->filename, fi->filesize);

+		mir_snprintf(z, 1024, "%s (%lu)\r\n", fi->filename, fi->filesize);

 		lstrcatA(fn, z);

 		fc++;

 	}

diff --git a/protocols/Yahoo/src/im.cpp b/protocols/Yahoo/src/im.cpp
index 0fb7aa160a..5fc8f536e0 100644
--- a/protocols/Yahoo/src/im.cpp
+++ b/protocols/Yahoo/src/im.cpp
@@ -40,7 +40,7 @@ void CYahooProto::ext_got_im(const char *me, const char *who, int protocol, cons
 	if (stat == 2) {

 		char z[1024];

 

-		snprintf(z, sizeof z, "Error sending message to %s", who);

+		mir_snprintf(z, SIZEOF(z), "Error sending message to %s", who);

 		LOG((z));

 		ShowError( TranslateT("Yahoo Error"), _A2T(z));

 		return;

diff --git a/protocols/Yahoo/src/util.cpp b/protocols/Yahoo/src/util.cpp
index f2e3ecda7a..668a6cfe06 100644
--- a/protocols/Yahoo/src/util.cpp
+++ b/protocols/Yahoo/src/util.cpp
@@ -28,7 +28,7 @@ int CYahooProto::DebugLog( const char *fmt, ... )
 	va_list vararg;

 	va_start( vararg, fmt );

 	

-	int tBytes = _vsnprintf( str, sizeof( str ), fmt, vararg );

+	int tBytes = mir_vsnprintf(str, sizeof(str), fmt, vararg);

 	if ( tBytes > 0)

 		str[ tBytes ] = 0;

 

@@ -45,7 +45,7 @@ int DebugLog( const char *fmt, ... )
 	va_list vararg;

 	va_start( vararg, fmt );

 	

-	int tBytes = _vsnprintf( str, sizeof( str ), fmt, vararg );

+	int tBytes = mir_vsnprintf(str, sizeof(str), fmt, vararg);

 	if ( tBytes > 0)

 		str[ tBytes ] = 0;

 

@@ -203,7 +203,7 @@ extern PLUGININFOEX pluginInfo;
 void CYahooProto::YAHOO_utils_logversion()

 {

     char str[256];

-    _snprintf(str, sizeof(str), "Yahoo v%d.%d.%d.%d", (pluginInfo.version >> 24) & 0xFF, (pluginInfo.version >> 16) & 0xFF,

+    mir_snprintf(str, sizeof(str), "Yahoo v%d.%d.%d.%d", (pluginInfo.version >> 24) & 0xFF, (pluginInfo.version >> 16) & 0xFF,

               (pluginInfo.version >> 8) & 0xFF, pluginInfo.version & 0xFF);

     DebugLog(str);

 }

diff --git a/protocols/Yahoo/src/yahoo.cpp b/protocols/Yahoo/src/yahoo.cpp
index 4191ab03c1..71b9359b99 100644
--- a/protocols/Yahoo/src/yahoo.cpp
+++ b/protocols/Yahoo/src/yahoo.cpp
@@ -1440,7 +1440,7 @@ char * CYahooProto::ext_send_https_request(struct yahoo_data *yd, const char *ho
 	char z[4096], *result=NULL;

 	int i;

 	

-	wsprintfA(z, "https://%s%s", host, path);

+	mir_snprintf(z, SIZEOF(z), "https://%s%s", host, path);

 	nlhr.cbSize		= sizeof(nlhr);

 	nlhr.requestType= REQUEST_GET;

 	nlhr.flags		= NLHRF_HTTP11 | NLHRF_NODUMPSEND | NLHRF_DUMPASTEXT; /* Use HTTP/1.1 and don't dump the requests to the log */

@@ -1511,7 +1511,7 @@ void CYahooProto::ext_login(enum yahoo_status login_mode)
 	NETLIBHTTPREQUEST nlhr={0},*nlhrReply;

 	char z[4096];

 

-	wsprintfA(z, "http://%s%s", getByte("YahooJapan",0) != 0 ? "cs1.msg.vip.ogk.yahoo.co.jp" : "vcs.msg.yahoo.com", "/capacity");

+	mir_snprintf(z, SIZEOF(z), "http://%s%s", getByte("YahooJapan",0) != 0 ? "cs1.msg.vip.ogk.yahoo.co.jp" : "vcs.msg.yahoo.com", "/capacity");

 	nlhr.cbSize		= sizeof(nlhr);

 	nlhr.requestType= REQUEST_GET;

 	nlhr.flags		= NLHRF_HTTP11;

@@ -1548,7 +1548,7 @@ void CYahooProto::ext_login(enum yahoo_status login_mode)
 			db_free(&dbv);

 		}

 		else {

-			snprintf(host, sizeof(host), "%s", 

+			mir_snprintf(host, sizeof(host), "%s", 

 							getByte("YahooJapan",0) != 0 ? YAHOO_DEFAULT_JAPAN_LOGIN_SERVER :

 															YAHOO_DEFAULT_LOGIN_SERVER

 					);