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, 12 insertions, 6 deletions

diff --git a/include/delphi/m_core.inc b/include/delphi/m_core.inc
index 921f3e64b2..94ac1a7089 100644
--- a/include/delphi/m_core.inc
+++ b/include/delphi/m_core.inc
@@ -514,12 +514,12 @@ function PathToRelativeW(const pSrc:pWideChar; pOut:pWideChar):int; stdcall;
 

 function mir_snprintf(buffer:pAnsiChar;count:size_t;fmt:pAnsiChar{, ...}):int; stdcall;

                  external CoreDLL name 'mir_snprintf';

-function mir_sntprintf(buffer:pWideChar;count:size_t;fmt:pWideChar{, ...}):int; stdcall;

-                 external CoreDLL name 'mir_sntprintf';

+function mir_snwprintf(buffer:pWideChar;count:size_t;fmt:pWideChar{, ...}):int; stdcall;

+                 external CoreDLL name 'mir_snwprintf';

 function mir_vsnprintf(buffer:pAnsiChar;count:size_t;fmt:pAnsiChar;va:va_list):int; stdcall;

                  external CoreDLL name 'mir_vsnprintf';

-function mir_vsntprintf(buffer:pWideChar;count:size_t;fmt:pWideChar;va:va_list):int; stdcall;

-                 external CoreDLL name 'mir_vsntprintf';

+function mir_vsnwprintf(buffer:pWideChar;count:size_t;fmt:pWideChar;va:va_list):int; stdcall;

+                 external CoreDLL name 'mir_vsnwprintf';

 

 

 ///////////////////////////////////////////////////////////////////////////////

diff --git a/include/m_core.h b/include/m_core.h
index b0bc86a244..3167bc514b 100644
--- a/include/m_core.h
+++ b/include/m_core.h
@@ -588,9 +588,9 @@ MIR_CORE_DLL(int)    PathToRelativeW(const WCHAR *pSrc, WCHAR *pOut);
 // print functions

 

 MIR_CORE_DLL(int)    mir_snprintf(char *buffer, size_t count, const char* fmt, ...);

-MIR_CORE_DLL(int)    mir_sntprintf(TCHAR *buffer, size_t count, const TCHAR* fmt, ...);

+MIR_CORE_DLL(int)    mir_snwprintf(WCHAR *buffer, size_t count, const WCHAR* fmt, ...);

 MIR_CORE_DLL(int)    mir_vsnprintf(char *buffer, size_t count, const char* fmt, va_list va);

-MIR_CORE_DLL(int)    mir_vsntprintf(TCHAR *buffer, size_t count, const TCHAR* fmt, va_list va);

+MIR_CORE_DLL(int)    mir_vsnwprintf(WCHAR *buffer, size_t count, const WCHAR* fmt, va_list va);

 

 ///////////////////////////////////////////////////////////////////////////////

 // protocol functions

@@ -733,6 +733,9 @@ __forceinline char* lrtrimp(char *str) { return ltrimp(rtrim(str)); };
 

 	#define wildcmpt wildcmpw

 	#define wildcmpit wildcmpiw

+

+	#define mir_sntprintf mir_snwprintf

+	#define mir_vsntprintf mir_vsnwprintf

 #else

 	#define mir_t2a(s) mir_strdup(s)

 	#define mir_a2t(s) mir_strdup(s)

@@ -754,6 +757,9 @@ __forceinline char* lrtrimp(char *str) { return ltrimp(rtrim(str)); };
 

 	#define wildcmpt wildcmp

 	#define wildcmpit wildcmpi

+

+	#define mir_sntprintf mir_snprintf

+	#define mir_vsntprintf mir_vsnprintf

 #endif

 

 MIR_CORE_DLL(WCHAR*) mir_a2u_cp(const char* src, int codepage);