diff options
Diffstat (limited to 'ace/SOCK_Dgram_Mcast.cpp')
| -rw-r--r-- | ace/SOCK_Dgram_Mcast.cpp | 29 |
1 files changed, 11 insertions, 18 deletions
diff --git a/ace/SOCK_Dgram_Mcast.cpp b/ace/SOCK_Dgram_Mcast.cpp index 5f325a7e519..b11c5fd0ac7 100644 --- a/ace/SOCK_Dgram_Mcast.cpp +++ b/ace/SOCK_Dgram_Mcast.cpp @@ -32,8 +32,6 @@ ACE_RCSID (ace, #define IMR_MULTIADDR imr_multiaddr #endif /* ! defined (IMR_MULTIADDR) */ -ACE_BEGIN_VERSIONED_NAMESPACE_DECL - // Helper (inline) functions. class ACE_SDM_helpers { @@ -49,8 +47,9 @@ public: ACE_OS::strcpy (ret_string, ACE_LIB_TEXT ("<?>")); else { - ACE_TCHAR *pc = ACE_OS::strrchr (ret_string, ACE_LIB_TEXT (':')); - if (clip_portnum && pc) + ACE_TCHAR *pc; + if (clip_portnum + && (pc = ACE_OS::strrchr (ret_string, ACE_LIB_TEXT (':')))) *pc = ACE_LIB_TEXT ('\0'); // clip port# info. } } @@ -273,7 +272,7 @@ ACE_SOCK_Dgram_Mcast::subscribe_ifs (const ACE_INET_Addr &mcast_addr, while (intf[index].if_index != 0 || intf[index].if_name != 0) { if (this->join (mcast_addr, reuse_addr, - ACE_TEXT_CHAR_TO_TCHAR(intf[index].if_name)) == 0) + ACE_TEXT_TO_TCHAR_IN(intf[index].if_name)) == 0) ++nr_subscribed; ++index; @@ -314,7 +313,7 @@ ACE_SOCK_Dgram_Mcast::subscribe_ifs (const ACE_INET_Addr &mcast_addr, while (pAddrs) { if (this->join (mcast_addr, reuse_addr, - ACE_TEXT_CHAR_TO_TCHAR(pAddrs->AdapterName)) == 0) + ACE_TEXT_TO_TCHAR_IN(pAddrs->AdapterName)) == 0) ++nr_subscribed; pAddrs = pAddrs->Next; @@ -365,8 +364,7 @@ ACE_SOCK_Dgram_Mcast::subscribe_ifs (const ACE_INET_Addr &mcast_addr, continue; if (this->subscribe (mcast_addr, reuse_addr, - ACE_TEXT_CHAR_TO_TCHAR - (if_addrs[if_cnt].get_host_addr ())) == 0) + ACE_TEXT_TO_TCHAR_IN(if_addrs[if_cnt].get_host_addr ())) == 0) ++nr_subscribed; } } @@ -416,8 +414,7 @@ ACE_SOCK_Dgram_Mcast::subscribe_ifs (const ACE_INET_Addr &mcast_addr, continue; if (this->subscribe (mcast_addr, reuse_addr, - ACE_TEXT_CHAR_TO_TCHAR - (if_addrs[if_cnt].get_host_addr ())) == 0) + ACE_TEXT_TO_TCHAR_IN (if_addrs[if_cnt].get_host_addr ())) == 0) ++nr_subscribed; } } @@ -657,7 +654,7 @@ ACE_SOCK_Dgram_Mcast::unsubscribe_ifs (const ACE_INET_Addr &mcast_addr, int index = 0; while (intf[index].if_index != 0 || intf[index].if_name != 0) { - if (this->leave (mcast_addr, ACE_TEXT_CHAR_TO_TCHAR(intf[index].if_name)) == 0) + if (this->leave (mcast_addr, ACE_TEXT_TO_TCHAR_IN(intf[index].if_name)) == 0) ++nr_unsubscribed; ++index; @@ -697,7 +694,7 @@ ACE_SOCK_Dgram_Mcast::unsubscribe_ifs (const ACE_INET_Addr &mcast_addr, while (pAddrs) { - if (this->leave (mcast_addr, ACE_TEXT_CHAR_TO_TCHAR(pAddrs->AdapterName)) == 0) + if (this->leave (mcast_addr, ACE_TEXT_TO_TCHAR_IN(pAddrs->AdapterName)) == 0) ++nr_unsubscribed; pAddrs = pAddrs->Next; @@ -750,8 +747,7 @@ ACE_SOCK_Dgram_Mcast::unsubscribe_ifs (const ACE_INET_Addr &mcast_addr, if (if_addrs[if_cnt].get_type () != AF_INET || if_addrs[if_cnt].is_loopback ()) continue; if (this->leave (mcast_addr, - ACE_TEXT_CHAR_TO_TCHAR - (if_addrs[if_cnt].get_host_addr ())) == 0) + ACE_TEXT_TO_TCHAR_IN (if_addrs[if_cnt].get_host_addr ())) == 0) ++nr_unsubscribed; } } @@ -799,8 +795,7 @@ ACE_SOCK_Dgram_Mcast::unsubscribe_ifs (const ACE_INET_Addr &mcast_addr, if (if_addrs[if_cnt].is_loopback ()) continue; if (this->leave (mcast_addr, - ACE_TEXT_CHAR_TO_TCHAR - (if_addrs[if_cnt].get_host_addr ())) == 0) + ACE_TEXT_TO_TCHAR_IN (if_addrs[if_cnt].get_host_addr ())) == 0) ++nr_unsubscribed; } } @@ -989,5 +984,3 @@ ACE_SOCK_Dgram_Mcast::clear_subs_list (void) #endif /* ACE_SOCK_DGRAM_MCAST_DUMPABLE */ return result; } - -ACE_END_VERSIONED_NAMESPACE_DECL |