diff options
Diffstat (limited to 'netsvcs/servers/main.cpp')
| -rw-r--r-- | netsvcs/servers/main.cpp | 91 |
1 files changed, 40 insertions, 51 deletions
diff --git a/netsvcs/servers/main.cpp b/netsvcs/servers/main.cpp index b134b8db7c7..bd75b4e046f 100644 --- a/netsvcs/servers/main.cpp +++ b/netsvcs/servers/main.cpp @@ -12,7 +12,7 @@ ACE_RCSID(servers, main, "$Id$") int -ACE_TMAIN (int argc, ACE_TCHAR *argv[]) +main (int argc, char *argv[]) { // Try to link in the svc.conf entries dynamically. @@ -25,8 +25,8 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { if (errno != ENOENT) ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("%p\n"), - ACE_TEXT ("open")), + "%p\n", + "open"), 1); else // Use static linking. { @@ -39,83 +39,76 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) // ACE_Service_Object_Ptr which is an <auto_ptr> specialized // for ACE_Service_Object. - ACE_TCHAR *l_argv[3]; - ACE_TCHAR name_port[] = - ACE_TEXT ("-p ") ACE_DEFAULT_NAME_SERVER_PORT_STR; + char *l_argv[3]; + char name_port[] = "-p " ACE_DEFAULT_NAME_SERVER_PORT_STR; l_argv[0] = name_port; l_argv[1] = 0; ACE_Service_Object_Ptr sp_1 = ACE_SVC_INVOKE (ACE_Name_Acceptor); if (sp_1->init (1, l_argv) == -1) - ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("%p\n"), - ACE_TEXT ("Name Service")), - 1); + ACE_ERROR ((LM_ERROR, + "%p\n%a", + "Name Service", + 1)); - ACE_TCHAR time_port[] = - ACE_TEXT ("-p ") ACE_DEFAULT_TIME_SERVER_PORT_STR; + char time_port[] = "-p " ACE_DEFAULT_TIME_SERVER_PORT_STR; l_argv[0] = time_port; l_argv[1] = 0; ACE_Service_Object_Ptr sp_2 = ACE_SVC_INVOKE (ACE_TS_Server_Acceptor); if (sp_2->init (1, l_argv) == -1) - ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("%p\n"), - ACE_TEXT ("TS Server Acceptor")), - 1); + ACE_ERROR ((LM_ERROR, + "%p\n%a", + "TS Server Acceptor", 1)); - ACE_TCHAR clerk_port[] = ACE_TEXT ("-p 10011"); + char clerk_port[] = "-p 10011"; l_argv[0] = argv[0]; l_argv[1] = clerk_port; l_argv[2] = 0; ACE_Service_Object_Ptr sp_3 = ACE_SVC_INVOKE (ACE_TS_Clerk_Processor); if (sp_3->init (2, l_argv) == -1) - ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("%p\n"), - ACE_TEXT ("TS Clerk Processor")), - 1); + ACE_ERROR ((LM_ERROR, + "%p\n%a", + "TS Clerk Processor", + 1)); #if defined (ACE_HAS_TOKENS_LIBRARY) - ACE_TCHAR token_port[] = - ACE_TEXT ("-p ") ACE_DEFAULT_TOKEN_SERVER_PORT_STR; + char token_port[] = "-p " ACE_DEFAULT_TOKEN_SERVER_PORT_STR; l_argv[0] = token_port; l_argv[1] = 0; ACE_Service_Object_Ptr sp_4 = ACE_SVC_INVOKE (ACE_Token_Acceptor); if (sp_4->init (1, l_argv) == -1) - ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("%p\n"), - ACE_TEXT ("Token Service")), - 1); + ACE_ERROR ((LM_ERROR, + "%p\n%a", + "Token Service", + 1)); #endif /* ACE_HAS_TOKENS_LIBRARY */ - ACE_TCHAR thr_logging_port[] = - ACE_TEXT ("-p ") ACE_DEFAULT_THR_LOGGING_SERVER_PORT_STR; + char thr_logging_port[] = "-p " ACE_DEFAULT_THR_LOGGING_SERVER_PORT_STR; l_argv[0] = thr_logging_port; l_argv[1] = 0; ACE_Service_Object_Ptr sp_5 = ACE_SVC_INVOKE (ACE_Thr_Server_Logging_Acceptor); if (sp_5->init (1, l_argv) == -1) - ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("%p\n"), - ACE_TEXT ("Threaded Logging Server")), - 1); + ACE_ERROR ((LM_ERROR, + "%p\n%a", + "Threaded Logging Server", + 1)); - ACE_TCHAR logging_port[] = - ACE_TEXT ("-p ") ACE_DEFAULT_LOGGING_SERVER_PORT_STR; + char logging_port[] = "-p " ACE_DEFAULT_LOGGING_SERVER_PORT_STR; l_argv[0] = logging_port; l_argv[1] = 0; ACE_Service_Object_Ptr sp_6 = ACE_SVC_INVOKE (ACE_Server_Logging_Acceptor); if (sp_6->init (1, l_argv) == -1) - ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("%p\n"), - ACE_TEXT ("Logging Server")), - 1); + ACE_ERROR ((LM_ERROR, + "%p\n%a", + "Logging Server", 1)); l_argv[0] = logging_port; l_argv[1] = 0; @@ -123,10 +116,10 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) ACE_SVC_INVOKE (ACE_Client_Logging_Acceptor); if (sp_7->init (1, l_argv) == -1) - ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("%p\n"), - ACE_TEXT ("Logging Client")), - 1); + ACE_ERROR ((LM_ERROR, + "%p\n%a", + "Logging Client", + 1)); // Run forever, performing the configured services until we // are shut down by a SIGINT/SIGQUIT signal. @@ -138,11 +131,9 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) sig_set.sig_add (SIGQUIT); if (ACE_Reactor::instance ()->register_handler (sig_set, &sa) == -1) - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("%p\n"), - ACE_TEXT ("register signals"))); + ACE_ERROR ((LM_ERROR, ACE_TEXT ("%p\n"))); else - ACE_Reactor::instance ()->run_reactor_event_loop (); + ACE_Reactor::run_event_loop (); // Destructors of ACE_Service_Object_Ptr's automagically // call fini(). @@ -167,11 +158,9 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) // gracefully. if (ACE_Reactor::instance ()->register_handler (sig_set, &sa) == -1) - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("%p\n"), - ACE_TEXT ("register signals2"))); + ACE_ERROR ((LM_ERROR, ACE_TEXT ("%p\n"))); else - ACE_Reactor::instance ()->run_reactor_event_loop (); + ACE_Reactor::run_event_loop (); } return 0; |