mir_sntprintf & mir_snvtprintf renamed to mir_snwprintf & mir_snwprintf respectively

mir_sntprintf & mir_snvtprintf are now macros, as they should be from the very beginning

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

2 files changed, 0 insertions, 31 deletions

diff --git a/plugins/UserInfoEx/src/mir_string.cpp b/plugins/UserInfoEx/src/mir_string.cpp
index c538c110ad..206b16a609 100644
--- a/plugins/UserInfoEx/src/mir_string.cpp
+++ b/plugins/UserInfoEx/src/mir_string.cpp
@@ -98,34 +98,6 @@ char	*mir_strnerase(char *pszDest, size_t sizeFrom, size_t sizeTo) {
 	return pszDest;

 }

 

-size_t mir_vsnwprintf(wchar_t *pszDest, const size_t cchDest, const wchar_t *pszFormat, va_list& argList)

-{

-	size_t iRet, cchMax;

-

-	if (!pszDest || !pszFormat || !*pszFormat)

-		return -1;

-

-	cchMax = cchDest - 1;

-	iRet = _vsnwprintf(pszDest, cchMax, pszFormat, argList);

-	if (iRet < 0) pszDest[0] = 0;

-	else if (iRet >= cchMax) {

-		pszDest[cchMax] = 0;

-		iRet = cchMax;

-	}

-	return iRet;

-}

-

-size_t mir_snwprintf(wchar_t *pszDest, const size_t cchDest, const wchar_t *pszFormat, ...)

-{

-	size_t iRet;

-	va_list argList;

-

-	va_start(argList, pszFormat);

-	iRet = mir_vsnwprintf(pszDest, cchDest, pszFormat, argList);

-		va_end(argList);

-	return iRet;

-}

-

 int mir_IsEmptyA(char *str)

 {

 	if (str == NULL || str[0] == 0)

diff --git a/plugins/UserInfoEx/src/mir_string.h b/plugins/UserInfoEx/src/mir_string.h
index 61a1b623a6..3282e767e2 100644
--- a/plugins/UserInfoEx/src/mir_string.h
+++ b/plugins/UserInfoEx/src/mir_string.h
@@ -68,9 +68,6 @@ wchar_t *	mir_wcsncat(wchar_t *pszDest, const wchar_t *pszSrc, const size_t cchD
 char *		mir_strncat_c(char *pszDest, const char cSrc);

 char *		mir_wcsncat_c(char *pszDest, const char cSrc);

 

-size_t		mir_vsnwprintf(wchar_t *pszDest, const size_t cchDest, const wchar_t *pszFormat, va_list& argList);

-size_t		mir_snwprintf (wchar_t *pszDest, const size_t cchDest, const wchar_t *pszFormat, ...);

-

 char *		mir_strnerase(char *pszDest, size_t sizeFrom, size_t sizeTo);

 

 int			mir_IsEmptyA(char *str);