From 825cf63d04fbdcdf094504dfc9325fe805fc2ff0 Mon Sep 17 00:00:00 2001 From: hyung-hwan Date: Mon, 15 Jan 2018 14:00:02 +0000 Subject: [PATCH] deleted unneeded macros --- qse/include/qse/macros.h | 9 +-------- qse/lib/cmn/str-cmp.c | 14 +++++++------- 2 files changed, 8 insertions(+), 15 deletions(-) diff --git a/qse/include/qse/macros.h b/qse/include/qse/macros.h index c03f20f0..e85a5c8a 100644 --- a/qse/include/qse/macros.h +++ b/qse/include/qse/macros.h @@ -268,8 +268,6 @@ #define QSE_MQ_I(val) #val #define QSE_MQ(val) QSE_MQ_I(val) -#define QSE_MC(ch) ((qse_mchar_t)ch) -#define QSE_MS(str) ((const qse_mchar_t*)str) /** * The #QSE_MT macro maps a multi-byte literal string literal as it is. */ @@ -277,8 +275,7 @@ #define QSE_WQ_I(val) (L ## #val) #define QSE_WQ(val) QSE_WQ_I(val) -#define QSE_WC(ch) ((qse_wchar_t)L ## ch) -#define QSE_WS(str) ((const qse_wchar_t*)L ## str) + /** * The #QSE_WT macro maps a multi-byte literal string to a wide character * string by prefixing it with \b L. @@ -295,13 +292,9 @@ */ #if defined(QSE_CHAR_IS_MCHAR) # define QSE_Q(val) QSE_MQ(val) -# define QSE_C(ch) QSE_MC(ch) -# define QSE_S(str) QSE_MS(str) # define QSE_T(txt) QSE_MT(txt) #else # define QSE_Q(val) QSE_WQ(val) -# define QSE_C(ch) QSE_WC(ch) -# define QSE_S(str) QSE_WS(str) # define QSE_T(txt) QSE_WT(txt) #endif diff --git a/qse/lib/cmn/str-cmp.c b/qse/lib/cmn/str-cmp.c index ec2ca79a..a9cb6a52 100644 --- a/qse/lib/cmn/str-cmp.c +++ b/qse/lib/cmn/str-cmp.c @@ -49,7 +49,7 @@ int qse_mbsxcmp (const qse_mchar_t* s1, qse_size_t ln, const qse_mchar_t* s2) } /* if s1 < end, *s2 must be '\0'. */ - return (s1 < end)? 1: (*s2 == QSE_MT('\0')? 0: -1); + return (s1 < end)? 1: ((*s2 == QSE_MT('\0'))? 0: -1); } int qse_mbsxncmp ( @@ -80,7 +80,7 @@ int qse_mbscasecmp (const qse_mchar_t* s1, const qse_mchar_t* s2) { while (QSE_TOMUPPER((qse_mchau_t)*s1) == QSE_TOMUPPER((qse_mchau_t)*s2)) { - if (*s1 == QSE_C('\0')) return 0; + if (*s1 == QSE_T('\0')) return 0; s1++; s2++; } @@ -100,7 +100,7 @@ int qse_mbsxcasecmp (const qse_mchar_t* s1, qse_size_t ln, const qse_mchar_t* s2 s1++; s2++; } - return (s1 < end)? 1: (*s2 == QSE_MT('\0')? 0: -1); + return (s1 < end)? 1: ((*s2 == QSE_MT('\0'))? 0: -1); } int qse_mbsxncasecmp ( @@ -177,7 +177,7 @@ int qse_wcsxcmp (const qse_wchar_t* s1, qse_size_t ln, const qse_wchar_t* s2) s1++; s2++; } - return (s1 < end)? 1: (*s2 == QSE_WT('\0')? 0: -1); + return (s1 < end)? 1: ((*s2 == QSE_WT('\0'))? 0: -1); } int qse_wcsxncmp ( @@ -208,8 +208,8 @@ int qse_wcscasecmp (const qse_wchar_t* s1, const qse_wchar_t* s2) { while (QSE_TOWUPPER((qse_wchau_t)*s1) == QSE_TOWUPPER((qse_wchau_t)*s2)) { - if (*s1 == QSE_C('\0')) return 0; - s1++, s2++; + if (*s1 == QSE_T('\0')) return 0; + s1++; s2++; } return (QSE_TOWUPPER((qse_wchau_t)*s1) > QSE_TOWUPPER((qse_wchau_t)*s2))? 1: -1; @@ -227,7 +227,7 @@ int qse_wcsxcasecmp (const qse_wchar_t* s1, qse_size_t ln, const qse_wchar_t* s2 if (c1 != c2) return (c1 > c2)? 1: -1; s1++; s2++; } - return (s1 < end)? 1: (*s2 == QSE_WT('\0')? 0: -1); + return (s1 < end)? 1: ((*s2 == QSE_WT('\0'))? 0: -1); } int qse_wcsxncasecmp (