diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2009-02-13 13:31:02 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2009-02-13 13:31:02 +0000 |
| commit | 8bd3b08eb5ea4d76a7f025de00b89c040c056c27 (patch) | |
| tree | 8cdee4d34eea2e115fdf686776522a440c1bb410 /ACE/ace/SOCK_Dgram_Bcast.cpp | |
| parent | 6db2901cb5fb8b7d8f303e199406f603354fa2b4 (diff) | |
| download | ATCD-8bd3b08eb5ea4d76a7f025de00b89c040c056c27.tar.gz | |
Fri Feb 13 13:30:28 UTC 2009 Johnny Willemsen <jwillemsen@remedy.nl>
* ace/Dev_Poll_Reactor.cpp
* ace/Log_Msg.cpp
* ace/MEM_Acceptor.cpp
* ace/MMAP_Memory_Pool.cpp
* ace/POSIX_Asynch_IO.cpp
* ace/POSIX_CB_Proactor.cpp
* ace/POSIX_Proactor.cpp
* ace/Registry_Name_Space.cpp
* ace/Remote_Tokens.cpp
* ace/Service_Config.cpp
* ace/Service_Gestalt.cpp
* ace/Shared_Memory_Pool.cpp
* ace/SOCK_Dgram_Bcast.cpp
* ace/SUN_Proactor.cpp
* ace/TLI.cpp
Use ACE_TEXT() with %p in ACE_DEBUG/ACE_ERROR. The log string
passed to ACE_DEBUG/ACE_ERROR is converted automatically to
unicode in an unicode build. The %p expects an unicode string,
if a plain ascii string is passed in, this is just handled as
unicode string and could lead to a crash because then we are
just reading random memory
Diffstat (limited to 'ACE/ace/SOCK_Dgram_Bcast.cpp')
| -rw-r--r-- | ACE/ace/SOCK_Dgram_Bcast.cpp | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/ACE/ace/SOCK_Dgram_Bcast.cpp b/ACE/ace/SOCK_Dgram_Bcast.cpp index b2a1f2e9204..d8fac47ec9d 100644 --- a/ACE/ace/SOCK_Dgram_Bcast.cpp +++ b/ACE/ace/SOCK_Dgram_Bcast.cpp @@ -117,8 +117,8 @@ ACE_SOCK_Dgram_Bcast::mk_broadcast (const ACE_TCHAR *host_name) SO_BROADCAST, (char *) &one, sizeof one) == -1) - ACE_ERROR_RETURN ((LM_ERROR, "%p\n", - "ACE_SOCK_Dgram_Bcast::mk_broadcast: setsockopt failed"), + ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT("%p\n"), + ACE_TEXT("ACE_SOCK_Dgram_Bcast::mk_broadcast: setsockopt failed")), -1); #if !defined (ACE_WIN32) && !defined(__INTERIX) @@ -135,8 +135,8 @@ ACE_SOCK_Dgram_Bcast::mk_broadcast (const ACE_TCHAR *host_name) if (ACE_OS::ioctl (s, SIOCGIFCONF, (char *) &ifc) == -1) - ACE_ERROR_RETURN ((LM_ERROR, "%p\n", - "ACE_SOCK_Dgram_Bcast::mk_broadcast: ioctl (get interface configuration)"), + ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT("%p\n"), + ACE_TEXT("ACE_SOCK_Dgram_Bcast::mk_broadcast: ioctl (get interface configuration)")), ACE_INVALID_HANDLE); struct ifreq *ifr = ifc.ifc_req; @@ -213,8 +213,8 @@ ACE_SOCK_Dgram_Bcast::mk_broadcast (const ACE_TCHAR *host_name) if (ifr->ifr_addr.sa_family != 0 || ACE::debug ()) ACE_DEBUG ((LM_DEBUG, - "warning %p: sa_family: %d\n", - "ACE_SOCK_Dgram_Bcast::mk_broadcast: Not AF_INET", + ACE_TEXT("warning %p: sa_family: %d\n"), + ACE_TEXT("ACE_SOCK_Dgram_Bcast::mk_broadcast: Not AF_INET"), ifr->ifr_addr.sa_family)); continue; } @@ -226,17 +226,17 @@ ACE_SOCK_Dgram_Bcast::mk_broadcast (const ACE_TCHAR *host_name) SIOCGIFFLAGS, (char *) &flags) == -1) { - ACE_ERROR ((LM_ERROR, "%p [%s]\n", - "ACE_SOCK_Dgram_Bcast::mk_broadcast: ioctl (get interface flags)", - flags.ifr_name)); + ACE_ERROR ((LM_ERROR, ACE_TEXT("%p [%s]\n"), + ACE_TEXT("ACE_SOCK_Dgram_Bcast::mk_broadcast: ioctl (get interface flags)"), + flags.ifr_name)); continue; } if (ACE_BIT_ENABLED (flags.ifr_flags, IFF_UP) == 0) { - ACE_ERROR ((LM_ERROR, "%p [%s]\n", - "ACE_SOCK_Dgram_Bcast::mk_broadcast: Network interface is not up", + ACE_ERROR ((LM_ERROR, ACE_TEXT("%p [%s]\n"), + ACE_TEXT("ACE_SOCK_Dgram_Bcast::mk_broadcast: Network interface is not up"), flags.ifr_name)); continue; } @@ -251,8 +251,8 @@ ACE_SOCK_Dgram_Bcast::mk_broadcast (const ACE_TCHAR *host_name) if (ACE_OS::ioctl (s, SIOCGIFBRDADDR, (char *) &if_req) == -1) - ACE_ERROR ((LM_ERROR, "%p [%s]\n", - "ACE_SOCK_Dgram_Bcast::mk_broadcast: ioctl (get broadaddr)", + ACE_ERROR ((LM_ERROR, ACE_TEXT("%p [%s]\n"), + ACE_TEXT("ACE_SOCK_Dgram_Bcast::mk_broadcast: ioctl (get broadaddr)"), flags.ifr_name)); else { @@ -268,8 +268,8 @@ ACE_SOCK_Dgram_Bcast::mk_broadcast (const ACE_TCHAR *host_name) else { if (host_name != 0) - ACE_ERROR ((LM_ERROR, "%p [%s]\n", - "ACE_SOCK_Dgram_Bcast::mk_broadcast: Broadcast is not enable for this interface.", + ACE_ERROR ((LM_ERROR, ACE_TEXT("%p [%s]\n"), + ACE_TEXT("ACE_SOCK_Dgram_Bcast::mk_broadcast: Broadcast is not enable for this interface."), flags.ifr_name)); } } |