safe lstr* replacements: mir_strlen, mir_wstrlen, mir_strcpy, mir_wstrcpy,

mir_strncpy, mir_wstrncpy, mir_strcat, mir_wstrcat, mir_strncat, mir_wstrncat


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

1 files changed, 13 insertions, 33 deletions

diff --git a/plugins/UserInfoEx/src/mir_string.h b/plugins/UserInfoEx/src/mir_string.h
index 3282e767e2..9e075820be 100644
--- a/plugins/UserInfoEx/src/mir_string.h
+++ b/plugins/UserInfoEx/src/mir_string.h
@@ -22,27 +22,15 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 #ifndef _MIR_STRING_H_INCLUDED_

 #define _MIR_STRING_H_INCLUDED_

 

-#define mir_wcsdup		mir_wstrdup

+#define mir_tcscmp    mir_wcscmp

+#define mir_tcsncmp   mir_wcsncmp

+#define mir_tcsicmp   mir_wcsicmp

+#define mir_tcsnicmp  mir_wcsnicmp

+#define mir_tcschr    mir_wcschr

+#define mir_tcsrchr   mir_wcsrchr

+#define mir_tcsncat_c mir_wcsncat_c

+#define mir_IsEmpty   mir_IsEmptyW

 

-

- #define mir_tcslen		mir_wcslen

- #define mir_tcscpy		mir_wcscpy

- #define mir_tcsncpy	mir_wcsncpy

- #define mir_tcsncat	mir_wcsncat

- #define mir_tcsdup		mir_wcsdup

- #define mir_tcscmp		mir_wcscmp

- #define mir_tcsncmp	mir_wcsncmp

- #define mir_tcsicmp	mir_wcsicmp

- #define mir_tcsnicmp	mir_wcsnicmp

- #define mir_tcschr		mir_wcschr

- #define mir_tcsrchr	mir_wcsrchr

- #define mir_tcsncat_c	mir_wcsncat_c

- #define mir_IsEmpty	mir_IsEmptyW

-

-

-

-#define mir_strlen(s)			(((s)!=0)?strlen(s):0)

-#define mir_strcpy(d,s)			(((s)!=0&&(d)!=0)?strcpy(d,s):0)

 #define mir_strcmp(s1,s2)		((s1)==0||(s2)==0||strcmp((s1),(s2)))

 #define mir_strncmp(s1,s2,n)	((s1)==0||(s2)==0||strncmp((s1),(s2),(n)))

 #define mir_stricmp(s1,s2)		((s1)==0||(s2)==0||_stricmp((s1),(s2)))

@@ -50,8 +38,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 #define mir_strchr(s,c)			(((s)!=0)?strchr((s),(c)):0)

 #define mir_strrchr(s,c)		(((s)!=0)?strrchr((s),(c)):0)

 

-#define mir_wcslen(s)			(((s)!=0)?wcslen(s):0)

-#define mir_wcscpy(d,s)			(((s)!=0&&(d)!=0)?wcscpy(d,s):0)

 #define mir_wcscmp(s1,s2)		((s1)==0||(s2)==0||wcscmp((s1),(s2)))

 #define mir_wcsncmp(s1,s2,n)	((s1)==0||(s2)==0||wcsncmp((s1),(s2),(n)))

 #define mir_wcsicmp(s1,s2)		((s1)==0||(s2)==0||_wcsicmp((s1),(s2)))

@@ -59,18 +45,12 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 #define mir_wcschr(s,c)			(((s)!=0)?wcschr((s),(c)):0)

 #define mir_wcsrchr(s,c)		(((s)!=0)?wcsrchr((s),(c)):0)

 

-char *		mir_strncpy(char *pszDest, const char *pszSrc, const size_t cchDest);

-wchar_t *	mir_wcsncpy(wchar_t *pszDest, const wchar_t *pszSrc, const size_t cchDest);

-

-char *		mir_strncat(char *pszDest, const char *pszSrc, const size_t cchDest);

-wchar_t *	mir_wcsncat(wchar_t *pszDest, const wchar_t *pszSrc, const size_t cchDest);

-

-char *		mir_strncat_c(char *pszDest, const char cSrc);

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

+char* mir_strncat_c(char *pszDest, const char cSrc);

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

 

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

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

 

-int			mir_IsEmptyA(char *str);

-int			mir_IsEmptyW(wchar_t *str);

+int   mir_IsEmptyA(char *str);

+int   mir_IsEmptyW(wchar_t *str);

 

 #endif /* _MIR_STRING_H_INCLUDED_ */
\ No newline at end of file