diff options
Diffstat (limited to 'ACE/examples')
5 files changed, 22 insertions, 47 deletions
diff --git a/ACE/examples/ASX/Event_Server/Event_Server/Consumer_Router.cpp b/ACE/examples/ASX/Event_Server/Event_Server/Consumer_Router.cpp index 489a6d3dacc..287fefcf1fc 100644 --- a/ACE/examples/ASX/Event_Server/Event_Server/Consumer_Router.cpp +++ b/ACE/examples/ASX/Event_Server/Event_Server/Consumer_Router.cpp @@ -124,11 +124,6 @@ Consumer_Router::put (ACE_Message_Block *mb, } // Return information about the <Consumer_Router>. -#if defined (ACE_WIN32) || !defined (ACE_USES_WCHAR) -# define FMTSTR ACE_TEXT ("%s\t %d/%s %s (%s)\n") -#else -# define FMTSTR ACE_TEXT ("%ls\t %d/%ls %ls (%ls)\n") -#endif /* ACE_WIN32 || !ACE_USES_WCHAR */ int Consumer_Router::info (ACE_TCHAR **strp, size_t length) const @@ -141,7 +136,11 @@ Consumer_Router::info (ACE_TCHAR **strp, size_t length) const return -1; ACE_OS::sprintf (buf, - FMTSTR, + ACE_TEXT ("%") ACE_TEXT_PRIs + ACE_TEXT ("\t %d/%") ACE_TEXT_PRIs + ACE_TEXT (" %") ACE_TEXT_PRIs + ACE_TEXT (" (%") ACE_TEXT_PRIs + ACE_TEXT (")\n"), module_name, addr.get_port_number (), ACE_TEXT ("tcp"), diff --git a/ACE/examples/ASX/Event_Server/Event_Server/Supplier_Router.cpp b/ACE/examples/ASX/Event_Server/Event_Server/Supplier_Router.cpp index 8b5e41dab67..edea2f8968d 100644 --- a/ACE/examples/ASX/Event_Server/Event_Server/Supplier_Router.cpp +++ b/ACE/examples/ASX/Event_Server/Event_Server/Supplier_Router.cpp @@ -130,11 +130,6 @@ Supplier_Router::put (ACE_Message_Block *mb, } // Return information about the <Supplier_Router>. -#if defined (ACE_WIN32) || !defined (ACE_USES_WCHAR) -# define FMTSTR ACE_TEXT ("%s\t %d/%s %s (%s)\n") -#else -# define FMTSTR ACE_TEXT ("%ls\t %d/%ls %ls (%ls)\n") -#endif /* ACE_WIN32 || !ACE_USES_WCHAR */ int Supplier_Router::info (ACE_TCHAR **strp, size_t length) const @@ -147,7 +142,11 @@ Supplier_Router::info (ACE_TCHAR **strp, size_t length) const return -1; ACE_OS::sprintf (buf, - FMTSTR, + ACE_TEXT ("%") ACE_TEXT_PRIs + ACE_TEXT ("\t %d/%") ACE_TEXT_PRIs + ACE_TEXT (" %") ACE_TEXT_PRIs + ACE_TEXT (" (%") ACE_TEXT_PRIs + ACE_TEXT (")\n"), module_name, addr.get_port_number (), ACE_TEXT ("tcp"), diff --git a/ACE/examples/ASX/UPIPE_Event_Server/Consumer_Router.cpp b/ACE/examples/ASX/UPIPE_Event_Server/Consumer_Router.cpp index 37a3f6bbb3b..9f756808704 100644 --- a/ACE/examples/ASX/UPIPE_Event_Server/Consumer_Router.cpp +++ b/ACE/examples/ASX/UPIPE_Event_Server/Consumer_Router.cpp @@ -116,13 +116,10 @@ Consumer_Router::info (ACE_TCHAR **strp, size_t length) const if (sa.get_local_addr (addr) == -1) return -1; -#if !defined (ACE_WIN32) && defined (ACE_USES_WCHAR) -# define FMTSTR ACE_TEXT ("%ls\t %ls/ %ls") -#else -# define FMTSTR ACE_TEXT ("%s\t %s/ %s") -#endif - - ACE_OS::sprintf (buf, FMTSTR, + ACE_OS::sprintf (buf, + ACE_TEXT ("%") ACE_TEXT_PRIs + ACE_TEXT ("\t %") ACE_TEXT_PRIs + ACE_TEXT ("/ %") ACE_TEXT_PRIs, module_name, ACE_TEXT ("upipe"), ACE_TEXT ("# consumer router\n")); diff --git a/ACE/examples/ASX/UPIPE_Event_Server/Supplier_Router.cpp b/ACE/examples/ASX/UPIPE_Event_Server/Supplier_Router.cpp index 246dd46374b..17cf3dd51f2 100644 --- a/ACE/examples/ASX/UPIPE_Event_Server/Supplier_Router.cpp +++ b/ACE/examples/ASX/UPIPE_Event_Server/Supplier_Router.cpp @@ -115,13 +115,10 @@ Supplier_Router::info (ACE_TCHAR **strp, size_t length) const if (sa.get_local_addr (addr) == -1) return -1; -#if !defined (ACE_WIN32) && defined (ACE_USES_WCHAR) -# define FMTSTR ACE_TEXT ("%ls\t %ls/ %ls") -#else -# define FMTSTR ACE_TEXT ("%s\t %s/ %s") -#endif - - ACE_OS::sprintf (buf, FMTSTR, + ACE_OS::sprintf (buf, + ACE_TEXT ("%") ACE_TEXT_PRIs + ACE_TEXT ("\t %") ACE_TEXT_PRIs + ACE_TEXT ("/ %") ACE_TEXT_PRIs, module_name, ACE_TEXT ("upipe"), ACE_TEXT ("# supplier router\n")); diff --git a/ACE/examples/OS/Process/process.cpp b/ACE/examples/OS/Process/process.cpp index c96553954a2..75eab28aecb 100644 --- a/ACE/examples/OS/Process/process.cpp +++ b/ACE/examples/OS/Process/process.cpp @@ -180,11 +180,7 @@ static void test_ls (void) { ACE_Process_Options options; -#if defined (ACE_WIN32) || !defined (ACE_USES_WCHAR) - options.command_line (ACE_TEXT ("%s -al"), LS_PATH); -#else - options.command_line (ACE_TEXT ("%ls -al"), LS_PATH); -#endif + options.command_line (ACE_TEXT ("%") ACE_TEXT_PRIs ACE_TEXT (" -al"), LS_PATH); ACE_Process new_process; if (new_process.spawn (options) == -1) { @@ -206,11 +202,7 @@ static void test_wait (void) { ACE_Process_Options options; -#if defined (ACE_WIN32) || !defined (ACE_USES_WCHAR) - options.command_line (ACE_TEXT ("%s 10"), SLEEP_PATH); -#else - options.command_line (ACE_TEXT ("%ls 10"), SLEEP_PATH); -#endif + options.command_line (ACE_TEXT ("%") ACE_TEXT_PRIs ACE_TEXT (" 10"), SLEEP_PATH); ACE_Process process1; if (process1.spawn (options) == -1) { @@ -465,11 +457,7 @@ test_setenv (const ACE_TCHAR *argv0) options.setenv (ACE_TEXT ("ACE_PROCESS_TEST= here's a large number %u"), 0 - 1); options.setenv (ACE_TEXT ("ACE_PROCESS_TEST2"), ACE_TEXT ("ophilli")); -#if defined (ACE_WIN32) || !defined (ACE_USES_WCHAR) - options.command_line ("%s -g", argv0); -#else - options.command_line ("%ls -g", argv0); -#endif + options.command_line (ACE_TEXT ("%") ACE_TEXT_PRIs ACE_TEXT (" -g", argv0); ACE_Process process; if (process.spawn (options) == -1) { @@ -521,13 +509,8 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) if (run_all) { -#if defined (ACE_WIN32) || !defined (ACE_USES_WCHAR) - const ACE_TCHAR *cmdline = ACE_TEXT ("%s -d -l -s -w"); -#else - const ACE_TCHAR *cmdline = ACE_TEXT ("%ls -d -l -s -w"); -#endif ACE_Process_Options options; - options.command_line (cmdline, argv[0]); + options.command_line (ACE_TEXT ("%") ACE_TEXT_PRIs ACE_TEXT (" -d -l -s -w"), argv[0]); ACE_Process process; if (process.spawn (options) == -1) ACE_ERROR_RETURN ((LM_ERROR, |