From 69b118fcbf4ed2739eed22dfe1abc8c25fe18253 Mon Sep 17 00:00:00 2001 From: hyung-hwan Date: Wed, 5 Sep 2012 22:37:55 +0000 Subject: [PATCH] added qse_cmgr_id_t, qse_setdflcmgrbyid(), qse_findcmgrbyid() deleted qse_slmbcmgr, qse_utf8cmgr, qse_cp949cmgr, qse_cp950cmgr added --enabled-more-cmgrs to configure --- qse/cmd/awk/awk.c | 10 ++++-- qse/cmd/sed/sed.c | 4 +-- qse/configure | 56 +++++++++++++++++++++++---------- qse/configure.ac | 20 ++++++++++-- qse/include/qse/cmn/mbwc.h | 37 +++++++++++++++++----- qse/include/qse/config.h.in | 3 ++ qse/lib/cmn/mbwc.c | 62 +++++++++++++++++++++++++++---------- qse/samples/awk/awk05.cpp | 4 +-- qse/samples/awk/awk06.cpp | 4 +-- qse/samples/awk/awk07.cpp | 4 +-- qse/samples/awk/awk08.cpp | 4 +-- qse/samples/awk/awk12.cpp | 4 +-- qse/samples/awk/awk13.cpp | 4 +-- qse/samples/awk/awk14.cpp | 4 +-- qse/samples/cmn/chr01.c | 4 +-- qse/samples/cmn/fmt01.c | 4 +-- qse/samples/cmn/fmt02.c | 4 +-- qse/samples/cmn/fs01.c | 4 +-- qse/samples/cmn/glob01.c | 4 +-- qse/samples/cmn/ipad01.c | 4 +-- qse/samples/cmn/main01.c | 4 +-- qse/samples/cmn/main02.c | 4 +-- qse/samples/cmn/mbwc01.c | 4 +-- qse/samples/cmn/mbwc02.c | 4 +-- qse/samples/cmn/nwad01.c | 4 +-- qse/samples/cmn/path01.c | 4 +-- qse/samples/cmn/rex01.c | 4 +-- qse/samples/cmn/sio01.c | 4 +-- qse/samples/cmn/sio02.c | 4 +-- qse/samples/cmn/sio03.c | 4 +-- qse/samples/cmn/slmb01.c | 4 +-- qse/samples/cmn/tre01.c | 4 +-- qse/samples/net/http01.c | 4 +-- qse/samples/net/upxd01.c | 4 +-- qse/samples/sed/sed01.c | 4 +-- qse/samples/sed/sed02.cpp | 4 +-- qse/samples/sed/sed03.cpp | 4 +-- 37 files changed, 205 insertions(+), 107 deletions(-) diff --git a/qse/cmd/awk/awk.c b/qse/cmd/awk/awk.c index 52ea3de9..7ce38686 100644 --- a/qse/cmd/awk/awk.c +++ b/qse/cmd/awk/awk.c @@ -753,6 +753,7 @@ static int comparg (int argc, qse_char_t* argv[], struct arg_t* arg) if (arg->script_cmgr == QSE_NULL) { print_error (QSE_T("unknown script encoding - %s\n"), opt.arg); + oops_ret = 3; goto oops; } } @@ -762,6 +763,7 @@ static int comparg (int argc, qse_char_t* argv[], struct arg_t* arg) if (arg->console_cmgr == QSE_NULL) { print_error (QSE_T("unknown console encoding - %s\n"), opt.arg); + oops_ret = 3; goto oops; } } @@ -776,7 +778,8 @@ static int comparg (int argc, qse_char_t* argv[], struct arg_t* arg) arg->opton |= opttab[i].opt; else { - print_error (QSE_T("invalid value for '%s' - '%s'\n"), opt.lngopt, opt.arg); + print_error (QSE_T("invalid value '%s' for '%s' - use 'on' or 'off'\n"), opt.arg, opt.lngopt); + oops_ret = 3; goto oops; } break; @@ -994,6 +997,7 @@ static int awk_main (int argc, qse_char_t* argv[]) return i; } if (i == 2) return 0; + if (i == 3) return -1; psin.type = arg.ist; if (arg.ist == QSE_AWK_PARSESTD_STR) @@ -1169,7 +1173,7 @@ int qse_main (int argc, qse_achar_t* argv[]) { sprintf (locale, ".%u", (unsigned int)codepage); setlocale (LC_ALL, locale); - qse_setdflcmgr (qse_slmbcmgr); + qse_setdflcmgrbyid (QSE_CMGR_SLMB); } if (WSAStartup (MAKEWORD(2,0), &wsadata) != 0) @@ -1180,7 +1184,7 @@ int qse_main (int argc, qse_achar_t* argv[]) #else setlocale (LC_ALL, ""); - qse_setdflcmgr (qse_slmbcmgr); + qse_setdflcmgrbyid (QSE_CMGR_SLMB); #endif #if defined(ENABLE_MPI) diff --git a/qse/cmd/sed/sed.c b/qse/cmd/sed/sed.c index c86d9afb..f16ab079 100644 --- a/qse/cmd/sed/sed.c +++ b/qse/cmd/sed/sed.c @@ -1028,11 +1028,11 @@ int qse_main (int argc, qse_achar_t* argv[]) { sprintf (locale, ".%u", (unsigned int)codepage); setlocale (LC_ALL, locale); - qse_setdflcmgr (qse_slmbcmgr); + qse_setdflcmgrbyid (QSE_CMGR_SLMB); } #else setlocale (LC_ALL, ""); - qse_setdflcmgr (qse_slmbcmgr); + qse_setdflcmgrbyid (QSE_CMGR_SLMB); #endif return qse_runmain (argc, argv, sed_main); diff --git a/qse/configure b/qse/configure index aa66750a..9dfcff8a 100755 --- a/qse/configure +++ b/qse/configure @@ -785,6 +785,7 @@ with_gnu_ld with_sysroot enable_libtool_lock enable_wchar +enable_more_cmgrs enable_syscall enable_debug enable_cxx @@ -1433,6 +1434,8 @@ Optional Features: --disable-libtool-lock avoid locking (might break parallel builds) --enable-wchar use wchar_t a default charater type when enabled (default. yes) + --enable-more-cmgrs include more built-in cmgrs like cp949 and cp950 + when enabled (default. yes) --enable-syscall use the syscall() function to call system calls (default. no) --enable-debug build the library in the debug mode (default. no) @@ -16474,7 +16477,7 @@ $as_echo "$ac_cv_lib_sendfile_sendfile" >&6; } if test "x$ac_cv_lib_sendfile_sendfile" = xyes; then : SENDFILE_LIBS="-lsendfile" - $as_echo "#define HAVE_SENDFILE 1" >>confdefs.h + $as_echo "#define HAVE_SENDFILE 1" >>confdefs.h fi @@ -16521,7 +16524,7 @@ $as_echo "$ac_cv_lib_sendfile_sendfile64" >&6; } if test "x$ac_cv_lib_sendfile_sendfile64" = xyes; then : SENDFILE_LIBS="-lsendfile" - $as_echo "#define HAVE_SENDFILE64 1" >>confdefs.h + $as_echo "#define HAVE_SENDFILE64 1" >>confdefs.h fi @@ -16568,7 +16571,7 @@ $as_echo "$ac_cv_lib_sendfile_sendfilev" >&6; } if test "x$ac_cv_lib_sendfile_sendfilev" = xyes; then : SENDFILE_LIBS="-lsendfile" - $as_echo "#define HAVE_SENDFILEV 1" >>confdefs.h + $as_echo "#define HAVE_SENDFILEV 1" >>confdefs.h fi @@ -16615,7 +16618,7 @@ $as_echo "$ac_cv_lib_sendfile_sendfilev64" >&6; } if test "x$ac_cv_lib_sendfile_sendfilev64" = xyes; then : SENDFILE_LIBS="-lsendfile" - $as_echo "#define HAVE_SENDFILEV64 1" >>confdefs.h + $as_echo "#define HAVE_SENDFILEV64 1" >>confdefs.h fi @@ -16689,15 +16692,19 @@ _ACEOF fi done -if test "$ac_cv_func_SSL_library_init" = "no" +if test "$ac_cv_func_SSL_library_init" = "yes" then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sendfile in -lsendfile" >&5 -$as_echo_n "checking for sendfile in -lsendfile... " >&6; } -if ${ac_cv_lib_sendfile_sendfile+:} false; then : + +$as_echo "#define HAVE_SSL 1" >>confdefs.h + +else + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SSL_library_init in -lssl" >&5 +$as_echo_n "checking for SSL_library_init in -lssl... " >&6; } +if ${ac_cv_lib_ssl_SSL_library_init+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS -LIBS="-lsendfile $LIBS" +LIBS="-lssl $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -16707,33 +16714,36 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext #ifdef __cplusplus extern "C" #endif -char sendfile (); +char SSL_library_init (); int main () { -return sendfile (); +return SSL_library_init (); ; return 0; } _ACEOF if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_sendfile_sendfile=yes + ac_cv_lib_ssl_SSL_library_init=yes else - ac_cv_lib_sendfile_sendfile=no + ac_cv_lib_ssl_SSL_library_init=no fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_sendfile_sendfile" >&5 -$as_echo "$ac_cv_lib_sendfile_sendfile" >&6; } -if test "x$ac_cv_lib_sendfile_sendfile" = xyes; then : +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ssl_SSL_library_init" >&5 +$as_echo "$ac_cv_lib_ssl_SSL_library_init" >&6; } +if test "x$ac_cv_lib_ssl_SSL_library_init" = xyes; then : SSL_LIBS="-lssl" $as_echo "#define HAVE_SSL 1" >>confdefs.h + $as_echo "#define HAVE_SSL_LIBRARY_INIT 1" >>confdefs.h + + fi fi @@ -18527,6 +18537,20 @@ else fi +# Check whether --enable-more-cmgrs was given. +if test "${enable_more_cmgrs+set}" = set; then : + enableval=$enable_more_cmgrs; enable_more_cmgrs_is=$enableval +else + enable_more_cmgrs_is=yes +fi + +if test "${enable_more_cmgrs_is}" = "yes" +then + +$as_echo "#define QSE_INCLUDE_MORE_CMGRS /**/" >>confdefs.h + +fi + # Check whether --enable-syscall was given. if test "${enable_syscall+set}" = set; then : enableval=$enable_syscall; enable_syscall_is=$enableval diff --git a/qse/configure.ac b/qse/configure.ac index f25f1540..821d6fe0 100644 --- a/qse/configure.ac +++ b/qse/configure.ac @@ -152,6 +152,7 @@ if test "$ac_cv_func_sendfile" = "no" then AC_CHECK_LIB([sendfile], [sendfile], [ SENDFILE_LIBS="-lsendfile" + dnl only for consistency with AC_CHECK_FUNCS AC_DEFINE(HAVE_SENDFILE, 1) ]) fi @@ -159,6 +160,7 @@ if test "$ac_cv_func_sendfile64" = "no" then AC_CHECK_LIB([sendfile], [sendfile64], [ SENDFILE_LIBS="-lsendfile" + dnl only for consistency with AC_CHECK_FUNCS AC_DEFINE(HAVE_SENDFILE64, 1) ]) fi @@ -166,6 +168,7 @@ if test "$ac_cv_func_sendfilev" = "no" then AC_CHECK_LIB([sendfile], [sendfilev], [ SENDFILE_LIBS="-lsendfile" + dnl only for consistency with AC_CHECK_FUNCS AC_DEFINE(HAVE_SENDFILEV, 1) ]) fi @@ -173,6 +176,7 @@ if test "$ac_cv_func_sendfilev64" = "no" then AC_CHECK_LIB([sendfile], [sendfilev64], [ SENDFILE_LIBS="-lsendfile" + dnl only for consistency with AC_CHECK_FUNCS AC_DEFINE(HAVE_SENDFILEV64, 1) ]) fi @@ -193,11 +197,16 @@ AC_SUBST(UNICOWS_LIBS) dnl check for an SSL library AC_CHECK_FUNCS([SSL_library_init]) -if test "$ac_cv_func_SSL_library_init" = "no" +if test "$ac_cv_func_SSL_library_init" = "yes" then - AC_CHECK_LIB([sendfile], [sendfile], [ + AC_DEFINE(HAVE_SSL, 1, [ssl support]) +else + AC_CHECK_LIB([ssl], [SSL_library_init], [ SSL_LIBS="-lssl" AC_DEFINE(HAVE_SSL, 1, [ssl support]) + + dnl only for consistency with AC_CHECK_FUNCS + AC_DEFINE(HAVE_SSL_LIBRARY_INIT, 1) ]) fi AC_SUBST(SSL_LIBS) @@ -304,6 +313,13 @@ else fi AM_CONDITIONAL(WCHAR, test "${enable_wchar_is}" = "yes" ) +AC_ARG_ENABLE([more-cmgrs], [AS_HELP_STRING([--enable-more-cmgrs],[include more built-in cmgrs like cp949 and cp950 when enabled (default. yes)])], + enable_more_cmgrs_is=$enableval,enable_more_cmgrs_is=yes) +if test "${enable_more_cmgrs_is}" = "yes" +then + AC_DEFINE([QSE_INCLUDE_MORE_CMGRS],[],[include more built-in cmgrs like cp949 and cp950]) +fi + AC_ARG_ENABLE([syscall], [AS_HELP_STRING([--enable-syscall],[use the syscall() function to call system calls (default. no)])], enable_syscall_is=$enableval,enable_syscall_is=no) if test "${enable_syscall_is}" = "yes" diff --git a/qse/include/qse/cmn/mbwc.h b/qse/include/qse/cmn/mbwc.h index 0f3e153e..874b0f5b 100644 --- a/qse/include/qse/cmn/mbwc.h +++ b/qse/include/qse/cmn/mbwc.h @@ -30,20 +30,33 @@ typedef qse_cmgr_t* (*qse_cmgr_finder_t) (const qse_char_t* name); +/** + * The qse_cmgr_id_t type defines the builtin-in cmgr IDs. + */ +enum qse_cmgr_id_t +{ + QSE_CMGR_SLMB, +#if defined(QSE_INCLUDE_MORE_CMGRS) + QSE_CMGR_CP949, + QSE_CMGR_CP950, +#endif + QSE_CMGR_UTF8 +}; +typedef enum qse_cmgr_id_t qse_cmgr_id_t; + #ifdef __cplusplus extern "C" { #endif -/* --------------------------------------------------- */ -/* BUILTIN CMGR */ -/* --------------------------------------------------- */ -extern qse_cmgr_t* qse_slmbcmgr; -extern qse_cmgr_t* qse_utf8cmgr; -extern qse_cmgr_t* qse_cp949cmgr; -extern qse_cmgr_t* qse_cp950cmgr; +/** + * The qse_findcmgrbyid() function returns a built-in cmgr for a given @a id. + */ +qse_cmgr_t* qse_findcmgrbyid ( + qse_cmgr_id_t id +); /** - * The qse_getfindcmgr() function find a builtin cmgr matching a given + * The qse_getfindcmgr() function find a built-in cmgr matching a given * @a name and returns it. It returns #QSE_NULL if no match is found. * The @a name can be one of "utf8", "slmb", "cp949", "cp950", and an * empty string. Calling this function with an empty string is the same @@ -72,6 +85,14 @@ void qse_setdflcmgr ( qse_cmgr_t* cmgr ); +/** + * The qse_setdflcmgrbyid() function finds a built-in + * cmgr for the @a id and sets it as a default cmgr. + */ +void qse_setdflcmgrbyid ( + qse_cmgr_id_t id +); + /* --------------------------------------------------- */ /* STRING CONVERSION USING CMGR */ /* --------------------------------------------------- */ diff --git a/qse/include/qse/config.h.in b/qse/include/qse/config.h.in index 7e02054e..c87cf217 100644 --- a/qse/include/qse/config.h.in +++ b/qse/include/qse/config.h.in @@ -434,6 +434,9 @@ /* Unknown Endian */ #undef QSE_ENDIAN_UNKNOWN +/* include more built-in cmgrs like cp949 and cp950 */ +#undef QSE_INCLUDE_MORE_CMGRS + /* MB_LEN_MAX */ #undef QSE_MBLEN_MAX diff --git a/qse/lib/cmn/mbwc.c b/qse/lib/cmn/mbwc.c index a29548af..9c2f06cb 100644 --- a/qse/lib/cmn/mbwc.c +++ b/qse/lib/cmn/mbwc.c @@ -39,11 +39,7 @@ static qse_cmgr_t builtin_cmgr[] = qse_slwctoslmb }, - { - qse_utf8touc, - qse_uctoutf8 - }, - +#if defined(QSE_INCLUDE_MORE_CMGRS) { qse_cp949touc, qse_uctocp949 @@ -52,15 +48,16 @@ static qse_cmgr_t builtin_cmgr[] = { qse_cp950touc, qse_uctocp950 + }, +#endif + + { + qse_utf8touc, + qse_uctoutf8 } }; -qse_cmgr_t* qse_slmbcmgr = &builtin_cmgr[0]; -qse_cmgr_t* qse_utf8cmgr = &builtin_cmgr[1]; -qse_cmgr_t* qse_cp949cmgr = &builtin_cmgr[2]; -qse_cmgr_t* qse_cp950cmgr = &builtin_cmgr[3]; - -static qse_cmgr_t* dfl_cmgr = &builtin_cmgr[0]; +static qse_cmgr_t* dfl_cmgr = &builtin_cmgr[QSE_CMGR_SLMB]; static qse_cmgr_finder_t cmgr_finder = QSE_NULL; qse_cmgr_t* qse_getdflcmgr (void) @@ -70,13 +67,41 @@ qse_cmgr_t* qse_getdflcmgr (void) void qse_setdflcmgr (qse_cmgr_t* cmgr) { - dfl_cmgr = (cmgr? cmgr: &builtin_cmgr[0]); + dfl_cmgr = (cmgr? cmgr: &builtin_cmgr[QSE_CMGR_SLMB]); +} + +void qse_setdflcmgrbyid (qse_cmgr_id_t id) +{ + qse_cmgr_t* cmgr = qse_findcmgrbyid (id); + dfl_cmgr = (cmgr? cmgr: &builtin_cmgr[QSE_CMGR_SLMB]); +} + +qse_cmgr_t* qse_findcmgrbyid (qse_cmgr_id_t id) +{ + if (id < 0 || id >= QSE_COUNTOF(builtin_cmgr)) return QSE_NULL; + return &builtin_cmgr[id]; } qse_cmgr_t* qse_findcmgr (const qse_char_t* name) { + static struct + { + const qse_char_t* name; + qse_cmgr_id_t id; + } tab[] = + { + { QSE_T("utf8"), QSE_CMGR_UTF8 }, +#if defined(QSE_INCLUDE_MORE_CMGRS) + { QSE_T("cp949"), QSE_CMGR_CP949 }, + { QSE_T("cp950"), QSE_CMGR_CP950 }, +#endif + { QSE_T("slmb"), QSE_CMGR_UTF8 } + }; + if (name) { + qse_size_t i; + if (cmgr_finder) { qse_cmgr_t* cmgr; @@ -85,11 +110,16 @@ qse_cmgr_t* qse_findcmgr (const qse_char_t* name) } if (qse_strcasecmp(name, QSE_T("")) == 0) return dfl_cmgr; - if (qse_strcasecmp(name, QSE_T("utf8")) == 0) return qse_utf8cmgr; - if (qse_strcasecmp(name, QSE_T("cp949")) == 0) return qse_cp949cmgr; - if (qse_strcasecmp(name, QSE_T("cp950")) == 0) return qse_cp950cmgr; - if (qse_strcasecmp(name, QSE_T("slmb")) == 0) return qse_slmbcmgr; + + for (i = 0; i < QSE_COUNTOF(tab); i++) + { + if (qse_strcasecmp(name, tab[i].name) == 0) + { + return &builtin_cmgr[tab[i].id]; + } + } } + return QSE_NULL; } diff --git a/qse/samples/awk/awk05.cpp b/qse/samples/awk/awk05.cpp index 12961ef5..987028b2 100644 --- a/qse/samples/awk/awk05.cpp +++ b/qse/samples/awk/awk05.cpp @@ -94,11 +94,11 @@ int qse_main (int argc, qse_achar_t* argv[]) { sprintf (locale, ".%u", (unsigned int)codepage); setlocale (LC_ALL, locale); - qse_setdflcmgr (qse_slmbcmgr); + qse_setdflcmgrbyid (QSE_CMGR_SLMB); } #else setlocale (LC_ALL, ""); - qse_setdflcmgr (qse_slmbcmgr); + qse_setdflcmgrbyid (QSE_CMGR_SLMB); #endif return qse_runmain (argc,argv,awk_main); diff --git a/qse/samples/awk/awk06.cpp b/qse/samples/awk/awk06.cpp index fc271300..0c7904ac 100644 --- a/qse/samples/awk/awk06.cpp +++ b/qse/samples/awk/awk06.cpp @@ -121,11 +121,11 @@ int qse_main (int argc, qse_achar_t* argv[]) { sprintf (locale, ".%u", (unsigned int)codepage); setlocale (LC_ALL, locale); - qse_setdflcmgr (qse_slmbcmgr); + qse_setdflcmgrbyid (QSE_CMGR_SLMB); } #else setlocale (LC_ALL, ""); - qse_setdflcmgr (qse_slmbcmgr); + qse_setdflcmgrbyid (QSE_CMGR_SLMB); #endif return qse_runmain (argc,argv,awk_main); } diff --git a/qse/samples/awk/awk07.cpp b/qse/samples/awk/awk07.cpp index df8f0017..3e213b5c 100644 --- a/qse/samples/awk/awk07.cpp +++ b/qse/samples/awk/awk07.cpp @@ -166,11 +166,11 @@ int qse_main (int argc, qse_achar_t* argv[]) { sprintf (locale, ".%u", (unsigned int)codepage); setlocale (LC_ALL, locale); - qse_setdflcmgr (qse_slmbcmgr); + qse_setdflcmgrbyid (QSE_CMGR_SLMB); } #else setlocale (LC_ALL, ""); - qse_setdflcmgr (qse_slmbcmgr); + qse_setdflcmgrbyid (QSE_CMGR_SLMB); #endif return qse_runmain (argc,argv,awk_main); } diff --git a/qse/samples/awk/awk08.cpp b/qse/samples/awk/awk08.cpp index a03dc3ad..92bb65fc 100644 --- a/qse/samples/awk/awk08.cpp +++ b/qse/samples/awk/awk08.cpp @@ -455,7 +455,7 @@ int qse_main (int argc, qse_achar_t* argv[]) { sprintf (locale, ".%u", (unsigned int)codepage); setlocale (LC_ALL, locale); - qse_setdflcmgr (qse_slmbcmgr); + qse_setdflcmgrbyid (QSE_CMGR_SLMB); } if (WSAStartup (MAKEWORD(2,0), &wsadata) != 0) @@ -466,7 +466,7 @@ int qse_main (int argc, qse_achar_t* argv[]) #else setlocale (LC_ALL, ""); - qse_setdflcmgr (qse_slmbcmgr); + qse_setdflcmgrbyid (QSE_CMGR_SLMB); #endif ret = qse_runmain (argc, argv, awk_main); diff --git a/qse/samples/awk/awk12.cpp b/qse/samples/awk/awk12.cpp index 91986abe..3954447a 100644 --- a/qse/samples/awk/awk12.cpp +++ b/qse/samples/awk/awk12.cpp @@ -205,11 +205,11 @@ int qse_main (int argc, qse_achar_t* argv[]) { sprintf (locale, ".%u", (unsigned int)codepage); setlocale (LC_ALL, locale); - qse_setdflcmgr (qse_slmbcmgr); + qse_setdflcmgrbyid (QSE_CMGR_SLMB); } #else setlocale (LC_ALL, ""); - qse_setdflcmgr (qse_slmbcmgr); + qse_setdflcmgrbyid (QSE_CMGR_SLMB); #endif return qse_runmain (argc,argv,awk_main); diff --git a/qse/samples/awk/awk13.cpp b/qse/samples/awk/awk13.cpp index 42c47ec2..4e2cc083 100644 --- a/qse/samples/awk/awk13.cpp +++ b/qse/samples/awk/awk13.cpp @@ -225,11 +225,11 @@ int qse_main (int argc, qse_achar_t* argv[]) { sprintf (locale, ".%u", (unsigned int)codepage); setlocale (LC_ALL, locale); - qse_setdflcmgr (qse_slmbcmgr); + qse_setdflcmgrbyid (QSE_CMGR_SLMB); } #else setlocale (LC_ALL, ""); - qse_setdflcmgr (qse_slmbcmgr); + qse_setdflcmgrbyid (QSE_CMGR_SLMB); #endif return qse_runmain (argc,argv,awk_main); diff --git a/qse/samples/awk/awk14.cpp b/qse/samples/awk/awk14.cpp index 723ade49..bfb916aa 100644 --- a/qse/samples/awk/awk14.cpp +++ b/qse/samples/awk/awk14.cpp @@ -229,11 +229,11 @@ int qse_main (int argc, qse_achar_t* argv[]) { sprintf (locale, ".%u", (unsigned int)codepage); setlocale (LC_ALL, locale); - qse_setdflcmgr (qse_slmbcmgr); + qse_setdflcmgrbyid (QSE_CMGR_SLMB); } #else setlocale (LC_ALL, ""); - qse_setdflcmgr (qse_slmbcmgr); + qse_setdflcmgrbyid (QSE_CMGR_SLMB); #endif return qse_runmain (argc,argv,awk_main); diff --git a/qse/samples/cmn/chr01.c b/qse/samples/cmn/chr01.c index bbe08e77..ecc00155 100644 --- a/qse/samples/cmn/chr01.c +++ b/qse/samples/cmn/chr01.c @@ -40,11 +40,11 @@ int main () { sprintf (locale, ".%u", (unsigned int)codepage); setlocale (LC_ALL, locale); - qse_setdflcmgr (qse_slmbcmgr); + qse_setdflcmgrbyid (QSE_CMGR_SLMB); } #else setlocale (LC_ALL, ""); - qse_setdflcmgr (qse_slmbcmgr); + qse_setdflcmgrbyid (QSE_CMGR_SLMB); #endif R (test1); diff --git a/qse/samples/cmn/fmt01.c b/qse/samples/cmn/fmt01.c index 11b2f214..33fd376a 100644 --- a/qse/samples/cmn/fmt01.c +++ b/qse/samples/cmn/fmt01.c @@ -68,11 +68,11 @@ int qse_main (int argc, qse_achar_t* argv[], qse_achar_t* envp[]) { sprintf (locale, ".%u", (unsigned int)codepage); setlocale (LC_ALL, locale); - qse_setdflcmgr (qse_slmbcmgr); + qse_setdflcmgrbyid (QSE_CMGR_SLMB); } #else setlocale (LC_ALL, ""); - qse_setdflcmgr (qse_slmbcmgr); + qse_setdflcmgrbyid (QSE_CMGR_SLMB); #endif return qse_runmainwithenv (argc, argv, envp, test_main); } diff --git a/qse/samples/cmn/fmt02.c b/qse/samples/cmn/fmt02.c index c0a6d679..3b041eb9 100644 --- a/qse/samples/cmn/fmt02.c +++ b/qse/samples/cmn/fmt02.c @@ -88,11 +88,11 @@ int qse_main (int argc, qse_achar_t* argv[], qse_achar_t* envp[]) { sprintf (locale, ".%u", (unsigned int)codepage); setlocale (LC_ALL, locale); - qse_setdflcmgr (qse_slmbcmgr); + qse_setdflcmgrbyid (QSE_CMGR_SLMB); } #else setlocale (LC_ALL, ""); - qse_setdflcmgr (qse_slmbcmgr); + qse_setdflcmgrbyid (QSE_CMGR_SLMB); #endif return qse_runmainwithenv (argc, argv, envp, test_main); } diff --git a/qse/samples/cmn/fs01.c b/qse/samples/cmn/fs01.c index f119f15e..2a78bf34 100644 --- a/qse/samples/cmn/fs01.c +++ b/qse/samples/cmn/fs01.c @@ -87,11 +87,11 @@ int qse_main (int argc, qse_achar_t* argv[]) { sprintf (locale, ".%u", (unsigned int)codepage); setlocale (LC_ALL, locale); - qse_setdflcmgr (qse_slmbcmgr); + qse_setdflcmgrbyid (QSE_CMGR_SLMB); } #else setlocale (LC_ALL, ""); - qse_setdflcmgr (qse_slmbcmgr); + qse_setdflcmgrbyid (QSE_CMGR_SLMB); #endif return qse_runmain (argc, argv, fs_main); } diff --git a/qse/samples/cmn/glob01.c b/qse/samples/cmn/glob01.c index 9743de5f..579d8309 100644 --- a/qse/samples/cmn/glob01.c +++ b/qse/samples/cmn/glob01.c @@ -50,11 +50,11 @@ int qse_main (int argc, qse_achar_t* argv[]) { sprintf (locale, ".%u", (unsigned int)codepage); setlocale (LC_ALL, locale); - qse_setdflcmgr (qse_slmbcmgr); + qse_setdflcmgrbyid (QSE_CMGR_SLMB); } #else setlocale (LC_ALL, ""); - qse_setdflcmgr (qse_slmbcmgr); + qse_setdflcmgrbyid (QSE_CMGR_SLMB); #endif return qse_runmain (argc, argv, glob_main); } diff --git a/qse/samples/cmn/ipad01.c b/qse/samples/cmn/ipad01.c index b367ec4a..08c28e41 100644 --- a/qse/samples/cmn/ipad01.c +++ b/qse/samples/cmn/ipad01.c @@ -200,11 +200,11 @@ int qse_main (int argc, qse_achar_t* argv[], qse_achar_t* envp[]) { sprintf (locale, ".%u", (unsigned int)codepage); setlocale (LC_ALL, locale); - qse_setdflcmgr (qse_slmbcmgr); + qse_setdflcmgrbyid (QSE_CMGR_SLMB); } #else setlocale (LC_ALL, ""); - qse_setdflcmgr (qse_slmbcmgr); + qse_setdflcmgrbyid (QSE_CMGR_SLMB); #endif return qse_runmainwithenv (argc, argv, envp, test_main); } diff --git a/qse/samples/cmn/main01.c b/qse/samples/cmn/main01.c index 138f89bc..1a6b5c93 100644 --- a/qse/samples/cmn/main01.c +++ b/qse/samples/cmn/main01.c @@ -34,11 +34,11 @@ int qse_main (int argc, qse_achar_t* argv[]) { sprintf (locale, ".%u", (unsigned int)codepage); setlocale (LC_ALL, locale); - qse_setdflcmgr (qse_slmbcmgr); + qse_setdflcmgrbyid (QSE_CMGR_SLMB); } #else setlocale (LC_ALL, ""); - qse_setdflcmgr (qse_slmbcmgr); + qse_setdflcmgrbyid (QSE_CMGR_SLMB); #endif return qse_runmain (argc, argv, test_main); diff --git a/qse/samples/cmn/main02.c b/qse/samples/cmn/main02.c index 99821a17..438761e9 100644 --- a/qse/samples/cmn/main02.c +++ b/qse/samples/cmn/main02.c @@ -39,11 +39,11 @@ int qse_main (int argc, qse_achar_t* argv[], qse_achar_t* envp[]) { sprintf (locale, ".%u", (unsigned int)codepage); setlocale (LC_ALL, locale); - qse_setdflcmgr (qse_slmbcmgr); + qse_setdflcmgrbyid (QSE_CMGR_SLMB); } #else setlocale (LC_ALL, ""); - qse_setdflcmgr (qse_slmbcmgr); + qse_setdflcmgrbyid (QSE_CMGR_SLMB); #endif return qse_runmainwithenv (argc, argv, envp, test_main); diff --git a/qse/samples/cmn/mbwc01.c b/qse/samples/cmn/mbwc01.c index 9119853c..03e70730 100644 --- a/qse/samples/cmn/mbwc01.c +++ b/qse/samples/cmn/mbwc01.c @@ -225,11 +225,11 @@ int main () { sprintf (locale, ".%u", (unsigned int)codepage); setlocale (LC_ALL, locale); - qse_setdflcmgr (qse_slmbcmgr); + qse_setdflcmgrbyid (QSE_CMGR_SLMB); } #else setlocale (LC_ALL, ""); - qse_setdflcmgr (qse_slmbcmgr); + qse_setdflcmgrbyid (QSE_CMGR_SLMB); #endif qse_printf (QSE_T("--------------------------------------------------------------------------------\n")); diff --git a/qse/samples/cmn/mbwc02.c b/qse/samples/cmn/mbwc02.c index ccbabc84..1079a12c 100644 --- a/qse/samples/cmn/mbwc02.c +++ b/qse/samples/cmn/mbwc02.c @@ -305,11 +305,11 @@ int main () { sprintf (locale, ".%u", (unsigned int)codepage); setlocale (LC_ALL, locale); - qse_setdflcmgr (qse_slmbcmgr); + qse_setdflcmgrbyid (QSE_CMGR_SLMB); } #else setlocale (LC_ALL, ""); - qse_setdflcmgr (qse_slmbcmgr); + qse_setdflcmgrbyid (QSE_CMGR_SLMB); #endif qse_printf (QSE_T("--------------------------------------------------------------------------------\n")); diff --git a/qse/samples/cmn/nwad01.c b/qse/samples/cmn/nwad01.c index 6bea5e16..4c0654bf 100644 --- a/qse/samples/cmn/nwad01.c +++ b/qse/samples/cmn/nwad01.c @@ -165,11 +165,11 @@ int qse_main (int argc, qse_achar_t* argv[], qse_achar_t* envp[]) { sprintf (locale, ".%u", (unsigned int)codepage); setlocale (LC_ALL, locale); - qse_setdflcmgr (qse_slmbcmgr); + qse_setdflcmgrbyid (QSE_CMGR_SLMB); } #else setlocale (LC_ALL, ""); - qse_setdflcmgr (qse_slmbcmgr); + qse_setdflcmgrbyid (QSE_CMGR_SLMB); #endif return qse_runmainwithenv (argc, argv, envp, test_main); } diff --git a/qse/samples/cmn/path01.c b/qse/samples/cmn/path01.c index 4f46141a..1992bae4 100644 --- a/qse/samples/cmn/path01.c +++ b/qse/samples/cmn/path01.c @@ -77,11 +77,11 @@ int qse_main (int argc, qse_achar_t* argv[]) { sprintf (locale, ".%u", (unsigned int)codepage); setlocale (LC_ALL, locale); - qse_setdflcmgr (qse_slmbcmgr); + qse_setdflcmgrbyid (QSE_CMGR_SLMB); } #else setlocale (LC_ALL, ""); - qse_setdflcmgr (qse_slmbcmgr); + qse_setdflcmgrbyid (QSE_CMGR_SLMB); #endif return qse_runmain (argc, argv, path_main); } diff --git a/qse/samples/cmn/rex01.c b/qse/samples/cmn/rex01.c index a34a8c4c..95e15bcf 100644 --- a/qse/samples/cmn/rex01.c +++ b/qse/samples/cmn/rex01.c @@ -82,11 +82,11 @@ int qse_main (int argc, qse_achar_t* argv[]) { sprintf (locale, ".%u", (unsigned int)codepage); setlocale (LC_ALL, locale); - qse_setdflcmgr (qse_slmbcmgr); + qse_setdflcmgrbyid (QSE_CMGR_SLMB); } #else setlocale (LC_ALL, ""); - qse_setdflcmgr (qse_slmbcmgr); + qse_setdflcmgrbyid (QSE_CMGR_SLMB); #endif return qse_runmain (argc, argv, rex_main); } diff --git a/qse/samples/cmn/sio01.c b/qse/samples/cmn/sio01.c index c5b8f9d5..8ab483cf 100644 --- a/qse/samples/cmn/sio01.c +++ b/qse/samples/cmn/sio01.c @@ -104,11 +104,11 @@ int main () { sprintf (locale, ".%u", (unsigned int)codepage); setlocale (LC_ALL, locale); - qse_setdflcmgr (qse_slmbcmgr); + qse_setdflcmgrbyid (QSE_CMGR_SLMB); } #else setlocale (LC_ALL, ""); - qse_setdflcmgr (qse_slmbcmgr); + qse_setdflcmgrbyid (QSE_CMGR_SLMB); #endif g_out = qse_sio_openstd (QSE_MMGR_GETDFL(), 0, QSE_SIO_STDOUT, QSE_SIO_WRITE | QSE_SIO_IGNOREMBWCERR); diff --git a/qse/samples/cmn/sio02.c b/qse/samples/cmn/sio02.c index ad3d04c1..31806c6e 100644 --- a/qse/samples/cmn/sio02.c +++ b/qse/samples/cmn/sio02.c @@ -157,11 +157,11 @@ int main () { sprintf (locale, ".%u", (unsigned int)codepage); setlocale (LC_ALL, locale); - qse_setdflcmgr (qse_slmbcmgr); + qse_setdflcmgrbyid (QSE_CMGR_SLMB); } #else setlocale (LC_ALL, ""); - qse_setdflcmgr (qse_slmbcmgr); + qse_setdflcmgrbyid (QSE_CMGR_SLMB); #endif setlocale (LC_ALL, ""); diff --git a/qse/samples/cmn/sio03.c b/qse/samples/cmn/sio03.c index e4b5c38d..45a4b190 100644 --- a/qse/samples/cmn/sio03.c +++ b/qse/samples/cmn/sio03.c @@ -145,11 +145,11 @@ int main () { sprintf (locale, ".%u", (unsigned int)codepage); setlocale (LC_ALL, locale); - qse_setdflcmgr (qse_slmbcmgr); + qse_setdflcmgrbyid (QSE_CMGR_SLMB); } #else setlocale (LC_ALL, ""); - qse_setdflcmgr (qse_slmbcmgr); + qse_setdflcmgrbyid (QSE_CMGR_SLMB); #endif qse_printf (QSE_T("--------------------------------------------------------------------------------\n")); diff --git a/qse/samples/cmn/slmb01.c b/qse/samples/cmn/slmb01.c index 3ca442f1..19db5879 100644 --- a/qse/samples/cmn/slmb01.c +++ b/qse/samples/cmn/slmb01.c @@ -206,7 +206,7 @@ int main () { sprintf (locale, ".%u", (unsigned int)codepage); setlocale (LC_ALL, locale); - qse_setdflcmgr (qse_slmbcmgr); + qse_setdflcmgrbyid (QSE_CMGR_SLMB); } #if 0 @@ -219,7 +219,7 @@ int main () #else setlocale (LC_ALL, ""); - qse_setdflcmgr (qse_slmbcmgr); + qse_setdflcmgrbyid (QSE_CMGR_SLMB); #endif R (test1); diff --git a/qse/samples/cmn/tre01.c b/qse/samples/cmn/tre01.c index 93921e46..73995d12 100644 --- a/qse/samples/cmn/tre01.c +++ b/qse/samples/cmn/tre01.c @@ -89,11 +89,11 @@ int qse_main (int argc, qse_achar_t* argv[], qse_achar_t* envp[]) { sprintf (locale, ".%u", (unsigned int)codepage); setlocale (LC_ALL, locale); - qse_setdflcmgr (qse_slmbcmgr); + qse_setdflcmgrbyid (QSE_CMGR_SLMB); } #else setlocale (LC_ALL, ""); - qse_setdflcmgr (qse_slmbcmgr); + qse_setdflcmgrbyid (QSE_CMGR_SLMB); #endif return qse_runmainwithenv (argc, argv, envp, test_main); } diff --git a/qse/samples/net/http01.c b/qse/samples/net/http01.c index a3348565..51278cf6 100644 --- a/qse/samples/net/http01.c +++ b/qse/samples/net/http01.c @@ -1543,11 +1543,11 @@ int qse_main (int argc, qse_achar_t* argv[]) { sprintf (locale, ".%u", (unsigned int)codepage); setlocale (LC_ALL, locale); - qse_setdflcmgr (qse_slmbcmgr); + qse_setdflcmgrbyid (QSE_CMGR_SLMB); } #else setlocale (LC_ALL, ""); - qse_setdflcmgr (qse_slmbcmgr); + qse_setdflcmgrbyid (QSE_CMGR_SLMB); #endif return qse_runmain (argc, argv, httpd_main); diff --git a/qse/samples/net/upxd01.c b/qse/samples/net/upxd01.c index a774667d..9d2431ac 100644 --- a/qse/samples/net/upxd01.c +++ b/qse/samples/net/upxd01.c @@ -885,11 +885,11 @@ int qse_main (int argc, qse_achar_t* argv[]) { sprintf (locale, ".%u", (unsigned int)codepage); setlocale (LC_ALL, locale); - qse_setdflcmgr (qse_slmbcmgr); + qse_setdflcmgrbyid (QSE_CMGR_SLMB); } #else setlocale (LC_ALL, ""); - qse_setdflcmgr (qse_slmbcmgr); + qse_setdflcmgrbyid (QSE_CMGR_SLMB); #endif return qse_runmain (argc, argv, upxd_main); diff --git a/qse/samples/sed/sed01.c b/qse/samples/sed/sed01.c index 87bac50b..18bd2dd8 100644 --- a/qse/samples/sed/sed01.c +++ b/qse/samples/sed/sed01.c @@ -82,11 +82,11 @@ int qse_main (int argc, qse_achar_t* argv[]) { sprintf (locale, ".%u", (unsigned int)codepage); setlocale (LC_ALL, locale); - qse_setdflcmgr (qse_slmbcmgr); + qse_setdflcmgrbyid (QSE_CMGR_SLMB); } #else setlocale (LC_ALL, ""); - qse_setdflcmgr (qse_slmbcmgr); + qse_setdflcmgrbyid (QSE_CMGR_SLMB); #endif return qse_runmain (argc, argv, sed_main); } diff --git a/qse/samples/sed/sed02.cpp b/qse/samples/sed/sed02.cpp index 825dc8a4..b359d0db 100644 --- a/qse/samples/sed/sed02.cpp +++ b/qse/samples/sed/sed02.cpp @@ -91,11 +91,11 @@ int qse_main (int argc, qse_achar_t* argv[]) { sprintf (locale, ".%u", (unsigned int)codepage); setlocale (LC_ALL, locale); - qse_setdflcmgr (qse_slmbcmgr); + qse_setdflcmgrbyid (QSE_CMGR_SLMB); } #else setlocale (LC_ALL, ""); - qse_setdflcmgr (qse_slmbcmgr); + qse_setdflcmgrbyid (QSE_CMGR_SLMB); #endif return qse_runmain (argc, argv, sed_main); } diff --git a/qse/samples/sed/sed03.cpp b/qse/samples/sed/sed03.cpp index 778b6c7d..12eda8ea 100644 --- a/qse/samples/sed/sed03.cpp +++ b/qse/samples/sed/sed03.cpp @@ -106,11 +106,11 @@ int qse_main (int argc, qse_achar_t* argv[]) { sprintf (locale, ".%u", (unsigned int)codepage); setlocale (LC_ALL, locale); - qse_setdflcmgr (qse_slmbcmgr); + qse_setdflcmgrbyid (QSE_CMGR_SLMB); } #else setlocale (LC_ALL, ""); - qse_setdflcmgr (qse_slmbcmgr); + qse_setdflcmgrbyid (QSE_CMGR_SLMB); #endif return qse_runmain (argc, argv, sed_main); }