defined QSE_APP_LOG4 through QSE_APP_LOG9

added QSE::App::setCmgr() and QSE::App::getCmgr()
fixed a wrong memory disposal call in awk/run.c
fixed some syntax issues in the QSE_CHAR_IS_MCHAR mode
initialized best.len and cur.len to 0s in qse_ip6adtombs() and qse_ip6adtowcs()
This commit is contained in:
2019-06-12 07:07:18 +00:00
parent 12eacceec0
commit 7f57afe262
9 changed files with 74 additions and 34 deletions

View File

@ -208,11 +208,11 @@ int qse_fs_move (qse_fs_t* fs, const qse_char_t* oldpath, const qse_char_t* newp
QSE_MEMSET (&fop, 0, QSE_SIZEOF(fop));
#if defined(QSE_CHAR_IS_MCHAR)
fop.old_path = oldpath;
fop.new_path = newpath;
fop.old_path = (qse_char_t*)oldpath;
fop.new_path = (qse_char_t*)newpath;
#else
fop.old_path = qse_wcstombsdup (oldpath, QSE_NULL, fs->mmgr);
fop.new_path = qse_wcstombsdup (newpath, QSE_NULL, fs->mmgr);
fop.old_path = qse_wcstombsdup(oldpath, QSE_NULL, fs->mmgr);
fop.new_path = qse_wcstombsdup(newpath, QSE_NULL, fs->mmgr);
if (fop.old_path == QSE_NULL || fop.old_path == QSE_NULL)
{
fs->errnum = QSE_FS_ENOMEM;
@ -281,16 +281,16 @@ int qse_fs_move (qse_fs_t* fs, const qse_char_t* oldpath, const qse_char_t* newp
{
/* the destination is a directory. move the source file
* into the destination directory */
const qse_wchar_t* arr[4];
const qse_char_t* arr[4];
arr[0] = newpath;
arr[1] = QSE_T("/");
arr[2] = qse_basename(oldpath);
arr[3] = QSE_NULL;
#if defined(QSE_CHAR_IS_MCHAR)
fop.new_path2 = qse_stradup (arr, QSE_NULL, fs->mmgr);
fop.new_path2 = qse_stradup(arr, QSE_NULL, fs->mmgr);
#else
fop.new_path2 = qse_wcsatombsdup (arr, QSE_NULL, fs->mmgr);
fop.new_path2 = qse_wcsatombsdup(arr, QSE_NULL, fs->mmgr);
#endif
if (fop.new_path2 == QSE_NULL)
{