From 9f889d8243596627154ebcee9f89eac002d7392c Mon Sep 17 00:00:00 2001 From: hyung-hwan Date: Thu, 29 Aug 2019 09:09:37 +0000 Subject: [PATCH] corrected swapped code between qse_awk_rtx_findfunwithmbs() and qse_awk_rtx_findfunwithwcs() --- qse/lib/awk/err.c | 2 +- qse/lib/awk/run.c | 20 ++++++++++---------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/qse/lib/awk/err.c b/qse/lib/awk/err.c index 6c0def9d..113f408c 100644 --- a/qse/lib/awk/err.c +++ b/qse/lib/awk/err.c @@ -320,7 +320,7 @@ const qse_mchar_t* qse_awk_rtx_geterrmsgasmbs (qse_awk_rtx_t* rtx) qse_size_t wcslen, mbslen; msg = (rtx->errinf.msg[0] == QSE_T('\0')) ? - qse_awk_geterrstr(rtx->awk)(rtx->awk,rtx->errinf.num): rtx->errinf.msg; + qse_awk_geterrstr(rtx->awk)(rtx->awk, rtx->errinf.num): rtx->errinf.msg; mbslen = QSE_COUNTOF(rtx->merrmsg); qse_wcstombswithcmgr(msg, &wcslen, rtx->merrmsg, &mbslen, qse_awk_rtx_getcmgr(rtx)); diff --git a/qse/lib/awk/run.c b/qse/lib/awk/run.c index 84fbb796..fe39ee53 100644 --- a/qse/lib/awk/run.c +++ b/qse/lib/awk/run.c @@ -1533,12 +1533,12 @@ qse_awk_fun_t* qse_awk_rtx_findfunwithmbs (qse_awk_rtx_t* rtx, const qse_mchar_t #if defined(QSE_CHAR_IS_MCHAR) return find_fun(rtx, name); #else - qse_mcstr_t mbs; + qse_wcstr_t wcs; qse_awk_fun_t* fun; - mbs.ptr = qse_awk_rtx_wcstombsdup(rtx, name, &mbs.len); - if (!mbs.ptr) return -1; - fun = find_fun(rtx, mbs.ptr); - qse_awk_rtx_freemem (rtx, mbs.ptr); + wcs.ptr = qse_awk_rtx_mbstowcsdup(rtx, name, &wcs.len); + if (!wcs.ptr) return QSE_NULL; + fun = find_fun(rtx, wcs.ptr); + qse_awk_rtx_freemem (rtx, wcs.ptr); return fun; #endif } @@ -1546,12 +1546,12 @@ qse_awk_fun_t* qse_awk_rtx_findfunwithmbs (qse_awk_rtx_t* rtx, const qse_mchar_t qse_awk_fun_t* qse_awk_rtx_findfunwithwcs (qse_awk_rtx_t* rtx, const qse_wchar_t* name) { #if defined(QSE_CHAR_IS_MCHAR) - qse_wcstr_t wcs; + qse_mcstr_t mbs; qse_awk_fun_t* fun; - wcs.ptr = qse_awk_rtx_mbstowcsdup(rtx, name, &wcs.len); - if (!wcs.ptr) return -1; - fun = find_fun(rtx, wcs.ptr); - qse_awk_rtx_freemem (rtx, wcs.ptr); + mbs.ptr = qse_awk_rtx_wcstombsdup(rtx, name, &mbs.len); + if (!mbs.ptr) return QSE_NULL; + fun = find_fun(rtx, mbs.ptr); + qse_awk_rtx_freemem (rtx, mbs.ptr); return fun; #else return find_fun(rtx, name);