diff options
Diffstat (limited to 'TAO/orbsvcs/orbsvcs/AV/sfp.cpp')
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/AV/sfp.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/TAO/orbsvcs/orbsvcs/AV/sfp.cpp b/TAO/orbsvcs/orbsvcs/AV/sfp.cpp index 6b6eeb890ac..57816fc838e 100644 --- a/TAO/orbsvcs/orbsvcs/AV/sfp.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/sfp.cpp @@ -1107,7 +1107,7 @@ TAO_SFP_Object::set_policies (const TAO_AV_PolicyList& policies) // TAO_SFP_Consumer_Object TAO_SFP_Consumer_Object::TAO_SFP_Consumer_Object (TAO_AV_Callback *callback, TAO_AV_Transport *transport, - ACE_CString& sfp_options) + char *&sfp_options) :TAO_SFP_Object (callback,transport) { TAO_AV_PolicyList policies = callback->get_policies (); @@ -1116,10 +1116,12 @@ TAO_SFP_Consumer_Object::TAO_SFP_Consumer_Object (TAO_AV_Callback *callback, this->set_policies (policies); if (this->max_credit_ > 0) { - sfp_options = "sfp:1.0:credit="; - char buf[10]; - ACE_OS::sprintf(buf, "%d", this->max_credit_); - sfp_options += buf; + ACE_NEW (sfp_options, + char [BUFSIZ]); + + ACE_OS::sprintf (sfp_options, + "sfp:1.0:credit=%d", + max_credit_); } } @@ -1159,7 +1161,7 @@ TAO_SFP_Consumer_Object::handle_input (void) TAO_SFP_Producer_Object::TAO_SFP_Producer_Object (TAO_AV_Callback *callback, TAO_AV_Transport *transport, - const char *sfp_options) + char *&sfp_options) :TAO_SFP_Object (callback,transport), credit_sequence_num_ (0) @@ -1253,7 +1255,7 @@ TAO_AV_SFP_Factory::make_protocol_object (TAO_FlowSpec_Entry *entry, TAO_AV_Callback *callback = 0; endpoint->get_callback (entry->flowname (), callback); - ACE_CString flow_string( entry->flow_protocol_str () ); + char *flow_string = entry->flow_protocol_str (); switch (entry->role ()) { case TAO_FlowSpec_Entry::TAO_AV_PRODUCER: @@ -1261,19 +1263,17 @@ TAO_AV_SFP_Factory::make_protocol_object (TAO_FlowSpec_Entry *entry, ACE_NEW_RETURN (object, TAO_SFP_Producer_Object (callback, transport, - flow_string.c_str() ), + flow_string), 0); } break; case TAO_FlowSpec_Entry::TAO_AV_CONSUMER: { - ACE_NEW_RETURN (object, TAO_SFP_Consumer_Object (callback, transport, flow_string), 0); - entry->flow_protocol_str( flow_string.c_str() ); } break; case TAO_FlowSpec_Entry::TAO_AV_INVALID_ROLE: |