diff --git a/qse/cmd/sed/sed.c b/qse/cmd/sed/sed.c index 20208621..253a6630 100644 --- a/qse/cmd/sed/sed.c +++ b/qse/cmd/sed/sed.c @@ -17,7 +17,6 @@ You should have received a copy of the GNU Lesser General Public License along with QSE. If not, see . */ -#if 0 #include #include @@ -1038,6 +1037,4 @@ int qse_main (int argc, qse_achar_t* argv[]) return qse_runmain (argc, argv, sed_main); } -#endif -#include "../../samples/cmn/task01.c" diff --git a/qse/samples/cmn/chr01.c b/qse/samples/cmn/chr01.c index a158c919..0c2f6737 100644 --- a/qse/samples/cmn/chr01.c +++ b/qse/samples/cmn/chr01.c @@ -29,7 +29,7 @@ static int test1 (void) int main () { #if defined(_WIN32) - char locale[100]; + char locale[100]; UINT codepage = GetConsoleOutputCP(); if (codepage == CP_UTF8) { diff --git a/qse/samples/cmn/fmt01.c b/qse/samples/cmn/fmt01.c index a971fc7e..1911235a 100644 --- a/qse/samples/cmn/fmt01.c +++ b/qse/samples/cmn/fmt01.c @@ -8,7 +8,7 @@ # include #endif -static int test_main (int argc, qse_char_t* argv[], qse_char_t* envp[]) +static int test_main (int argc, qse_char_t* argv[]) { qse_char_t buf[19]; int bases[] = { 2, 8, 10, 16 }; @@ -54,10 +54,10 @@ static int test_main (int argc, qse_char_t* argv[], qse_char_t* envp[]) return 0; } -int qse_main (int argc, qse_achar_t* argv[], qse_achar_t* envp[]) +int qse_main (int argc, qse_achar_t* argv[]) { #if defined(_WIN32) - char locale[100]; + char locale[100]; UINT codepage = GetConsoleOutputCP(); if (codepage == CP_UTF8) { @@ -74,6 +74,6 @@ int qse_main (int argc, qse_achar_t* argv[], qse_achar_t* envp[]) setlocale (LC_ALL, ""); qse_setdflcmgrbyid (QSE_CMGR_SLMB); #endif - return qse_runmainwithenv (argc, argv, envp, test_main); + return qse_runmain (argc, argv, test_main); } diff --git a/qse/samples/cmn/fmt02.c b/qse/samples/cmn/fmt02.c index 23c3e152..d4f81f0f 100644 --- a/qse/samples/cmn/fmt02.c +++ b/qse/samples/cmn/fmt02.c @@ -9,7 +9,7 @@ #endif -static int test_main (int argc, qse_char_t* argv[], qse_char_t* envp[]) +static int test_main (int argc, qse_char_t* argv[]) { qse_char_t buf[129]; int bases[] = { 2, 8, 10, 16 }; @@ -74,10 +74,10 @@ static int test_main (int argc, qse_char_t* argv[], qse_char_t* envp[]) return 0; } -int qse_main (int argc, qse_achar_t* argv[], qse_achar_t* envp[]) +int qse_main (int argc, qse_achar_t* argv[]) { #if defined(_WIN32) - char locale[100]; + char locale[100]; UINT codepage = GetConsoleOutputCP(); if (codepage == CP_UTF8) { @@ -94,6 +94,6 @@ int qse_main (int argc, qse_achar_t* argv[], qse_achar_t* envp[]) setlocale (LC_ALL, ""); qse_setdflcmgrbyid (QSE_CMGR_SLMB); #endif - return qse_runmainwithenv (argc, argv, envp, test_main); + return qse_runmain (argc, argv, test_main); } diff --git a/qse/samples/cmn/fs01.c b/qse/samples/cmn/fs01.c index b1064011..62dac617 100644 --- a/qse/samples/cmn/fs01.c +++ b/qse/samples/cmn/fs01.c @@ -76,7 +76,7 @@ int fs_main (int argc, qse_char_t* argv[]) int qse_main (int argc, qse_achar_t* argv[]) { #if defined(_WIN32) - char locale[100]; + char locale[100]; UINT codepage = GetConsoleOutputCP(); if (codepage == CP_UTF8) { diff --git a/qse/samples/cmn/glob01.c b/qse/samples/cmn/glob01.c index fae72ec8..9d380cee 100644 --- a/qse/samples/cmn/glob01.c +++ b/qse/samples/cmn/glob01.c @@ -39,7 +39,7 @@ static int glob_main (int argc, qse_char_t* argv[]) int qse_main (int argc, qse_achar_t* argv[]) { #if defined(_WIN32) - char locale[100]; + char locale[100]; UINT codepage = GetConsoleOutputCP(); if (codepage == CP_UTF8) { diff --git a/qse/samples/cmn/ipad01.c b/qse/samples/cmn/ipad01.c index e71402a2..7cee4b36 100644 --- a/qse/samples/cmn/ipad01.c +++ b/qse/samples/cmn/ipad01.c @@ -178,7 +178,7 @@ static int test_ipad6 (void) return 0; } -static int test_main (int argc, qse_char_t* argv[], qse_char_t* envp[]) +static int test_main (int argc, qse_char_t* argv[]) { test_ipad4 (); qse_printf (QSE_T("==============\n")); @@ -186,10 +186,10 @@ static int test_main (int argc, qse_char_t* argv[], qse_char_t* envp[]) return 0; } -int qse_main (int argc, qse_achar_t* argv[], qse_achar_t* envp[]) +int qse_main (int argc, qse_achar_t* argv[]) { #if defined(_WIN32) - char locale[100]; + char locale[100]; UINT codepage = GetConsoleOutputCP(); if (codepage == CP_UTF8) { @@ -206,6 +206,6 @@ int qse_main (int argc, qse_achar_t* argv[], qse_achar_t* envp[]) setlocale (LC_ALL, ""); qse_setdflcmgrbyid (QSE_CMGR_SLMB); #endif - return qse_runmainwithenv (argc, argv, envp, test_main); + return qse_runmain (argc, argv, test_main); } diff --git a/qse/samples/cmn/main01.c b/qse/samples/cmn/main01.c index 36d14356..a5c67163 100644 --- a/qse/samples/cmn/main01.c +++ b/qse/samples/cmn/main01.c @@ -23,7 +23,7 @@ static int test_main (int argc, qse_char_t* argv[]) int qse_main (int argc, qse_achar_t* argv[]) { #if defined(_WIN32) - char locale[100]; + char locale[100]; UINT codepage = GetConsoleOutputCP(); if (codepage == CP_UTF8) { diff --git a/qse/samples/cmn/main02.c b/qse/samples/cmn/main02.c index f26449e4..90b5c34d 100644 --- a/qse/samples/cmn/main02.c +++ b/qse/samples/cmn/main02.c @@ -28,7 +28,7 @@ static int test_main (int argc, qse_char_t* argv[], qse_char_t* envp[]) int qse_main (int argc, qse_achar_t* argv[], qse_achar_t* envp[]) { #if defined(_WIN32) - char locale[100]; + char locale[100]; UINT codepage = GetConsoleOutputCP(); if (codepage == CP_UTF8) { diff --git a/qse/samples/cmn/nwad01.c b/qse/samples/cmn/nwad01.c index 6f8cf359..239a5684 100644 --- a/qse/samples/cmn/nwad01.c +++ b/qse/samples/cmn/nwad01.c @@ -8,7 +8,7 @@ # include #endif -static int test_main (int argc, qse_char_t* argv[], qse_char_t* envp[]) +static int test_main (int argc, qse_char_t* argv[]) { qse_nwad_t nwad; qse_char_t buf[64]; @@ -152,7 +152,7 @@ static int test_main (int argc, qse_char_t* argv[], qse_char_t* envp[]) return 0; } -int qse_main (int argc, qse_achar_t* argv[], qse_achar_t* envp[]) +int qse_main (int argc, qse_achar_t* argv[]) { #if defined(_WIN32) char locale[100]; @@ -172,6 +172,6 @@ int qse_main (int argc, qse_achar_t* argv[], qse_achar_t* envp[]) setlocale (LC_ALL, ""); qse_setdflcmgrbyid (QSE_CMGR_SLMB); #endif - return qse_runmainwithenv (argc, argv, envp, test_main); + return qse_runmain (argc, argv, test_main); } diff --git a/qse/samples/cmn/path01.c b/qse/samples/cmn/path01.c index 64592ba4..2e55c92d 100644 --- a/qse/samples/cmn/path01.c +++ b/qse/samples/cmn/path01.c @@ -66,7 +66,7 @@ static int path_main (int argc, qse_char_t* argv[]) int qse_main (int argc, qse_achar_t* argv[]) { #if defined(_WIN32) - char locale[100]; + char locale[100]; UINT codepage = GetConsoleOutputCP(); if (codepage == CP_UTF8) { diff --git a/qse/samples/cmn/rex01.c b/qse/samples/cmn/rex01.c index 8401fde2..42c5d400 100644 --- a/qse/samples/cmn/rex01.c +++ b/qse/samples/cmn/rex01.c @@ -71,7 +71,7 @@ static int rex_main (int argc, qse_char_t* argv[]) int qse_main (int argc, qse_achar_t* argv[]) { #if defined(_WIN32) - char locale[100]; + char locale[100]; UINT codepage = GetConsoleOutputCP(); if (codepage == CP_UTF8) { diff --git a/qse/samples/cmn/sio01.c b/qse/samples/cmn/sio01.c index 4f91d98f..4bbc9d63 100644 --- a/qse/samples/cmn/sio01.c +++ b/qse/samples/cmn/sio01.c @@ -93,7 +93,7 @@ static int test2 (void) int main () { #if defined(_WIN32) - char locale[100]; + char locale[100]; UINT codepage = GetConsoleOutputCP(); if (codepage == CP_UTF8) { diff --git a/qse/samples/cmn/sio02.c b/qse/samples/cmn/sio02.c index 108fa558..abe654f2 100644 --- a/qse/samples/cmn/sio02.c +++ b/qse/samples/cmn/sio02.c @@ -146,7 +146,7 @@ int main () { #if defined(_WIN32) - char locale[100]; + char locale[100]; UINT codepage = GetConsoleOutputCP(); if (codepage == CP_UTF8) { diff --git a/qse/samples/cmn/sio03.c b/qse/samples/cmn/sio03.c index 7a43aa58..26b904e3 100644 --- a/qse/samples/cmn/sio03.c +++ b/qse/samples/cmn/sio03.c @@ -134,7 +134,7 @@ static int test3 (void) int main () { #if defined(_WIN32) - char locale[100]; + char locale[100]; UINT codepage = GetConsoleOutputCP(); if (codepage == CP_UTF8) { diff --git a/qse/samples/cmn/slmb01.c b/qse/samples/cmn/slmb01.c index 8f5cea2b..830f8d00 100644 --- a/qse/samples/cmn/slmb01.c +++ b/qse/samples/cmn/slmb01.c @@ -195,7 +195,7 @@ static int test3 (void) int main () { #if defined(_WIN32) - char locale[100]; + char locale[100]; UINT codepage = GetConsoleOutputCP(); if (codepage == CP_UTF8) { diff --git a/qse/samples/cmn/tre01.c b/qse/samples/cmn/tre01.c index 37fa2fdf..4566c43c 100644 --- a/qse/samples/cmn/tre01.c +++ b/qse/samples/cmn/tre01.c @@ -12,7 +12,7 @@ #endif -static int test_main (int argc, qse_char_t* argv[], qse_char_t* envp[]) +static int test_main (int argc, qse_char_t* argv[]) { qse_tre_t tre; unsigned int nsubmat; @@ -75,10 +75,10 @@ oops: return -1; } -int qse_main (int argc, qse_achar_t* argv[], qse_achar_t* envp[]) +int qse_main (int argc, qse_achar_t* argv[]) { #if defined(_WIN32) - char locale[100]; + char locale[100]; UINT codepage = GetConsoleOutputCP(); if (codepage == CP_UTF8) { @@ -95,6 +95,6 @@ int qse_main (int argc, qse_achar_t* argv[], qse_achar_t* envp[]) setlocale (LC_ALL, ""); qse_setdflcmgrbyid (QSE_CMGR_SLMB); #endif - return qse_runmainwithenv (argc, argv, envp, test_main); + return qse_runmain (argc, argv, test_main); } diff --git a/qse/samples/cmn/uri01.c b/qse/samples/cmn/uri01.c index bcad0c89..e21ebd40 100644 --- a/qse/samples/cmn/uri01.c +++ b/qse/samples/cmn/uri01.c @@ -24,7 +24,7 @@ static void xxx (const qse_wchar_t* ptr, qse_size_t len) } } -static int test_main (int argc, qse_char_t* argv[], qse_char_t* envp[]) +static int test_main (int argc, qse_char_t* argv[]) { static const qse_wchar_t* wcs[] = { @@ -114,10 +114,10 @@ static int test_main (int argc, qse_char_t* argv[], qse_char_t* envp[]) return 0; } -int qse_main (int argc, qse_achar_t* argv[], qse_achar_t* envp[]) +int qse_main (int argc, qse_achar_t* argv[]) { #if defined(_WIN32) - char locale[100]; + char locale[100]; UINT codepage = GetConsoleOutputCP(); if (codepage == CP_UTF8) { @@ -134,6 +134,6 @@ int qse_main (int argc, qse_achar_t* argv[], qse_achar_t* envp[]) setlocale (LC_ALL, ""); qse_setdflcmgrbyid (QSE_CMGR_SLMB); #endif - return qse_runmainwithenv (argc, argv, envp, test_main); + return qse_runmain (argc, argv, test_main); }