diff options
-rw-r--r-- | TAO/utils/catior/catior.cpp | 192 |
1 files changed, 96 insertions, 96 deletions
diff --git a/TAO/utils/catior/catior.cpp b/TAO/utils/catior/catior.cpp index 905f717b948..0527c3efa7c 100644 --- a/TAO/utils/catior/catior.cpp +++ b/TAO/utils/catior/catior.cpp @@ -537,7 +537,7 @@ main (int argc, char *argv[]) } break; case '?': - case 'h': + case 'h': default: ACE_ERROR_RETURN ((LM_ERROR, "Usage: %s " @@ -570,12 +570,12 @@ cat_tag_orb_type (TAO_InputCDR& stream) { stream2 >> orbtype; if (orbtype == TAO_ORB_TYPE) { ACE_DEBUG ((LM_DEBUG, - "%I ORB Type: %d (TAO)\n", - orbtype)); + "%I ORB Type: %d (TAO)\n", + orbtype)); } else { ACE_DEBUG ((LM_DEBUG, - "%I ORB Type: %d\n", - orbtype)); + "%I ORB Type: %d\n", + orbtype)); } return 1; @@ -595,20 +595,20 @@ cat_tao_tag_endpoints (TAO_InputCDR& stream) { stream2 >> epseq; ACE_DEBUG ((LM_DEBUG, - "%I Number of endpoints: %d\n", - epseq.length())); + "%I Number of endpoints: %d\n", + epseq.length())); for (unsigned int iter=0; iter < epseq.length() ; iter++) { ACE_DEBUG ((LM_DEBUG, - "%I Endpoint #%d:\n",iter+1)); + "%I Endpoint #%d:\n",iter+1)); const char *host = epseq[iter].host; ACE_DEBUG ((LM_DEBUG, - "%I Host: %s\n",host)); + "%I Host: %s\n",host)); unsigned short port = epseq[iter].port; ACE_DEBUG ((LM_DEBUG, - "%I Port: %d\n",port)); + "%I Port: %d\n",port)); ACE_DEBUG ((LM_DEBUG, - "%I Priority: %d\n",epseq[iter].priority)); + "%I Priority: %d\n",epseq[iter].priority)); } return 1; @@ -626,30 +626,30 @@ cat_tag_policies (TAO_InputCDR& stream) { Messaging::PolicyValueSeq policies; stream2 >> policies; - + ACE_DEBUG ((LM_DEBUG, - "%I Number of policies: %d\n", - policies.length())); + "%I Number of policies: %d\n", + policies.length())); for (unsigned int iter=0; iter < policies.length() ; iter++) { // Create new stream for pvalue contents char pmbuf[policies[iter].pvalue.length()]; for (unsigned int biter=0 ; - biter < policies[iter].pvalue.length() - sizeof(int) ; - biter++) { + biter < policies[iter].pvalue.length() - sizeof(int) ; + biter++) { pmbuf[biter] = policies[iter].pvalue[biter + sizeof(int)]; } - + int byteOrder = policies[iter].pvalue[0]; TAO_InputCDR stream3 (pmbuf, - policies[iter].pvalue.length(), - ACE_static_cast(int,byteOrder)); + policies[iter].pvalue.length(), + ACE_static_cast(int,byteOrder)); if (policies[iter].ptype == RTCORBA::PRIORITY_MODEL_POLICY_TYPE) { ACE_DEBUG ((LM_DEBUG, - "%I Policy #%d Type: %d (PRIORITY_MODEL_POLICY_TYPE)\n", - iter+1, - policies[iter].ptype)); + "%I Policy #%d Type: %d (PRIORITY_MODEL_POLICY_TYPE)\n", + iter+1, + policies[iter].ptype)); RTCORBA::PriorityModel priority_model; RTCORBA::Priority server_priority; @@ -658,93 +658,93 @@ cat_tag_policies (TAO_InputCDR& stream) { stream3 >> server_priority; if (priority_model == RTCORBA::CLIENT_PROPAGATED) { - ACE_DEBUG ((LM_DEBUG,"%I Priority Model: %d (CLIENT_PROPAGATED)\n", - priority_model)); + ACE_DEBUG ((LM_DEBUG,"%I Priority Model: %d (CLIENT_PROPAGATED)\n", + priority_model)); } else if (priority_model == RTCORBA::SERVER_DECLARED) { - ACE_DEBUG ((LM_DEBUG,"%I Priority Model: %d (SERVER_DECLARED)\n", - priority_model)); + ACE_DEBUG ((LM_DEBUG,"%I Priority Model: %d (SERVER_DECLARED)\n", + priority_model)); } else { - ACE_DEBUG ((LM_DEBUG,"%I Priority Model: %d (UNKNOWN!)\n", - priority_model)); + ACE_DEBUG ((LM_DEBUG,"%I Priority Model: %d (UNKNOWN!)\n", + priority_model)); } ACE_DEBUG ((LM_DEBUG, - "%I Priority: %d\n", - server_priority)); + "%I Priority: %d\n", + server_priority)); } else if (policies[iter].ptype == Messaging::REBIND_POLICY_TYPE) { ACE_DEBUG ((LM_DEBUG, - "%I Policy #%d Type: %d (REBIND_POLICY_TYPE)\n", - iter+1, - policies[iter].ptype)); + "%I Policy #%d Type: %d (REBIND_POLICY_TYPE)\n", + iter+1, + policies[iter].ptype)); #if (TAO_HAS_SYNC_SCOPE_POLICY == 1) } else if (policies[iter].ptype == Messaging::SYNC_SCOPE_POLICY_TYPE) { ACE_DEBUG ((LM_DEBUG, - "%I Policy #%d Type: %d (SYNC_SCOPE_POLICY_TYPE)\n", - iter+1, - policies[iter].ptype)); + "%I Policy #%d Type: %d (SYNC_SCOPE_POLICY_TYPE)\n", + iter+1, + policies[iter].ptype)); #endif } else if (policies[iter].ptype == Messaging::REQUEST_PRIORITY_POLICY_TYPE) { ACE_DEBUG ((LM_DEBUG, - "%I Policy #%d Type: %d (REQUEST_PRIORITY_POLICY_TYPE)\n", - iter+1, - policies[iter].ptype)); + "%I Policy #%d Type: %d (REQUEST_PRIORITY_POLICY_TYPE)\n", + iter+1, + policies[iter].ptype)); } else if (policies[iter].ptype == Messaging::REPLY_PRIORITY_POLICY_TYPE) { ACE_DEBUG ((LM_DEBUG, - "%I Policy #%d Type: %d (REPLY_PRIORITY_POLICY_TYPE)\n", - iter+1, - policies[iter].ptype)); + "%I Policy #%d Type: %d (REPLY_PRIORITY_POLICY_TYPE)\n", + iter+1, + policies[iter].ptype)); } else if (policies[iter].ptype == Messaging::REQUEST_START_TIME_POLICY_TYPE) { ACE_DEBUG ((LM_DEBUG, - "%I Policy #%d Type: %d (REQUEST_START_TIME_POLICY_TYPE)\n", - iter+1, - policies[iter].ptype)); + "%I Policy #%d Type: %d (REQUEST_START_TIME_POLICY_TYPE)\n", + iter+1, + policies[iter].ptype)); } else if (policies[iter].ptype == Messaging::REQUEST_END_TIME_POLICY_TYPE) { ACE_DEBUG ((LM_DEBUG, - "%I Policy #%d Type: %d (REQUEST_END_TIME_POLICY_TYPE)\n", - iter+1, - policies[iter].ptype)); + "%I Policy #%d Type: %d (REQUEST_END_TIME_POLICY_TYPE)\n", + iter+1, + policies[iter].ptype)); } else if (policies[iter].ptype == Messaging::REPLY_START_TIME_POLICY_TYPE) { ACE_DEBUG ((LM_DEBUG, - "%I Policy #%d Type: %d (REPLY_START_TIME_POLICY_TYPE)\n", - iter+1, - policies[iter].ptype)); + "%I Policy #%d Type: %d (REPLY_START_TIME_POLICY_TYPE)\n", + iter+1, + policies[iter].ptype)); } else if (policies[iter].ptype == Messaging::REPLY_END_TIME_POLICY_TYPE) { ACE_DEBUG ((LM_DEBUG, - "%I Policy #%d Type: %d (REPLY_END_TIME_POLICY_TYPE)\n", - iter+1, - policies[iter].ptype)); + "%I Policy #%d Type: %d (REPLY_END_TIME_POLICY_TYPE)\n", + iter+1, + policies[iter].ptype)); } else if (policies[iter].ptype == Messaging::RELATIVE_REQ_TIMEOUT_POLICY_TYPE) { ACE_DEBUG ((LM_DEBUG, - "%I Policy #%d Type: %d (RELATIVE_REQ_TIMEOUT_POLICY_TYPE)\n", - iter+1, - policies[iter].ptype)); + "%I Policy #%d Type: %d (RELATIVE_REQ_TIMEOUT_POLICY_TYPE)\n", + iter+1, + policies[iter].ptype)); } else if (policies[iter].ptype == Messaging::RELATIVE_RT_TIMEOUT_POLICY_TYPE) { ACE_DEBUG ((LM_DEBUG, - "%I Policy #%d Type: %d (RELATIVE_RT_TIMEOUT_POLICY_TYPE)\n", - iter+1, - policies[iter].ptype)); + "%I Policy #%d Type: %d (RELATIVE_RT_TIMEOUT_POLICY_TYPE)\n", + iter+1, + policies[iter].ptype)); } else if (policies[iter].ptype == Messaging::ROUTING_POLICY_TYPE) { ACE_DEBUG ((LM_DEBUG, - "%I Policy #%d Type: %d (ROUTING_POLICY_TYPE)\n", - iter+1, - policies[iter].ptype)); + "%I Policy #%d Type: %d (ROUTING_POLICY_TYPE)\n", + iter+1, + policies[iter].ptype)); } else if (policies[iter].ptype == Messaging::MAX_HOPS_POLICY_TYPE) { ACE_DEBUG ((LM_DEBUG, - "%I Policy #%d Type: %d (MAX_HOPS_POLICY_TYPE)\n", - iter+1, - policies[iter].ptype)); + "%I Policy #%d Type: %d (MAX_HOPS_POLICY_TYPE)\n", + iter+1, + policies[iter].ptype)); } else if (policies[iter].ptype == Messaging::QUEUE_ORDER_POLICY_TYPE) { ACE_DEBUG ((LM_DEBUG, - "%I Policy #%d Type: %d (QUEUE_ORDER_POLICY_TYPE)\n", - iter+1, - policies[iter].ptype)); + "%I Policy #%d Type: %d (QUEUE_ORDER_POLICY_TYPE)\n", + iter+1, + policies[iter].ptype)); } else { ACE_DEBUG ((LM_DEBUG, - "%I Policy #%d Type: %d (UNKNOWN)\n", iter+1, - policies[iter].ptype)); + "%I Policy #%d Type: %d (UNKNOWN)\n", iter+1, + policies[iter].ptype)); } } - + return 1; } @@ -833,39 +833,39 @@ cat_tagged_components (TAO_InputCDR& stream) "%I The component <%d> ID is ", i+1, tag)); if (tag == IOP::TAG_ORB_TYPE) { - ACE_DEBUG ((LM_DEBUG,"%d (TAG_ORB_TYPE)\n", tag)); - ACE_DEBUG ((LM_DEBUG, "%{%{")); - cat_tag_orb_type(stream); - ACE_DEBUG ((LM_DEBUG, "%}%}")); + ACE_DEBUG ((LM_DEBUG,"%d (TAG_ORB_TYPE)\n", tag)); + ACE_DEBUG ((LM_DEBUG, "%{%{")); + cat_tag_orb_type(stream); + ACE_DEBUG ((LM_DEBUG, "%}%}")); } else if (tag == IOP::TAG_CODE_SETS) { - ACE_DEBUG ((LM_DEBUG,"%d (TAG_CODE_SETS)\n", tag)); - ACE_DEBUG ((LM_DEBUG, "%{%{")); - cat_octet_seq ("Component Value" ,stream); - ACE_DEBUG ((LM_DEBUG, "%}%}")); + ACE_DEBUG ((LM_DEBUG,"%d (TAG_CODE_SETS)\n", tag)); + ACE_DEBUG ((LM_DEBUG, "%{%{")); + cat_octet_seq ("Component Value" ,stream); + ACE_DEBUG ((LM_DEBUG, "%}%}")); } else if (tag == IOP::TAG_ALTERNATE_IIOP_ADDRESS) { - ACE_DEBUG ((LM_DEBUG,"%d (TAG_ALTERNATE_IIOP_ADDRESS)\n", tag)); - ACE_DEBUG ((LM_DEBUG, "%{%{")); - cat_octet_seq ("Component Value" ,stream); - ACE_DEBUG ((LM_DEBUG, "%}%}")); + ACE_DEBUG ((LM_DEBUG,"%d (TAG_ALTERNATE_IIOP_ADDRESS)\n", tag)); + ACE_DEBUG ((LM_DEBUG, "%{%{")); + cat_octet_seq ("Component Value" ,stream); + ACE_DEBUG ((LM_DEBUG, "%}%}")); } else if (tag == TAO_TAG_ENDPOINTS) { - ACE_DEBUG ((LM_DEBUG,"%d (TAO_TAG_ENDPOINTS)\n", tag)); - ACE_DEBUG ((LM_DEBUG, "%{%{")); - cat_tao_tag_endpoints(stream); - ACE_DEBUG ((LM_DEBUG, "%}%}")); + ACE_DEBUG ((LM_DEBUG,"%d (TAO_TAG_ENDPOINTS)\n", tag)); + ACE_DEBUG ((LM_DEBUG, "%{%{")); + cat_tao_tag_endpoints(stream); + ACE_DEBUG ((LM_DEBUG, "%}%}")); } else if (tag == IOP::TAG_POLICIES) { - ACE_DEBUG ((LM_DEBUG,"%d (TAG_POLICIES)\n", tag)); - ACE_DEBUG ((LM_DEBUG, "%{%{")); - cat_tag_policies(stream); - ACE_DEBUG ((LM_DEBUG, "%}%}")); + ACE_DEBUG ((LM_DEBUG,"%d (TAG_POLICIES)\n", tag)); + ACE_DEBUG ((LM_DEBUG, "%{%{")); + cat_tag_policies(stream); + ACE_DEBUG ((LM_DEBUG, "%}%}")); } else { - ACE_DEBUG ((LM_DEBUG,"%d\n", tag)); - ACE_DEBUG ((LM_DEBUG, "%{%{")); - cat_octet_seq ("Component Value", stream); - ACE_DEBUG ((LM_DEBUG, "%}%}")); + ACE_DEBUG ((LM_DEBUG,"%d\n", tag)); + ACE_DEBUG ((LM_DEBUG, "%{%{")); + cat_octet_seq ("Component Value", stream); + ACE_DEBUG ((LM_DEBUG, "%}%}")); } } |