hyung-hwan/qse
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

deleted unneeded macros

Browse Source
This commit is contained in:
hyung-hwan 2018-01-15 14:00:02 +00:00
parent 5d71710b18
commit 825cf63d04
2 changed files with 8 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
qse/include/qse/macros.h
View File

@ -268,8 +268,6 @@
#define QSE_MQ_I(val) #val #define QSE_MQ_I(val) #val
#define QSE_MQ(val) QSE_MQ_I(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. * 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_I(val) (L ## #val)
#define QSE_WQ(val) QSE_WQ_I(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 * The #QSE_WT macro maps a multi-byte literal string to a wide character
* string by prefixing it with \b L. * string by prefixing it with \b L.
@ -295,13 +292,9 @@
*/ */
#if defined(QSE_CHAR_IS_MCHAR) #if defined(QSE_CHAR_IS_MCHAR)
# define QSE_Q(val) QSE_MQ(val) # 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) # define QSE_T(txt) QSE_MT(txt)
#else #else
# define QSE_Q(val) QSE_WQ(val) # 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) # define QSE_T(txt) QSE_WT(txt)
#endif #endif

14
qse/lib/cmn/str-cmp.c
View File

@ -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'. */ /* 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 ( 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)) 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++; 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++; 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 ( 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++; 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 ( 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)) while (QSE_TOWUPPER((qse_wchau_t)*s1) == QSE_TOWUPPER((qse_wchau_t)*s2))
{ {
if (*s1 == QSE_C('\0')) return 0; if (*s1 == QSE_T('\0')) return 0;
s1++, s2++; s1++; s2++;
} }
return (QSE_TOWUPPER((qse_wchau_t)*s1) > QSE_TOWUPPER((qse_wchau_t)*s2))? 1: -1; 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; if (c1 != c2) return (c1 > c2)? 1: -1;
s1++; 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_wcsxncasecmp ( int qse_wcsxncasecmp (