diff options
Diffstat (limited to 'TAO/tests')
67 files changed, 105 insertions, 106 deletions
diff --git a/TAO/tests/AMI/client.cpp b/TAO/tests/AMI/client.cpp index 3cc278ceee2..54b9e442187 100644 --- a/TAO/tests/AMI/client.cpp +++ b/TAO/tests/AMI/client.cpp @@ -202,7 +202,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) if (CORBA::is_nil (server.in ())) { ACE_ERROR_RETURN ((LM_ERROR, - "Object reference <%s> is nil\n", + "Object reference <%C> is nil.\n", ior), 1); } diff --git a/TAO/tests/AMI/simple_client.cpp b/TAO/tests/AMI/simple_client.cpp index 0bc0bcd299e..1a36094c5c9 100644 --- a/TAO/tests/AMI/simple_client.cpp +++ b/TAO/tests/AMI/simple_client.cpp @@ -209,7 +209,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) if (CORBA::is_nil (ami_test_var.in ())) { ACE_ERROR_RETURN ((LM_ERROR, - "Object reference <%s> is nil\n", + "Object reference <%C> is nil.\n", ior), 1); } diff --git a/TAO/tests/AMI_Timeouts/client.cpp b/TAO/tests/AMI_Timeouts/client.cpp index d5d603c56a3..82a7154f84e 100644 --- a/TAO/tests/AMI_Timeouts/client.cpp +++ b/TAO/tests/AMI_Timeouts/client.cpp @@ -79,7 +79,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) if (CORBA::is_nil (timeout_var.in ())) { ACE_ERROR_RETURN ((LM_ERROR, - "Object reference <%s> is nil\n", + "Object reference <%C> is nil.\n", ior), 1); } diff --git a/TAO/tests/BiDirectional/client.cpp b/TAO/tests/BiDirectional/client.cpp index 5700be91119..2dbeefc15f6 100644 --- a/TAO/tests/BiDirectional/client.cpp +++ b/TAO/tests/BiDirectional/client.cpp @@ -101,7 +101,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) if (CORBA::is_nil (server.in ())) { ACE_ERROR_RETURN ((LM_ERROR, - "Object reference <%s> is nil\n", + "Object reference <%C> is nil.\n", ior), 1); } diff --git a/TAO/tests/BiDirectional_DelayedUpcall/client.cpp b/TAO/tests/BiDirectional_DelayedUpcall/client.cpp index b4c5a02646f..35d97f9cedc 100644 --- a/TAO/tests/BiDirectional_DelayedUpcall/client.cpp +++ b/TAO/tests/BiDirectional_DelayedUpcall/client.cpp @@ -102,7 +102,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) if (CORBA::is_nil (server.in ())) { ACE_ERROR_RETURN ((LM_ERROR, - "Object reference <%s> is nil\n", + "Object reference <%C> is nil.\n", ior), 1); } diff --git a/TAO/tests/BiDirectional_NestedUpcall/client.cpp b/TAO/tests/BiDirectional_NestedUpcall/client.cpp index 0eddda7dce9..7e5203a41e4 100644 --- a/TAO/tests/BiDirectional_NestedUpcall/client.cpp +++ b/TAO/tests/BiDirectional_NestedUpcall/client.cpp @@ -102,7 +102,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) if (CORBA::is_nil (server.in ())) { ACE_ERROR_RETURN ((LM_ERROR, - "Object reference <%s> is nil\n", + "Object reference <%C> is nil.\n", ior), 1); } diff --git a/TAO/tests/Big_AMI/client.cpp b/TAO/tests/Big_AMI/client.cpp index 118f15017ee..e2a2cb1b722 100644 --- a/TAO/tests/Big_AMI/client.cpp +++ b/TAO/tests/Big_AMI/client.cpp @@ -151,7 +151,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) if (CORBA::is_nil (ami_test_var.in ())) { ACE_ERROR_RETURN ((LM_ERROR, - "Object reference <%s> is nil\n", + "Object reference <%C> is nil.\n", ior), 1); } diff --git a/TAO/tests/Bug_2174_Regression/client.cpp b/TAO/tests/Bug_2174_Regression/client.cpp index 26bf863c64b..60776a00ae6 100644 --- a/TAO/tests/Bug_2174_Regression/client.cpp +++ b/TAO/tests/Bug_2174_Regression/client.cpp @@ -61,7 +61,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) if (CORBA::is_nil (server.in ())) { ACE_ERROR_RETURN ((LM_ERROR, - "Object reference <%s> is nil\n", + "Object reference <%C> is nil.\n", ior), 1); } diff --git a/TAO/tests/Bug_2356_Regression/client.cpp b/TAO/tests/Bug_2356_Regression/client.cpp index fa9cba5e72b..4d81bb96136 100644 --- a/TAO/tests/Bug_2356_Regression/client.cpp +++ b/TAO/tests/Bug_2356_Regression/client.cpp @@ -145,7 +145,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) if (CORBA::is_nil (ami_test_var.in ())) { ACE_ERROR_RETURN ((LM_ERROR, - "Object reference <%s> is nil\n", + "Object reference <%C> is nil.\n", ior), 1); } diff --git a/TAO/tests/Bug_2494_Regression/client.cpp b/TAO/tests/Bug_2494_Regression/client.cpp index 2dd48c135ec..a479c53770e 100644 --- a/TAO/tests/Bug_2494_Regression/client.cpp +++ b/TAO/tests/Bug_2494_Regression/client.cpp @@ -113,7 +113,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) if (CORBA::is_nil (server.in ())) { ACE_ERROR_RETURN ((LM_ERROR, - "Object reference <%s> is nil\n", + "Object reference <%C> is nil.\n", ior), 1); } diff --git a/TAO/tests/Bug_2734_Regression/client.cpp b/TAO/tests/Bug_2734_Regression/client.cpp index cefad0d2ce7..56643266922 100644 --- a/TAO/tests/Bug_2734_Regression/client.cpp +++ b/TAO/tests/Bug_2734_Regression/client.cpp @@ -104,7 +104,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) if (CORBA::is_nil (server.in ())) { ACE_ERROR_RETURN ((LM_ERROR, - "Object reference <%s> is nil\n", + "Object reference <%C> is nil.\n", ior), 1); } diff --git a/TAO/tests/Bug_2805_Regression/client.cpp b/TAO/tests/Bug_2805_Regression/client.cpp index d3ac82d9198..cd642520aa7 100644 --- a/TAO/tests/Bug_2805_Regression/client.cpp +++ b/TAO/tests/Bug_2805_Regression/client.cpp @@ -205,7 +205,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) if (CORBA::is_nil (server.in ())) { ACE_ERROR_RETURN ((LM_ERROR, - "Object reference <%s> is nil\n", + "Object reference <%C> is nil.\n", ior), 1); } diff --git a/TAO/tests/Bug_2909_Regression/client.cpp b/TAO/tests/Bug_2909_Regression/client.cpp index 9cabdb20896..bcefbe6e7c9 100644 --- a/TAO/tests/Bug_2909_Regression/client.cpp +++ b/TAO/tests/Bug_2909_Regression/client.cpp @@ -188,7 +188,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) if (CORBA::is_nil (server.in ())) { ACE_ERROR_RETURN ((LM_ERROR, - "Object reference <%s> is nil\n", + "Object reference <%C> is nil.\n", ior), 1); } diff --git a/TAO/tests/DII_AMI_Forward/client.cpp b/TAO/tests/DII_AMI_Forward/client.cpp index 8dd98375a18..2f1e5e7ab78 100644 --- a/TAO/tests/DII_AMI_Forward/client.cpp +++ b/TAO/tests/DII_AMI_Forward/client.cpp @@ -63,7 +63,7 @@ do_primary_test (CORBA::Object_var &server, if (CORBA::is_nil (server.in ())) { ACE_ERROR ((LM_ERROR, - "Object reference <%s> is nil\n", + "Object reference <%C> is nil.\n", ior)); return; } diff --git a/TAO/tests/DIOP/client.cpp b/TAO/tests/DIOP/client.cpp index 84cb42d671d..9e126878b38 100644 --- a/TAO/tests/DIOP/client.cpp +++ b/TAO/tests/DIOP/client.cpp @@ -92,7 +92,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) if (CORBA::is_nil (udp_var.in ())) ACE_ERROR_RETURN ((LM_ERROR, - "Object reference <%s> is nil\n", + "Object reference <%C> is nil.\n", ior), 1); diff --git a/TAO/tests/DSI_AMI_Gateway/client.cpp b/TAO/tests/DSI_AMI_Gateway/client.cpp index 527f8ae33d9..1e826372f2a 100644 --- a/TAO/tests/DSI_AMI_Gateway/client.cpp +++ b/TAO/tests/DSI_AMI_Gateway/client.cpp @@ -82,7 +82,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) if (CORBA::is_nil (server.in ())) { ACE_ERROR_RETURN ((LM_ERROR, - "Object reference <%s> is nil\n", + "Object reference <%C> is nil.\n", ior), 1); } diff --git a/TAO/tests/DSI_Gateway/client.cpp b/TAO/tests/DSI_Gateway/client.cpp index 0530a24f233..b246f60252f 100644 --- a/TAO/tests/DSI_Gateway/client.cpp +++ b/TAO/tests/DSI_Gateway/client.cpp @@ -82,7 +82,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) if (CORBA::is_nil (server.in ())) { ACE_ERROR_RETURN ((LM_ERROR, - "Object reference <%s> is nil\n", + "Object reference <%C> is nil.\n", ior), 1); } diff --git a/TAO/tests/Faults/client.cpp b/TAO/tests/Faults/client.cpp index 8872fbc741b..dd06d444811 100644 --- a/TAO/tests/Faults/client.cpp +++ b/TAO/tests/Faults/client.cpp @@ -103,7 +103,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) if (CORBA::is_nil (server.in ())) { ACE_ERROR_RETURN ((LM_ERROR, - "Object reference <%s> is nil\n", + "Object reference <%C> is nil.\n", ior), 1); } diff --git a/TAO/tests/Faults/middle.cpp b/TAO/tests/Faults/middle.cpp index 02b222ed4ae..7968b420e94 100644 --- a/TAO/tests/Faults/middle.cpp +++ b/TAO/tests/Faults/middle.cpp @@ -82,7 +82,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) if (CORBA::is_nil (server.in ())) { ACE_ERROR_RETURN ((LM_ERROR, - "Object reference <%s> is nil\n", + "Object reference <%C> is nil.\n", ior), 1); } diff --git a/TAO/tests/Faults/pong.cpp b/TAO/tests/Faults/pong.cpp index d35d70462ab..dc51e7fb2f4 100644 --- a/TAO/tests/Faults/pong.cpp +++ b/TAO/tests/Faults/pong.cpp @@ -153,7 +153,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) if (CORBA::is_nil (server.in ())) { ACE_ERROR_RETURN ((LM_ERROR, - "Object reference <%s> is nil\n", + "Object reference <%C> is nil.\n", ior), 1); } diff --git a/TAO/tests/Forwarding/client.cpp b/TAO/tests/Forwarding/client.cpp index 2cdade2b1a9..d451008cd67 100644 --- a/TAO/tests/Forwarding/client.cpp +++ b/TAO/tests/Forwarding/client.cpp @@ -160,7 +160,7 @@ Worker::run_test (void) if (CORBA::is_nil (server.in ())) { ACE_ERROR ((LM_ERROR, - "Object reference <%s> is nil\n", + "Object reference <%C> is nil.\n", ior)); return; } diff --git a/TAO/tests/MProfile/client.cpp b/TAO/tests/MProfile/client.cpp index 86324c1c053..bf39c2137a9 100644 --- a/TAO/tests/MProfile/client.cpp +++ b/TAO/tests/MProfile/client.cpp @@ -93,7 +93,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) if (CORBA::is_nil (server.in ())) { ACE_ERROR_RETURN ((LM_ERROR, - "Object reference <%s> is nil\n", + "Object reference <%C> is nil.\n", ior), 1); } diff --git a/TAO/tests/MProfile_Connection_Timeout/client.cpp b/TAO/tests/MProfile_Connection_Timeout/client.cpp index a5a4a5baa67..70494c31980 100644 --- a/TAO/tests/MProfile_Connection_Timeout/client.cpp +++ b/TAO/tests/MProfile_Connection_Timeout/client.cpp @@ -124,7 +124,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) if (CORBA::is_nil (server.in ())) { ACE_ERROR_RETURN ((LM_ERROR, - "Object reference <%s> is nil\n", + "Object reference <%C> is nil.\n", ior), 1); } diff --git a/TAO/tests/MT_BiDir/client.cpp b/TAO/tests/MT_BiDir/client.cpp index 7008ce77e8c..3af6ef37361 100644 --- a/TAO/tests/MT_BiDir/client.cpp +++ b/TAO/tests/MT_BiDir/client.cpp @@ -99,7 +99,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) if (CORBA::is_nil (sender.in ())) { ACE_ERROR_RETURN ((LM_ERROR, - "Object reference <%s> is nil\n", + "Object reference <%C> is nil.\n", ior), 1); } diff --git a/TAO/tests/MT_Client/client.cpp b/TAO/tests/MT_Client/client.cpp index c72c483dad9..0647083f057 100644 --- a/TAO/tests/MT_Client/client.cpp +++ b/TAO/tests/MT_Client/client.cpp @@ -95,7 +95,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) if (CORBA::is_nil (server.in ())) { ACE_ERROR_RETURN ((LM_ERROR, - "Object reference <%s> is nil\n", + "Object reference <%C> is nil.\n", ior), 1); } diff --git a/TAO/tests/MT_Client/orb_creation.cpp b/TAO/tests/MT_Client/orb_creation.cpp index be5a9ddf16a..596287ee550 100644 --- a/TAO/tests/MT_Client/orb_creation.cpp +++ b/TAO/tests/MT_Client/orb_creation.cpp @@ -88,7 +88,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) if (CORBA::is_nil (server.in ())) { ACE_ERROR_RETURN ((LM_ERROR, - "Object reference <%s> is nil\n", + "Object reference <%C> is nil.\n", ior), 1); } diff --git a/TAO/tests/MT_Server/client.cpp b/TAO/tests/MT_Server/client.cpp index 2a5a954824e..9ffc25b4fa1 100644 --- a/TAO/tests/MT_Server/client.cpp +++ b/TAO/tests/MT_Server/client.cpp @@ -65,7 +65,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) if (CORBA::is_nil (server.in ())) { ACE_ERROR_RETURN ((LM_ERROR, - "Object reference <%s> is nil\n", + "Object reference <%C> is nil.\n", ior), 1); } diff --git a/TAO/tests/Muxed_GIOP_Versions/client.cpp b/TAO/tests/Muxed_GIOP_Versions/client.cpp index 0d276522e8d..1d686d03137 100644 --- a/TAO/tests/Muxed_GIOP_Versions/client.cpp +++ b/TAO/tests/Muxed_GIOP_Versions/client.cpp @@ -99,7 +99,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) if (CORBA::is_nil (server.in ())) { ACE_ERROR_RETURN ((LM_ERROR, - "Object reference <%s> is nil\n", + "Object reference <%C> is nil.\n", ior), 1); } diff --git a/TAO/tests/Native_Exceptions/client.cpp b/TAO/tests/Native_Exceptions/client.cpp index 7aeeb0ab0a3..211bcdbfa23 100644 --- a/TAO/tests/Native_Exceptions/client.cpp +++ b/TAO/tests/Native_Exceptions/client.cpp @@ -59,7 +59,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) if (CORBA::is_nil (server.in ())) { ACE_ERROR_RETURN ((LM_ERROR, - "Object reference <%s> is nil\n", + "Object reference <%C> is nil.\n", ior), 1); } diff --git a/TAO/tests/No_Server_MT_Connect_Test/client.cpp b/TAO/tests/No_Server_MT_Connect_Test/client.cpp index f028dc058a0..cb36dfaed2d 100644 --- a/TAO/tests/No_Server_MT_Connect_Test/client.cpp +++ b/TAO/tests/No_Server_MT_Connect_Test/client.cpp @@ -91,7 +91,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) if (CORBA::is_nil (server.in ())) { ACE_ERROR_RETURN ((LM_ERROR, - "Object reference <%s> is nil\n", + "Object reference <%C> is nil.\n", ior), 1); } diff --git a/TAO/tests/ORT/client.cpp b/TAO/tests/ORT/client.cpp index 9d0945ebd74..8bbfda121c7 100644 --- a/TAO/tests/ORT/client.cpp +++ b/TAO/tests/ORT/client.cpp @@ -53,7 +53,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) if (CORBA::is_nil (server.in ())) { ACE_ERROR_RETURN ((LM_ERROR, - "Object reference <%s> is nil.\n", + "Object reference <%C> is nil.\n", ior), 1); } diff --git a/TAO/tests/OctetSeq/client.cpp b/TAO/tests/OctetSeq/client.cpp index 2738fbec553..394d242ecd3 100644 --- a/TAO/tests/OctetSeq/client.cpp +++ b/TAO/tests/OctetSeq/client.cpp @@ -75,7 +75,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) if (CORBA::is_nil (server.in ())) { ACE_ERROR_RETURN ((LM_ERROR, - "Object reference <%s> is nil\n", + "Object reference <%C> is nil.\n", ior), 1); } diff --git a/TAO/tests/POA/Bug_1592_Regression/client.cpp b/TAO/tests/POA/Bug_1592_Regression/client.cpp index e6769492561..e5687e1dbe7 100644 --- a/TAO/tests/POA/Bug_1592_Regression/client.cpp +++ b/TAO/tests/POA/Bug_1592_Regression/client.cpp @@ -57,7 +57,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) if (CORBA::is_nil (server.in ())) { ACE_ERROR_RETURN ((LM_ERROR, - "Object reference <%s> is nil\n", + "Object reference <%C> is nil.\n", ior), 1); } diff --git a/TAO/tests/Portable_Interceptors/Benchmark/client.cpp b/TAO/tests/Portable_Interceptors/Benchmark/client.cpp index 1ecdb680548..a5832a25c08 100644 --- a/TAO/tests/Portable_Interceptors/Benchmark/client.cpp +++ b/TAO/tests/Portable_Interceptors/Benchmark/client.cpp @@ -201,7 +201,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) if (CORBA::is_nil (server.in ())) { ACE_ERROR_RETURN ((LM_ERROR, - "Object reference <%s> is nil\n", + "Object reference <%C> is nil.\n", ior), 1); } diff --git a/TAO/tests/Portable_Interceptors/Bug_1559/client.cpp b/TAO/tests/Portable_Interceptors/Bug_1559/client.cpp index dcd8f996c2d..2c7caed87ff 100644 --- a/TAO/tests/Portable_Interceptors/Bug_1559/client.cpp +++ b/TAO/tests/Portable_Interceptors/Bug_1559/client.cpp @@ -96,7 +96,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) if (CORBA::is_nil (server.in ())) { ACE_ERROR_RETURN ((LM_ERROR, - "Object reference <%s> is nil\n", + "Object reference <%C> is nil.\n", ior), 1); } diff --git a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/client.cpp b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/client.cpp index bfc4553b549..1eea5613b0b 100644 --- a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/client.cpp +++ b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/client.cpp @@ -82,7 +82,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) if (CORBA::is_nil (server.in ())) { ACE_ERROR_RETURN ((LM_ERROR, - "Object reference <%s> is nil\n", + "Object reference <%C> is nil.\n", ior), 1); } diff --git a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/client_interceptor.cpp b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/client_interceptor.cpp index 146f0606559..2c261b4fbef 100644 --- a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/client_interceptor.cpp +++ b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/client_interceptor.cpp @@ -51,7 +51,7 @@ Echo_Client_Request_Interceptor::send_request ( CORBA::Object_var target = ri->target (); - ACE_DEBUG ((LM_DEBUG,"%s.send_request from %s\n", this->myname_, operation.in ())); + ACE_DEBUG ((LM_DEBUG,"%C.send_request from %C\n", this->myname_, operation.in ())); // Make the context to send to the target IOP::ServiceContext sc; @@ -77,7 +77,7 @@ Echo_Client_Request_Interceptor::receive_reply ( CORBA::Object_var target = ri->target (); - ACE_DEBUG ((LM_DEBUG,"%s.receive_reply from %s\n", this->myname_, operation.in ())); + ACE_DEBUG ((LM_DEBUG,"%C.receive_reply from %C\n", this->myname_, operation.in ())); } void @@ -88,7 +88,7 @@ Echo_Client_Request_Interceptor::receive_other ( CORBA::Object_var target = ri->target (); - ACE_DEBUG ((LM_DEBUG,"%s.receive_other from %s\n", this->myname_, operation.in ())); + ACE_DEBUG ((LM_DEBUG,"%C.receive_other from %C\n", this->myname_, operation.in ())); } void @@ -99,6 +99,6 @@ Echo_Client_Request_Interceptor::receive_exception ( CORBA::Object_var target = ri->target (); - ACE_DEBUG ((LM_DEBUG,"%s.receive_exception from %s\n", this->myname_, operation.in ())); + ACE_DEBUG ((LM_DEBUG,"%C.receive_exception from %C\n", this->myname_, operation.in ())); } diff --git a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/server.cpp b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/server.cpp index 6f8c5122a39..9dd16ff99d7 100644 --- a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/server.cpp +++ b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/server.cpp @@ -89,7 +89,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) orb->object_to_string (server.in ()); ACE_DEBUG ((LM_DEBUG, - "Test_Interceptors::Visual: <%s>\n", + "Test_Interceptors::Visual: <%C>\n", ior.in ())); // If the ior_output_file exists, output the ior to it diff --git a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/server_interceptor.cpp b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/server_interceptor.cpp index cea1f8c5ee5..353766f9d5b 100644 --- a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/server_interceptor.cpp +++ b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/server_interceptor.cpp @@ -38,8 +38,8 @@ Echo_Server_Request_Interceptor::receive_request_service_contexts ( CORBA::String_var operation = ri->operation (); ACE_DEBUG ((LM_DEBUG, - "%s.receive_request_service_contexts from " - "\"%s\"\n", + "%C.receive_request_service_contexts from " + "\"%C\"\n", this->myname_, operation.in ())); @@ -55,14 +55,14 @@ Echo_Server_Request_Interceptor::receive_request_service_contexts ( const char *buf = reinterpret_cast<const char *> (sc->context_data.get_buffer ()); ACE_DEBUG ((LM_DEBUG, - " Received service context: %s\n", + " Received service context: %C\n", buf)); if (ACE_OS::strcmp (buf, request_msg) != 0) { ACE_ERROR ((LM_ERROR, "ERROR: Echo_Server_Request_Interceptor::receive_request_service_contexts: " - "Expected request service context to be: %s\n", + "Expected request service context to be: %C\n", request_msg )); } else diff --git a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/test_i.cpp b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/test_i.cpp index 840b4b04ffa..896c5da8d12 100644 --- a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/test_i.cpp +++ b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/test_i.cpp @@ -51,7 +51,7 @@ Visual_i::normal (CORBA::Long arg) } else { - ACE_DEBUG ((LM_DEBUG, "Visual_i::normal : extracted %s data from CORBA::Any\n",str)); + ACE_DEBUG ((LM_DEBUG, "Visual_i::normal : extracted %C data from CORBA::Any\n",str)); } } diff --git a/TAO/tests/Portable_Interceptors/Bug_3079/client.cpp b/TAO/tests/Portable_Interceptors/Bug_3079/client.cpp index 6ce75c5e95a..afb75cebf6c 100644 --- a/TAO/tests/Portable_Interceptors/Bug_3079/client.cpp +++ b/TAO/tests/Portable_Interceptors/Bug_3079/client.cpp @@ -83,7 +83,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) if (CORBA::is_nil (server.in ())) { ACE_ERROR_RETURN ((LM_ERROR, - "Object reference <%s> is nil\n", + "Object reference <%C> is nil.\n", ior1), 1); } diff --git a/TAO/tests/Portable_Interceptors/Bug_3080/client.cpp b/TAO/tests/Portable_Interceptors/Bug_3080/client.cpp index b9ebcb01185..52b63a1937a 100644 --- a/TAO/tests/Portable_Interceptors/Bug_3080/client.cpp +++ b/TAO/tests/Portable_Interceptors/Bug_3080/client.cpp @@ -75,7 +75,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) if (CORBA::is_nil (server.in ())) { ACE_ERROR_RETURN ((LM_ERROR, - "Object reference <%s> is nil\n", + "Object reference <%C> is nil.\n", ior1), 1); } diff --git a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Client_Task.cpp b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Client_Task.cpp index c290861cdb1..0447b0286f6 100644 --- a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Client_Task.cpp +++ b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Client_Task.cpp @@ -23,7 +23,6 @@ Client_Task::svc (void) { try { - CORBA::Object_var object = corb_->string_to_object (input_); diff --git a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Server_Task.cpp b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Server_Task.cpp index 3a33e14abb0..3af152af5d4 100644 --- a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Server_Task.cpp +++ b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Server_Task.cpp @@ -60,7 +60,7 @@ Server_Task::svc (void) CORBA::String_var ior = this->sorb_->object_to_string (server.in ()); - ACE_DEBUG ((LM_DEBUG, "Test_Interceptors::Visual: <%s>\n", ior.in ())); + ACE_DEBUG ((LM_DEBUG, "Test_Interceptors::Visual: <%C>\n", ior.in ())); // If the ior_output_file exists, output the ior to it if (output_ != 0) diff --git a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/interceptors.cpp b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/interceptors.cpp index 9916316c78f..15fe176cc47 100644 --- a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/interceptors.cpp +++ b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/interceptors.cpp @@ -59,7 +59,7 @@ Echo_Client_Request_Interceptor::send_request ( ACE_DEBUG ((LM_DEBUG, "Echo_Client_Request_Interceptor::send_request from " - "\"%s\"\n", + "\"%C\"\n", op.in ())); #endif /*if 0*/ @@ -93,7 +93,7 @@ Echo_Client_Request_Interceptor::receive_other ( #if 0 ACE_DEBUG ((LM_DEBUG, "Echo_Client_Request_Interceptor::receive_other " - "from \"%s\"\n", + "from \"%C\"\n", op.in ())); #endif /*if 0*/ } @@ -109,7 +109,7 @@ Echo_Client_Request_Interceptor::receive_reply ( #if 0 ACE_DEBUG ((LM_DEBUG, "Echo_Client_Request_Interceptor::receive_reply " - "from \"%s\"\n", + "from \"%C\"\n", op.in ())); #endif /*if 0*/ @@ -162,11 +162,11 @@ Echo_Client_Request_Interceptor::receive_exception ( ACE_DEBUG ((LM_DEBUG, "Echo_Client_Request_Interceptor::received_exception " - "from \"%s\"\n", + "from \"%C\"\n", op.in ())); ACE_DEBUG ((LM_DEBUG, - "Exception ID = %s\n", + "Exception ID = %C\n", exception_id.in ())); } @@ -208,7 +208,7 @@ Echo_Server_Request_Interceptor::receive_request ( ri->object_id (); ACE_DEBUG ((LM_DEBUG, - "Echo_Server_Request_Interceptor::receive_request from \"%s\"\n", + "Echo_Server_Request_Interceptor::receive_request from \"%C\"\n", op.in ())); if (ACE_OS::strcmp (op.in (), "normal") == 0) @@ -231,7 +231,7 @@ Echo_Server_Request_Interceptor::receive_request ( ri->target_most_derived_interface (); ACE_DEBUG ((LM_DEBUG, - "Target most derived interface: %s\n", + "Target most derived interface: %C\n", tmdi.in ())); } @@ -244,7 +244,7 @@ Echo_Server_Request_Interceptor::send_reply ( CORBA::String_var op = ri->operation (); ACE_DEBUG ((LM_DEBUG, - "Echo_Server_Request_Interceptor::send_reply from \"%s\"\n", + "Echo_Server_Request_Interceptor::send_reply from \"%C\"\n", op.in ())); if (ACE_OS::strcmp (op.in (), "normal") == 0) @@ -294,7 +294,7 @@ Echo_Server_Request_Interceptor::send_exception ( ACE_DEBUG ((LM_DEBUG, "Echo_Server_Request_Interceptor::send_exception " - "from \"%s\"\n", + "from \"%C\"\n", op.in ())); @@ -306,7 +306,7 @@ Echo_Server_Request_Interceptor::send_exception ( const char *exception_id = type->id (); ACE_DEBUG ((LM_DEBUG, - "Exception ID = %s\n", + "Exception ID = %C\n", exception_id)); } diff --git a/TAO/tests/Portable_Interceptors/Dynamic/client.cpp b/TAO/tests/Portable_Interceptors/Dynamic/client.cpp index e0e3a08c437..b3bf4783168 100644 --- a/TAO/tests/Portable_Interceptors/Dynamic/client.cpp +++ b/TAO/tests/Portable_Interceptors/Dynamic/client.cpp @@ -117,7 +117,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) if (CORBA::is_nil (server.in ())) { ACE_ERROR_RETURN ((LM_ERROR, - "Object reference <%s> is nil\n", + "Object reference <%C> is nil.\n", ior), 1); } diff --git a/TAO/tests/Portable_Interceptors/ForwardRequest/client.cpp b/TAO/tests/Portable_Interceptors/ForwardRequest/client.cpp index 259d12237f3..f9971fe0674 100644 --- a/TAO/tests/Portable_Interceptors/ForwardRequest/client.cpp +++ b/TAO/tests/Portable_Interceptors/ForwardRequest/client.cpp @@ -86,7 +86,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) if (CORBA::is_nil (server.in ())) { ACE_ERROR_RETURN ((LM_ERROR, - "Object reference <%s> is nil\n", + "Object reference <%C> is nil.\n", ior1), 1); } diff --git a/TAO/tests/Portable_Interceptors/IORInterceptor/client.cpp b/TAO/tests/Portable_Interceptors/IORInterceptor/client.cpp index e662312423c..c505cd13e44 100644 --- a/TAO/tests/Portable_Interceptors/IORInterceptor/client.cpp +++ b/TAO/tests/Portable_Interceptors/IORInterceptor/client.cpp @@ -69,7 +69,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) if (CORBA::is_nil (server.in ())) { ACE_ERROR_RETURN ((LM_ERROR, - "Object reference <%s> is nil.\n", + "Object reference <%C> is nil.\n", ior), 1); } diff --git a/TAO/tests/Portable_Interceptors/ORB_Shutdown/client.cpp b/TAO/tests/Portable_Interceptors/ORB_Shutdown/client.cpp index e76090f15ff..efdd7d8b46a 100644 --- a/TAO/tests/Portable_Interceptors/ORB_Shutdown/client.cpp +++ b/TAO/tests/Portable_Interceptors/ORB_Shutdown/client.cpp @@ -29,7 +29,7 @@ parse_args (int argc, ACE_TCHAR *argv[]) break; default: ACE_ERROR_RETURN ((LM_ERROR, - "Usage: %s " + "Usage: %s " "-k IOR\n", argv[0]), -1); @@ -58,7 +58,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) if (CORBA::is_nil (server.in ())) { ACE_ERROR_RETURN ((LM_ERROR, - "Object reference <%s> is nil\n", + "Object reference <%C> is nil.\n", ior), 1); } diff --git a/TAO/tests/Portable_Interceptors/ORB_Shutdown/server.cpp b/TAO/tests/Portable_Interceptors/ORB_Shutdown/server.cpp index 619a4d7eeb7..f50727cbfed 100644 --- a/TAO/tests/Portable_Interceptors/ORB_Shutdown/server.cpp +++ b/TAO/tests/Portable_Interceptors/ORB_Shutdown/server.cpp @@ -92,7 +92,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) orb->object_to_string (obj.in ()); ACE_DEBUG ((LM_DEBUG, - "test servant: <%s>\n", + "test servant: <%C>\n", ior.in ())); // Write IOR to a file. @@ -100,7 +100,8 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) if (output_file == 0) ACE_ERROR_RETURN ((LM_ERROR, "Cannot open output file <%s> for writing " - "IOR: %s", + "IOR: %C", + ior_file, ior.in ()), 1); ACE_OS::fprintf (output_file, "%s", ior.in ()); diff --git a/TAO/tests/Portable_Interceptors/PICurrent/client.cpp b/TAO/tests/Portable_Interceptors/PICurrent/client.cpp index 61f0ab9281e..f6267836dd6 100644 --- a/TAO/tests/Portable_Interceptors/PICurrent/client.cpp +++ b/TAO/tests/Portable_Interceptors/PICurrent/client.cpp @@ -98,7 +98,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) if (CORBA::is_nil (server.in ())) { ACE_ERROR_RETURN ((LM_ERROR, - "Object reference <%s> is nil.\n", + "Object reference <%C> is nil.\n", ior), 1); } @@ -138,7 +138,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) if (new_data.in () >>= str) { ACE_DEBUG ((LM_DEBUG, - "(%P|%t) Retrieved \"%s\" from the TSC.\n", + "(%P|%t) Retrieved \"%C\" from the TSC.\n", str)); } else diff --git a/TAO/tests/Portable_Interceptors/PICurrent/test_i.cpp b/TAO/tests/Portable_Interceptors/PICurrent/test_i.cpp index 0414b720388..8237b777dcf 100644 --- a/TAO/tests/Portable_Interceptors/PICurrent/test_i.cpp +++ b/TAO/tests/Portable_Interceptors/PICurrent/test_i.cpp @@ -121,7 +121,7 @@ test_i::invoke_me (void) } ACE_DEBUG ((LM_DEBUG, - "(%P|%t) String \"%s\" inserted into TSC.\n", + "(%P|%t) String \"%C\" inserted into TSC.\n", str)); } @@ -160,7 +160,7 @@ test_i::invoke_we (void) } ACE_DEBUG ((LM_DEBUG, - "(%P|%t) String \"%s\" inserted into TSC.\n", + "(%P|%t) String \"%C\" inserted into TSC.\n", str)); } diff --git a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Client_Task.cpp b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Client_Task.cpp index dcad2c73f61..94bc8630a56 100644 --- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Client_Task.cpp +++ b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Client_Task.cpp @@ -23,7 +23,6 @@ Client_Task::svc (void) { try { - CORBA::Object_var object = corb_->string_to_object (input_); diff --git a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Server_Task.cpp b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Server_Task.cpp index 3a33e14abb0..3af152af5d4 100644 --- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Server_Task.cpp +++ b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Server_Task.cpp @@ -60,7 +60,7 @@ Server_Task::svc (void) CORBA::String_var ior = this->sorb_->object_to_string (server.in ()); - ACE_DEBUG ((LM_DEBUG, "Test_Interceptors::Visual: <%s>\n", ior.in ())); + ACE_DEBUG ((LM_DEBUG, "Test_Interceptors::Visual: <%C>\n", ior.in ())); // If the ior_output_file exists, output the ior to it if (output_ != 0) diff --git a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/interceptors.cpp b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/interceptors.cpp index 3525ebbcd07..20bbdf1918b 100644 --- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/interceptors.cpp +++ b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/interceptors.cpp @@ -64,7 +64,7 @@ Echo_Client_Request_Interceptor::send_request ( ACE_DEBUG ((LM_DEBUG, "Echo_Client_Request_Interceptor::send_request from " - "\"%s\"\n", + "\"%C\"\n", op.in ())); if (ACE_OS::strcmp (op.in (), "normal") == 0) @@ -97,7 +97,7 @@ Echo_Client_Request_Interceptor::receive_other ( } ACE_DEBUG ((LM_DEBUG, "Echo_Client_Request_Interceptor::receive_other " - "from \"%s\"\n", + "from \"%C\"\n", op.in ())); } @@ -116,7 +116,7 @@ Echo_Client_Request_Interceptor::receive_reply ( ACE_DEBUG ((LM_DEBUG, "Echo_Client_Request_Interceptor::receive_reply " - "from \"%s\"\n", + "from \"%C\"\n", op.in ())); if (ACE_OS::strcmp (op.in (), "normal") == 0) @@ -171,11 +171,11 @@ Echo_Client_Request_Interceptor::receive_exception ( ACE_DEBUG ((LM_DEBUG, "Echo_Client_Request_Interceptor::received_exception " - "from \"%s\"\n", + "from \"%C\"\n", op.in ())); ACE_DEBUG ((LM_DEBUG, - "Exception ID = %s\n", + "Exception ID = %C\n", exception_id.in ())); } @@ -222,7 +222,7 @@ Echo_Server_Request_Interceptor::receive_request ( ri->object_id (); ACE_DEBUG ((LM_DEBUG, - "Echo_Server_Request_Interceptor::receive_request from \"%s\"\n", + "Echo_Server_Request_Interceptor::receive_request from \"%C\"\n", op.in ())); if (ACE_OS::strcmp (op.in (), "normal") == 0) @@ -245,7 +245,7 @@ Echo_Server_Request_Interceptor::receive_request ( ri->target_most_derived_interface (); ACE_DEBUG ((LM_DEBUG, - "Target most derived interface: %s\n", + "Target most derived interface: %C\n", tmdi.in ())); } @@ -263,7 +263,7 @@ Echo_Server_Request_Interceptor::send_reply ( } ACE_DEBUG ((LM_DEBUG, - "Echo_Server_Request_Interceptor::send_reply from \"%s\"\n", + "Echo_Server_Request_Interceptor::send_reply from \"%C\"\n", op.in ())); if (ACE_OS::strcmp (op.in (), "normal") == 0) @@ -318,7 +318,7 @@ Echo_Server_Request_Interceptor::send_exception ( ACE_DEBUG ((LM_DEBUG, "Echo_Server_Request_Interceptor::send_exception " - "from \"%s\"\n", + "from \"%C\"\n", op.in ())); @@ -330,7 +330,7 @@ Echo_Server_Request_Interceptor::send_exception ( const char *exception_id = type->id (); ACE_DEBUG ((LM_DEBUG, - "Exception ID = %s\n", + "Exception ID = %C\n", exception_id)); } diff --git a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Server_Task.cpp b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Server_Task.cpp index b58dd2ac267..665c2de1d60 100644 --- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Server_Task.cpp +++ b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Server_Task.cpp @@ -60,7 +60,7 @@ Server_Task::svc (void) CORBA::String_var ior = this->sorb_->object_to_string (server.in ()); - ACE_DEBUG ((LM_DEBUG, "Test_Interceptors::Visual: <%s>\n", ACE_TEXT_CHAR_TO_TCHAR (ior.in ()))); + ACE_DEBUG ((LM_DEBUG, "Test_Interceptors::Visual: <%C>\n", ior.in ())); // If the ior_output_file exists, output the ior to it if (output_ != 0) @@ -68,9 +68,9 @@ Server_Task::svc (void) FILE *output_file= ACE_OS::fopen (this->output_, "w"); if (output_file == 0) ACE_ERROR_RETURN ((LM_ERROR, - "Cannot open output file %s for writing IOR: %s", + "Cannot open output file %s for writing IOR: %C", this->output_, - ACE_TEXT_CHAR_TO_TCHAR (ior.in ())), + ior.in ()), 1); ACE_OS::fprintf (output_file, "%s", ior.in ()); ACE_OS::fclose (output_file); diff --git a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/client_interceptor.cpp b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/client_interceptor.cpp index a0ce7f47f0d..36af24c0c16 100644 --- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/client_interceptor.cpp +++ b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/client_interceptor.cpp @@ -57,7 +57,7 @@ Echo_Client_Request_Interceptor::send_request ( ACE_DEBUG ((LM_DEBUG, "Echo_Client_Request_Interceptor::send_request from " - "\"%s\"\n", + "\"%C\"\n", op.in ())); if (ACE_OS::strcmp (op.in (), "normal") == 0) @@ -86,7 +86,7 @@ Echo_Client_Request_Interceptor::receive_other ( ACE_DEBUG ((LM_DEBUG, "Echo_Client_Request_Interceptor::receive_other " - "from \"%s\"\n", + "from \"%C\"\n", op.in ())); } @@ -100,7 +100,7 @@ Echo_Client_Request_Interceptor::receive_reply ( ACE_DEBUG ((LM_DEBUG, "Echo_Client_Request_Interceptor::receive_reply " - "from \"%s\"\n", + "from \"%C\"\n", op.in ())); if (ACE_OS::strcmp (op.in (), "normal") == 0) @@ -150,11 +150,11 @@ Echo_Client_Request_Interceptor::receive_exception ( ACE_DEBUG ((LM_DEBUG, "Echo_Client_Request_Interceptor::received_exception " - "from \"%s\"\n", + "from \"%C\"\n", op.in ())); ACE_DEBUG ((LM_DEBUG, - "Exception ID = %s\n", + "Exception ID = %C\n", exception_id.in ())); } diff --git a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/server_interceptor.cpp b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/server_interceptor.cpp index d7266e7638d..887a95d23fb 100644 --- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/server_interceptor.cpp +++ b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/server_interceptor.cpp @@ -53,7 +53,7 @@ Echo_Server_Request_Interceptor::receive_request ( ri->object_id (); ACE_DEBUG ((LM_DEBUG, - "Echo_Server_Request_Interceptor::receive_request from \"%s\"\n", + "Echo_Server_Request_Interceptor::receive_request from \"%C\"\n", op.in ())); if (ACE_OS::strcmp (op.in (), "normal") == 0) @@ -76,7 +76,7 @@ Echo_Server_Request_Interceptor::receive_request ( ri->target_most_derived_interface (); ACE_DEBUG ((LM_DEBUG, - "Target most derived interface: %s\n", + "Target most derived interface: %C\n", tmdi.in ())); } @@ -89,7 +89,7 @@ Echo_Server_Request_Interceptor::send_reply ( CORBA::String_var op = ri->operation (); ACE_DEBUG ((LM_DEBUG, - "Echo_Server_Request_Interceptor::send_reply from \"%s\"\n", + "Echo_Server_Request_Interceptor::send_reply from \"%C\"\n", op.in ())); if (ACE_OS::strcmp (op.in (), "normal") == 0) @@ -137,7 +137,7 @@ Echo_Server_Request_Interceptor::send_exception ( ACE_DEBUG ((LM_DEBUG, "Echo_Server_Request_Interceptor::send_exception " - "from \"%s\"\n", + "from \"%C\"\n", op.in ())); @@ -158,7 +158,7 @@ Echo_Server_Request_Interceptor::send_exception ( const char *exception_id = type->id (); ACE_DEBUG ((LM_DEBUG, - "Exception ID = %s\n", + "Exception ID = %C\n", exception_id)); } diff --git a/TAO/tests/Portable_Interceptors/Redirection/client.cpp b/TAO/tests/Portable_Interceptors/Redirection/client.cpp index 1bfcf66823a..4ba0e14327c 100644 --- a/TAO/tests/Portable_Interceptors/Redirection/client.cpp +++ b/TAO/tests/Portable_Interceptors/Redirection/client.cpp @@ -79,7 +79,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) if (CORBA::is_nil (server.in ())) { ACE_ERROR_RETURN ((LM_ERROR, - "Object reference <%s> is nil\n", + "Object reference <%C> is nil.\n", ior1), 1); } diff --git a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/client.cpp b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/client.cpp index 4bff5541452..72310c12dfa 100644 --- a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/client.cpp +++ b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/client.cpp @@ -179,7 +179,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) if (CORBA::is_nil (server.in ())) { ACE_ERROR_RETURN ((LM_ERROR, - "Object reference <%s> is nil\n", + "Object reference <%C> is nil.\n", ior), 1); } diff --git a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/client.cpp b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/client.cpp index eb2baf8e663..c08882e9577 100644 --- a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/client.cpp +++ b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/client.cpp @@ -97,7 +97,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) if (CORBA::is_nil (server.in ())) { ACE_ERROR_RETURN ((LM_ERROR, - "Object reference <%s> is nil\n", + "Object reference <%C> is nil.\n", ior), 1); } diff --git a/TAO/tests/Smart_Proxies/Benchmark/client.cpp b/TAO/tests/Smart_Proxies/Benchmark/client.cpp index 62355f01739..aad78acf7b9 100644 --- a/TAO/tests/Smart_Proxies/Benchmark/client.cpp +++ b/TAO/tests/Smart_Proxies/Benchmark/client.cpp @@ -152,7 +152,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) if (CORBA::is_nil (server.in ())) ACE_ERROR_RETURN ((LM_ERROR, - "Object reference <%s> is nil\n", + "Object reference <%C> is nil.\n", ior), 1); Marker marker; @@ -197,7 +197,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) if (CORBA::is_nil (server1.in ())) ACE_ERROR_RETURN ((LM_ERROR, - "Object reference <%s> is nil\n", + "Object reference <%C> is nil.\n", ior), 1); Marker marker1; diff --git a/TAO/tests/Smart_Proxies/On_Demand/client.cpp b/TAO/tests/Smart_Proxies/On_Demand/client.cpp index ad44ebe8a30..085d4b50b33 100644 --- a/TAO/tests/Smart_Proxies/On_Demand/client.cpp +++ b/TAO/tests/Smart_Proxies/On_Demand/client.cpp @@ -73,7 +73,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) if (CORBA::is_nil (server.in ())) ACE_ERROR_RETURN ((LM_ERROR, - "Object reference <%s> is nil\n", + "Object reference <%C> is nil.\n", ior), 1); diff --git a/TAO/tests/Smart_Proxies/client.cpp b/TAO/tests/Smart_Proxies/client.cpp index aed4d299198..8e04f7588f1 100644 --- a/TAO/tests/Smart_Proxies/client.cpp +++ b/TAO/tests/Smart_Proxies/client.cpp @@ -86,7 +86,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) if (CORBA::is_nil (server.in ())) ACE_ERROR_RETURN ((LM_ERROR, - "Object reference <%s> is nil\n", + "Object reference <%C> is nil.\n", ior), 1); diff --git a/TAO/tests/Smart_Proxies/dtor/client.cpp b/TAO/tests/Smart_Proxies/dtor/client.cpp index 6c82d15be60..7d1d5afc551 100644 --- a/TAO/tests/Smart_Proxies/dtor/client.cpp +++ b/TAO/tests/Smart_Proxies/dtor/client.cpp @@ -58,7 +58,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) if (CORBA::is_nil (server.in())) { ACE_ERROR_RETURN ((LM_ERROR, - "Object reference <%s> is nil\n", + "Object reference <%C> is nil.\n", ior), 1); } diff --git a/TAO/tests/Strategies/client.cpp b/TAO/tests/Strategies/client.cpp index b97b482542b..35f608d685c 100644 --- a/TAO/tests/Strategies/client.cpp +++ b/TAO/tests/Strategies/client.cpp @@ -81,7 +81,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) if (CORBA::is_nil (server.in ())) { ACE_ERROR_RETURN ((LM_ERROR, - "Object reference <%s> is nil\n", + "Object reference <%C> is nil.\n", ior), 1); } diff --git a/TAO/tests/Timeout/client.cpp b/TAO/tests/Timeout/client.cpp index cefad0d2ce7..56643266922 100644 --- a/TAO/tests/Timeout/client.cpp +++ b/TAO/tests/Timeout/client.cpp @@ -104,7 +104,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) if (CORBA::is_nil (server.in ())) { ACE_ERROR_RETURN ((LM_ERROR, - "Object reference <%s> is nil\n", + "Object reference <%C> is nil.\n", ior), 1); } |