changed qse_setdflcmgrbyid() and qse_setdflcmgr() to return the cmgr object set.

changed the default cmgr to either SLMB or UTF8 depending on the availability of underlying library functions
This commit is contained in:
2015-04-27 08:37:57 +00:00
parent 0a8e84add2
commit c6644d5b52
45 changed files with 107 additions and 94 deletions

View File

@ -24,10 +24,10 @@ void init_awk_sample_locale (void)
qse_fmtuintmaxtombs (locale, QSE_COUNTOF(locale),
codepage, 10, -1, QSE_MT('\0'), QSE_MT("."));
setlocale (LC_ALL, locale);
qse_setdflcmgrbyid (QSE_CMGR_SLMB);
/*qse_setdflcmgrbyid (QSE_CMGR_SLMB);*/
}
#else
setlocale (LC_ALL, "");
qse_setdflcmgrbyid (QSE_CMGR_SLMB);
/*qse_setdflcmgrbyid (QSE_CMGR_SLMB);*/
#endif
}

View File

@ -174,11 +174,11 @@ int qse_main (int argc, qse_achar_t* argv[])
{
sprintf (locale, ".%u", (unsigned int)codepage);
setlocale (LC_ALL, locale);
qse_setdflcmgrbyid (QSE_CMGR_SLMB);
/*qse_setdflcmgrbyid (QSE_CMGR_SLMB);*/
}
#else
setlocale (LC_ALL, "");
qse_setdflcmgrbyid (QSE_CMGR_SLMB);
/*qse_setdflcmgrbyid (QSE_CMGR_SLMB);*/
#endif
}

View File

@ -471,7 +471,7 @@ int qse_main (int argc, qse_achar_t* argv[])
{
sprintf (locale, ".%u", (unsigned int)codepage);
setlocale (LC_ALL, locale);
qse_setdflcmgrbyid (QSE_CMGR_SLMB);
/*qse_setdflcmgrbyid (QSE_CMGR_SLMB);*/
}
if (WSAStartup (MAKEWORD(2,0), &wsadata) != 0)
@ -482,7 +482,7 @@ int qse_main (int argc, qse_achar_t* argv[])
#else
setlocale (LC_ALL, "");
qse_setdflcmgrbyid (QSE_CMGR_SLMB);
/*qse_setdflcmgrbyid (QSE_CMGR_SLMB);*/
#endif
}

View File

@ -104,11 +104,11 @@ int qse_main (int argc, qse_achar_t* argv[])
{
sprintf (locale, ".%u", (unsigned int)codepage);
setlocale (LC_ALL, locale);
qse_setdflcmgrbyid (QSE_CMGR_SLMB);
/*qse_setdflcmgrbyid (QSE_CMGR_SLMB);*/
}
#else
setlocale (LC_ALL, "");
qse_setdflcmgrbyid (QSE_CMGR_SLMB);
/*qse_setdflcmgrbyid (QSE_CMGR_SLMB);*/
#endif
}

View File

@ -132,11 +132,11 @@ int qse_main (int argc, qse_achar_t* argv[])
{
sprintf (locale, ".%u", (unsigned int)codepage);
setlocale (LC_ALL, locale);
qse_setdflcmgrbyid (QSE_CMGR_SLMB);
/*qse_setdflcmgrbyid (QSE_CMGR_SLMB);*/
}
#else
setlocale (LC_ALL, "");
qse_setdflcmgrbyid (QSE_CMGR_SLMB);
/*qse_setdflcmgrbyid (QSE_CMGR_SLMB);*/
#endif
}

View File

@ -239,11 +239,11 @@ int qse_main (int argc, qse_achar_t* argv[])
{
sprintf (locale, ".%u", (unsigned int)codepage);
setlocale (LC_ALL, locale);
qse_setdflcmgrbyid (QSE_CMGR_SLMB);
/*qse_setdflcmgrbyid (QSE_CMGR_SLMB);*/
}
#else
setlocale (LC_ALL, "");
qse_setdflcmgrbyid (QSE_CMGR_SLMB);
/*qse_setdflcmgrbyid (QSE_CMGR_SLMB);*/
#endif
}

View File

@ -40,11 +40,11 @@ int main ()
{
sprintf (locale, ".%u", (unsigned int)codepage);
setlocale (LC_ALL, locale);
qse_setdflcmgrbyid (QSE_CMGR_SLMB);
/*qse_setdflcmgrbyid (QSE_CMGR_SLMB);*/
}
#else
setlocale (LC_ALL, "");
qse_setdflcmgrbyid (QSE_CMGR_SLMB);
/*qse_setdflcmgrbyid (QSE_CMGR_SLMB);*/
#endif

View File

@ -113,11 +113,11 @@ int qse_main (int argc, qse_achar_t* argv[])
qse_fmtuintmaxtombs (locale, QSE_COUNTOF(locale),
codepage, 10, -1, QSE_MT('\0'), QSE_MT("."));
setlocale (LC_ALL, locale);
qse_setdflcmgrbyid (QSE_CMGR_SLMB);
/*qse_setdflcmgrbyid (QSE_CMGR_SLMB);*/
}
#else
setlocale (LC_ALL, "");
qse_setdflcmgrbyid (QSE_CMGR_SLMB);
/*qse_setdflcmgrbyid (QSE_CMGR_SLMB);*/
#endif
qse_openstdsios ();

View File

@ -70,11 +70,11 @@ int qse_main (int argc, qse_achar_t* argv[])
{
sprintf (locale, ".%u", (unsigned int)codepage);
setlocale (LC_ALL, locale);
qse_setdflcmgrbyid (QSE_CMGR_SLMB);
/*qse_setdflcmgrbyid (QSE_CMGR_SLMB);*/
}
#else
setlocale (LC_ALL, "");
qse_setdflcmgrbyid (QSE_CMGR_SLMB);
/*qse_setdflcmgrbyid (QSE_CMGR_SLMB);*/
#endif
qse_openstdsios ();
x = qse_runmain (argc, argv, test_main);

View File

@ -90,11 +90,11 @@ int qse_main (int argc, qse_achar_t* argv[])
{
sprintf (locale, ".%u", (unsigned int)codepage);
setlocale (LC_ALL, locale);
qse_setdflcmgrbyid (QSE_CMGR_SLMB);
/*qse_setdflcmgrbyid (QSE_CMGR_SLMB);*/
}
#else
setlocale (LC_ALL, "");
qse_setdflcmgrbyid (QSE_CMGR_SLMB);
/*qse_setdflcmgrbyid (QSE_CMGR_SLMB);*/
#endif
qse_openstdsios ();
x = qse_runmain (argc, argv, test_main);

View File

@ -89,11 +89,11 @@ int qse_main (int argc, qse_achar_t* argv[])
{
sprintf (locale, ".%u", (unsigned int)codepage);
setlocale (LC_ALL, locale);
qse_setdflcmgrbyid (QSE_CMGR_SLMB);
/*qse_setdflcmgrbyid (QSE_CMGR_SLMB);*/
}
#else
setlocale (LC_ALL, "");
qse_setdflcmgrbyid (QSE_CMGR_SLMB);
/*qse_setdflcmgrbyid (QSE_CMGR_SLMB);*/
#endif
qse_openstdsios ();

View File

@ -118,11 +118,11 @@ int main (int argc, qse_achar_t* argv[])
qse_fmtuintmaxtombs (locale, QSE_COUNTOF(locale),
codepage, 10, -1, QSE_MT('\0'), QSE_MT("."));
setlocale (LC_ALL, locale);
qse_setdflcmgrbyid (QSE_CMGR_SLMB);
/*qse_setdflcmgrbyid (QSE_CMGR_SLMB);*/
}
#else
setlocale (LC_ALL, "");
qse_setdflcmgrbyid (QSE_CMGR_SLMB);
/*qse_setdflcmgrbyid (QSE_CMGR_SLMB);*/
#endif
qse_openstdsios ();

View File

@ -116,11 +116,11 @@ int main (int argc, qse_achar_t* argv[])
qse_fmtuintmaxtombs (locale, QSE_COUNTOF(locale),
codepage, 10, -1, QSE_MT('\0'), QSE_MT("."));
setlocale (LC_ALL, locale);
qse_setdflcmgrbyid (QSE_CMGR_SLMB);
/*qse_setdflcmgrbyid (QSE_CMGR_SLMB);*/
}
#else
setlocale (LC_ALL, "");
qse_setdflcmgrbyid (QSE_CMGR_SLMB);
/*qse_setdflcmgrbyid (QSE_CMGR_SLMB);*/
#endif
qse_openstdsios ();

View File

@ -54,11 +54,11 @@ int qse_main (int argc, qse_achar_t* argv[])
qse_fmtuintmaxtombs (locale, QSE_COUNTOF(locale),
codepage, 10, -1, QSE_MT('\0'), QSE_MT("."));
setlocale (LC_ALL, locale);
qse_setdflcmgrbyid (QSE_CMGR_SLMB);
/*qse_setdflcmgrbyid (QSE_CMGR_SLMB);*/
}
#else
setlocale (LC_ALL, "");
qse_setdflcmgrbyid (QSE_CMGR_SLMB);
/*qse_setdflcmgrbyid (QSE_CMGR_SLMB);*/
#endif
qse_openstdsios ();

View File

@ -201,11 +201,11 @@ int qse_main (int argc, qse_achar_t* argv[])
{
sprintf (locale, ".%u", (unsigned int)codepage);
setlocale (LC_ALL, locale);
qse_setdflcmgrbyid (QSE_CMGR_SLMB);
/*qse_setdflcmgrbyid (QSE_CMGR_SLMB);*/
}
#else
setlocale (LC_ALL, "");
qse_setdflcmgrbyid (QSE_CMGR_SLMB);
/*qse_setdflcmgrbyid (QSE_CMGR_SLMB);*/
#endif
qse_openstdsios ();
x = qse_runmain (argc, argv, test_main);

View File

@ -36,11 +36,11 @@ int qse_main (int argc, qse_achar_t* argv[])
{
sprintf (locale, ".%u", (unsigned int)codepage);
setlocale (LC_ALL, locale);
qse_setdflcmgrbyid (QSE_CMGR_SLMB);
/*qse_setdflcmgrbyid (QSE_CMGR_SLMB);*/
}
#else
setlocale (LC_ALL, "");
qse_setdflcmgrbyid (QSE_CMGR_SLMB);
/*qse_setdflcmgrbyid (QSE_CMGR_SLMB);*/
#endif
qse_openstdsios ();

View File

@ -41,11 +41,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_setdflcmgrbyid (QSE_CMGR_SLMB);
/*qse_setdflcmgrbyid (QSE_CMGR_SLMB);*/
}
#else
setlocale (LC_ALL, "");
qse_setdflcmgrbyid (QSE_CMGR_SLMB);
/*qse_setdflcmgrbyid (QSE_CMGR_SLMB);*/
#endif
qse_openstdsios ();

View File

@ -224,11 +224,11 @@ int main ()
{
sprintf (locale, ".%u", (unsigned int)codepage);
setlocale (LC_ALL, locale);
qse_setdflcmgrbyid (QSE_CMGR_SLMB);
/*qse_setdflcmgrbyid (QSE_CMGR_SLMB);*/
}
#else
setlocale (LC_ALL, "");
qse_setdflcmgrbyid (QSE_CMGR_SLMB);
/*qse_setdflcmgrbyid (QSE_CMGR_SLMB);*/
#endif
qse_openstdsios ();

View File

@ -304,11 +304,11 @@ int main ()
{
sprintf (locale, ".%u", (unsigned int)codepage);
setlocale (LC_ALL, locale);
qse_setdflcmgrbyid (QSE_CMGR_SLMB);
/*qse_setdflcmgrbyid (QSE_CMGR_SLMB);*/
}
#else
setlocale (LC_ALL, "");
qse_setdflcmgrbyid (QSE_CMGR_SLMB);
/*qse_setdflcmgrbyid (QSE_CMGR_SLMB);*/
#endif
qse_openstdsios ();

View File

@ -167,11 +167,11 @@ int qse_main (int argc, qse_achar_t* argv[])
{
sprintf (locale, ".%u", (unsigned int)codepage);
setlocale (LC_ALL, locale);
qse_setdflcmgrbyid (QSE_CMGR_SLMB);
/*qse_setdflcmgrbyid (QSE_CMGR_SLMB);*/
}
#else
setlocale (LC_ALL, "");
qse_setdflcmgrbyid (QSE_CMGR_SLMB);
/*qse_setdflcmgrbyid (QSE_CMGR_SLMB);*/
#endif
qse_openstdsios ();
x = qse_runmain (argc, argv, test_main);

View File

@ -82,11 +82,11 @@ int qse_main (int argc, qse_achar_t* argv[])
qse_fmtuintmaxtombs (locale, QSE_COUNTOF(locale),
codepage, 10, -1, QSE_MT('\0'), QSE_MT("."));
setlocale (LC_ALL, locale);
qse_setdflcmgrbyid (QSE_CMGR_SLMB);
/*qse_setdflcmgrbyid (QSE_CMGR_SLMB);*/
}
#else
setlocale (LC_ALL, "");
qse_setdflcmgrbyid (QSE_CMGR_SLMB);
/*qse_setdflcmgrbyid (QSE_CMGR_SLMB);*/
#endif
qse_openstdsios ();
ret = qse_runmain (argc, argv, test_main);

View File

@ -94,11 +94,11 @@ int qse_main (int argc, qse_achar_t* argv[])
qse_fmtuintmaxtombs (locale, QSE_COUNTOF(locale),
codepage, 10, -1, QSE_MT('\0'), QSE_MT("."));
setlocale (LC_ALL, locale);
qse_setdflcmgrbyid (QSE_CMGR_SLMB);
/*qse_setdflcmgrbyid (QSE_CMGR_SLMB);*/
}
#else
setlocale (LC_ALL, "");
qse_setdflcmgrbyid (QSE_CMGR_SLMB);
/*qse_setdflcmgrbyid (QSE_CMGR_SLMB);*/
#endif
qse_openstdsios ();
ret = qse_runmain (argc, argv, test_main);

View File

@ -79,11 +79,11 @@ int qse_main (int argc, qse_achar_t* argv[])
{
sprintf (locale, ".%u", (unsigned int)codepage);
setlocale (LC_ALL, locale);
qse_setdflcmgrbyid (QSE_CMGR_SLMB);
/*qse_setdflcmgrbyid (QSE_CMGR_SLMB);*/
}
#else
setlocale (LC_ALL, "");
qse_setdflcmgrbyid (QSE_CMGR_SLMB);
/*qse_setdflcmgrbyid (QSE_CMGR_SLMB);*/
#endif
qse_openstdsios ();

View File

@ -83,11 +83,11 @@ int qse_main (int argc, qse_achar_t* argv[])
{
sprintf (locale, ".%u", (unsigned int)codepage);
setlocale (LC_ALL, locale);
qse_setdflcmgrbyid (QSE_CMGR_SLMB);
/*qse_setdflcmgrbyid (QSE_CMGR_SLMB);*/
}
#else
setlocale (LC_ALL, "");
qse_setdflcmgrbyid (QSE_CMGR_SLMB);
/*qse_setdflcmgrbyid (QSE_CMGR_SLMB);*/
#endif
qse_openstdsios ();
x = qse_runmain (argc, argv, rex_main);

View File

@ -106,11 +106,11 @@ int main ()
{
sprintf (locale, ".%u", (unsigned int)codepage);
setlocale (LC_ALL, locale);
qse_setdflcmgrbyid (QSE_CMGR_SLMB);
/*qse_setdflcmgrbyid (QSE_CMGR_SLMB);*/
}
#else
setlocale (LC_ALL, "");
qse_setdflcmgrbyid (QSE_CMGR_SLMB);
/*qse_setdflcmgrbyid (QSE_CMGR_SLMB);*/
#endif
g_out = qse_sio_openstd (QSE_MMGR_GETDFL(), 0, QSE_SIO_STDOUT, QSE_SIO_WRITE | QSE_SIO_IGNOREMBWCERR);

View File

@ -156,11 +156,11 @@ int main ()
{
sprintf (locale, ".%u", (unsigned int)codepage);
setlocale (LC_ALL, locale);
qse_setdflcmgrbyid (QSE_CMGR_SLMB);
/*qse_setdflcmgrbyid (QSE_CMGR_SLMB);*/
}
#else
setlocale (LC_ALL, "");
qse_setdflcmgrbyid (QSE_CMGR_SLMB);
/*qse_setdflcmgrbyid (QSE_CMGR_SLMB);*/
#endif
setlocale (LC_ALL, "");

View File

@ -179,11 +179,11 @@ int main ()
{
sprintf (locale, ".%u", (unsigned int)codepage);
setlocale (LC_ALL, locale);
qse_setdflcmgrbyid (QSE_CMGR_SLMB);
/*qse_setdflcmgrbyid (QSE_CMGR_SLMB);*/
}
#else
setlocale (LC_ALL, "");
qse_setdflcmgrbyid (QSE_CMGR_SLMB);
/*qse_setdflcmgrbyid (QSE_CMGR_SLMB);*/
#endif
g_out = qse_sio_openstd (QSE_MMGR_GETDFL(), 0, QSE_SIO_STDOUT, QSE_SIO_WRITE | QSE_SIO_IGNOREMBWCERR);

View File

@ -208,7 +208,7 @@ int main ()
{
sprintf (locale, ".%u", (unsigned int)codepage);
setlocale (LC_ALL, locale);
qse_setdflcmgrbyid (QSE_CMGR_SLMB);
/*qse_setdflcmgrbyid (QSE_CMGR_SLMB);*/
}
#if 0
@ -221,7 +221,7 @@ int main ()
#else
setlocale (LC_ALL, "");
qse_setdflcmgrbyid (QSE_CMGR_SLMB);
/*qse_setdflcmgrbyid (QSE_CMGR_SLMB);*/
#endif
qse_openstdsios ();

View File

@ -95,11 +95,11 @@ int qse_main (int argc, qse_achar_t* argv[])
{
sprintf (locale, ".%u", (unsigned int)codepage);
setlocale (LC_ALL, locale);
qse_setdflcmgrbyid (QSE_CMGR_SLMB);
/*qse_setdflcmgrbyid (QSE_CMGR_SLMB);*/
}
#else
setlocale (LC_ALL, "");
qse_setdflcmgrbyid (QSE_CMGR_SLMB);
/*qse_setdflcmgrbyid (QSE_CMGR_SLMB);*/
#endif
qse_openstdsios ();

View File

@ -90,11 +90,11 @@ int qse_main (int argc, qse_achar_t* argv[])
{
sprintf (locale, ".%u", (unsigned int)codepage);
setlocale (LC_ALL, locale);
qse_setdflcmgrbyid (QSE_CMGR_SLMB);
/*qse_setdflcmgrbyid (QSE_CMGR_SLMB);*/
}
#else
setlocale (LC_ALL, "");
qse_setdflcmgrbyid (QSE_CMGR_SLMB);
/*qse_setdflcmgrbyid (QSE_CMGR_SLMB);*/
#endif
qse_openstdsios ();
x = qse_runmain (argc, argv, test_main);

View File

@ -129,11 +129,11 @@ int qse_main (int argc, qse_achar_t* argv[])
{
sprintf (locale, ".%u", (unsigned int)codepage);
setlocale (LC_ALL, locale);
qse_setdflcmgrbyid (QSE_CMGR_SLMB);
/*qse_setdflcmgrbyid (QSE_CMGR_SLMB);*/
}
#else
setlocale (LC_ALL, "");
qse_setdflcmgrbyid (QSE_CMGR_SLMB);
/*qse_setdflcmgrbyid (QSE_CMGR_SLMB);*/
#endif
qse_openstdsios ();
x = qse_runmain (argc, argv, test_main);

View File

@ -122,7 +122,7 @@ int qse_main (int argc, qse_achar_t* argv[])
{
sprintf (locale, ".%u", (unsigned int)codepage);
setlocale (LC_ALL, locale);
qse_setdflcmgrbyid (QSE_CMGR_SLMB);
/*qse_setdflcmgrbyid (QSE_CMGR_SLMB);*/
}
if (WSAStartup (MAKEWORD(2,0), &wsadata) != 0)
@ -133,7 +133,7 @@ int qse_main (int argc, qse_achar_t* argv[])
}
#else
setlocale (LC_ALL, "");
qse_setdflcmgrbyid (QSE_CMGR_SLMB);
/*qse_setdflcmgrbyid (QSE_CMGR_SLMB);*/
#endif
#if defined(HAVE_SSL)

View File

@ -257,7 +257,7 @@ int qse_main (int argc, qse_achar_t* argv[])
{
sprintf (locale, ".%u", (unsigned int)codepage);
setlocale (LC_ALL, locale);
qse_setdflcmgrbyid (QSE_CMGR_SLMB);
/*qse_setdflcmgrbyid (QSE_CMGR_SLMB);*/
}
@ -269,7 +269,7 @@ int qse_main (int argc, qse_achar_t* argv[])
#else
setlocale (LC_ALL, "");
qse_setdflcmgrbyid (QSE_CMGR_SLMB);
/*qse_setdflcmgrbyid (QSE_CMGR_SLMB);*/
#endif
#if defined(HAVE_SSL)

View File

@ -885,11 +885,11 @@ int qse_main (int argc, qse_achar_t* argv[])
{
sprintf (locale, ".%u", (unsigned int)codepage);
setlocale (LC_ALL, locale);
qse_setdflcmgrbyid (QSE_CMGR_SLMB);
/*qse_setdflcmgrbyid (QSE_CMGR_SLMB);*/
}
#else
setlocale (LC_ALL, "");
qse_setdflcmgrbyid (QSE_CMGR_SLMB);
/*qse_setdflcmgrbyid (QSE_CMGR_SLMB);*/
#endif
return qse_runmain (argc, argv, upxd_main);

View File

@ -24,10 +24,10 @@ void init_sed_sample_locale (void)
qse_fmtuintmaxtombs (locale, QSE_COUNTOF(locale),
codepage, 10, -1, QSE_MT('\0'), QSE_MT("."));
setlocale (LC_ALL, locale);
qse_setdflcmgrbyid (QSE_CMGR_SLMB);
/*qse_setdflcmgrbyid (QSE_CMGR_SLMB);*/
}
#else
setlocale (LC_ALL, "");
qse_setdflcmgrbyid (QSE_CMGR_SLMB);
/*qse_setdflcmgrbyid (QSE_CMGR_SLMB);*/
#endif
}