summaryrefslogtreecommitdiff
path: root/ACE/examples/ASX/Event_Server/Event_Server/Supplier_Router.cpp
diff options
context:
space:
mode:
authorAdam Mitz <mitza@objectcomputing.com>2022-09-22 17:58:28 -0500
committerAdam Mitz <mitza@objectcomputing.com>2022-10-03 13:20:45 -0500
commita33cf7cd35bb9735823fa1276617c38edbd8b385 (patch)
tree239f31538c261643345477541dc2b0260b0ac3d4 /ACE/examples/ASX/Event_Server/Event_Server/Supplier_Router.cpp
parent61a1fbae63918fc59b7d9f2e5b6a902975877078 (diff)
downloadATCD-a33cf7cd35bb9735823fa1276617c38edbd8b385.tar.gz
Merge pull request #1907 from lukem/format-security
Fix -Wformat-security issues (cherry picked from commit 0b7e12778ae92315cbd51c901cb8402d6bd646a7) # Conflicts: # ACE/websvcs/lib/URL_Addr.cpp
Diffstat (limited to 'ACE/examples/ASX/Event_Server/Event_Server/Supplier_Router.cpp')
-rw-r--r--ACE/examples/ASX/Event_Server/Event_Server/Supplier_Router.cpp11
1 files changed, 5 insertions, 6 deletions
diff --git a/ACE/examples/ASX/Event_Server/Event_Server/Supplier_Router.cpp b/ACE/examples/ASX/Event_Server/Event_Server/Supplier_Router.cpp
index 81e20cfc3c7..68ac0b56e6c 100644
--- a/ACE/examples/ASX/Event_Server/Event_Server/Supplier_Router.cpp
+++ b/ACE/examples/ASX/Event_Server/Event_Server/Supplier_Router.cpp
@@ -131,11 +131,6 @@ Supplier_Router::put (ACE_Message_Block *mb,
}
// Return information about the <Supplier_Router>.
-#if defined (ACE_WIN32) || !defined (ACE_USES_WCHAR)
-# define FMTSTR ACE_TEXT ("%s\t %d/%s %s (%s)\n")
-#else
-# define FMTSTR ACE_TEXT ("%ls\t %d/%ls %ls (%ls)\n")
-#endif /* ACE_WIN32 || !ACE_USES_WCHAR */
int
Supplier_Router::info (ACE_TCHAR **strp, size_t length) const
@@ -148,7 +143,11 @@ Supplier_Router::info (ACE_TCHAR **strp, size_t length) const
return -1;
ACE_OS::sprintf (buf,
- FMTSTR,
+ ACE_TEXT ("%") ACE_TEXT_PRIs
+ ACE_TEXT ("\t %d/%") ACE_TEXT_PRIs
+ ACE_TEXT (" %") ACE_TEXT_PRIs
+ ACE_TEXT (" (%") ACE_TEXT_PRIs
+ ACE_TEXT (")\n"),
module_name,
addr.get_port_number (),
ACE_TEXT ("tcp"),