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

enhanced qse_get_log_priority_by_name() to recognized a plus sign before the priority name

Browse Source
This commit is contained in:
hyung-hwan 2020-08-13 11:14:02 +00:00
parent 81ab05b6e8
commit 0313afba82
1 changed files with 52 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
qse/lib/si/log.c
View File

@ -759,21 +759,46 @@ int qse_get_log_priority_by_wcsname (const qse_wchar_t* name, const qse_wchar_t*
const qse_wchar_t* ptr; const qse_wchar_t* ptr;
int pri = 0; int pri = 0;
/* panic, info, debug,
* +info
*/
ptr = name; ptr = name;
while (ptr) while (ptr)
{ {
ptr = qse_wcstok(ptr, delim, &tok); ptr = qse_wcstok(ptr, delim, &tok);
if (tok.ptr) if (tok.ptr)
{ {
int plus = 0;
if (tok.len > 0 && tok.ptr[0] == '+')
{
tok.ptr++;
tok.len--;
plus = 1;
}
for (i = 0; i < QSE_COUNTOF(__priority_names); i++) for (i = 0; i < QSE_COUNTOF(__priority_names); i++)
{ {
#if defined(QSE_CHAR_IS_MCHAR) #if defined(QSE_CHAR_IS_MCHAR)
if (qse_wcsxmbscmp(tok.ptr, tok.len, __priority_names[i]) == 0) if (qse_wcsxmbscmp(tok.ptr, tok.len, __priority_names[i]) == 0)
#else #else
if (qse_strxcmp(tok.ptr, tok.len, __priority_names[i]) == 0) if (qse_strxcmp(tok.ptr, tok.len, __priority_names[i]) == 0)
#endif #endif
{ {
pri |= (1UL << i); if (plus)
{
qse_size_t j;
for (j = i; ; j--)
{
pri |= (1UL << j);
if (j == 0) break;
}
}
else
{
pri |= (1UL << i);
}
break; break;
} }
} }
@ -791,21 +816,46 @@ int qse_get_log_priority_by_mbsname (const qse_mchar_t* name, const qse_mchar_t*
const qse_mchar_t* ptr; const qse_mchar_t* ptr;
int pri = 0; int pri = 0;
/* panic, info, debug,
* +info
*/
ptr = name; ptr = name;
while (ptr) while (ptr)
{ {
ptr = qse_mbstok(ptr, delim, &tok); ptr = qse_mbstok(ptr, delim, &tok);
if (tok.ptr) if (tok.ptr)
{ {
int plus = 0;
if (tok.len > 0 && tok.ptr[0] == '+')
{
tok.ptr++;
tok.len--;
plus = 1;
}
for (i = 0; i < QSE_COUNTOF(__priority_names); i++) for (i = 0; i < QSE_COUNTOF(__priority_names); i++)
{ {
#if defined(QSE_CHAR_IS_MCHAR) #if defined(QSE_CHAR_IS_MCHAR)
if (qse_strxcmp(tok.ptr, tok.len, __priority_names[i]) == 0) if (qse_strxcmp(tok.ptr, tok.len, __priority_names[i]) == 0)
#else #else
if (qse_mbsxwcscmp(tok.ptr, tok.len, __priority_names[i]) == 0) if (qse_mbsxwcscmp(tok.ptr, tok.len, __priority_names[i]) == 0)
#endif #endif
{ {
pri |= (1UL << i); if (plus)
{
qse_size_t j;
for (j = i; ; j--)
{
pri |= (1UL << j);
if (j == 0) break;
}
}
else
{
pri |= (1UL << i);
}
break; break;
} }
} }