1 files changed, 12 insertions, 22 deletions

diff --git a/ACE/websvcs/lib/URL_Addr.cpp b/ACE/websvcs/lib/URL_Addr.cpp
index 7439bdd4f7d..325dd4ae423 100644
--- a/ACE/websvcs/lib/URL_Addr.cpp
+++ b/ACE/websvcs/lib/URL_Addr.cpp
@@ -41,16 +41,6 @@ static size_t tn3270_size = sizeof(tn3270)/sizeof(tn3270[0]) - 1;
 static ACE_TCHAR gopher[] = ACE_TEXT ("gopher:");
 static size_t gopher_size = sizeof(gopher)/sizeof(gopher[0]) - 1;
 
-// When assembling URLs, sprintf() is often used. The format specifier for
-// a string changes depending on the platform and char width being fed to it.
-// Since we use ACE_TCHAR for strings, and it changes with the char width,
-// the printf specifier needs to change with the platform.
-#if defined (ACE_WIN32) || !defined (ACE_USES_WCHAR)
-#  define ACE_PRINTF_S ACE_TEXT ("%s")
-#else
-#  define ACE_PRINTF_S ACE_TEXT ("%ls")
-#endif
-
 ACE_URL_Addr::ACE_URL_Addr (void)
   : url_ (0)
 {
@@ -531,11 +521,11 @@ ACE_HTTP_Addr::addr_to_string (ACE_TCHAR *buffer,
   if (flags == 0)
     {
       ACE_INET_Addr inet = this->get_inet_address ();
-      n += ACE_OS::sprintf (buffer + n, ACE_PRINTF_S, inet.get_host_addr ());
+      n += ACE_OS::sprintf (buffer + n, ACE_TEXT ("%") ACE_TEXT_PRIs, inet.get_host_addr ());
     }
   else
     {
-     n += ACE_OS::sprintf (buffer + n, ACE_PRINTF_S, this->hostname_);
+     n += ACE_OS::sprintf (buffer + n, ACE_TEXT ("%") ACE_TEXT_PRIs, this->hostname_);
     }
 
   if (this->port_number_ != ACE_DEFAULT_HTTP_PORT)
@@ -545,13 +535,13 @@ ACE_HTTP_Addr::addr_to_string (ACE_TCHAR *buffer,
   if (this->path_ != 0)
     {
       n += ACE_OS::sprintf (buffer + n,
-                            ACE_TEXT ("/") ACE_PRINTF_S,
+                            ACE_TEXT ("/%") ACE_TEXT_PRIs,
                             this->path_);
     }
   if (this->query_ != 0)
     {
       n += ACE_OS::sprintf (buffer + n,
-                            ACE_TEXT ("?") ACE_PRINTF_S,
+                            ACE_TEXT ("?%") ACE_TEXT_PRIs,
                             this->query_);
     }
   return 0;
@@ -704,12 +694,12 @@ ACE_FTP_Addr::addr_to_string (ACE_TCHAR *buffer,
 
   if (this->user_ != 0)
     {
-      n += ACE_OS::sprintf (buffer + n, ACE_PRINTF_S, this->user_);
+      n += ACE_OS::sprintf (buffer + n, ACE_TEXT ("%") ACE_TEXT_PRIs, this->user_);
     }
   if (this->password_ != 0)
     {
       n += ACE_OS::sprintf (buffer + n,
-                            ACE_TEXT (":") ACE_PRINTF_S,
+                            ACE_TEXT (":%") ACE_TEXT_PRIs,
                             this->password_);
     }
 
@@ -721,16 +711,16 @@ ACE_FTP_Addr::addr_to_string (ACE_TCHAR *buffer,
   if (flags == 0)
     {
       ACE_INET_Addr inet = this->get_inet_address ();
-      n += ACE_OS::sprintf (buffer + n, ACE_PRINTF_S, inet.get_host_addr ());
+      n += ACE_OS::sprintf (buffer + n, ACE_TEXT ("%") ACE_TEXT_PRIs, inet.get_host_addr ());
     }
   else
     {
-      n += ACE_OS::sprintf (buffer + n, ACE_PRINTF_S, this->hostname_);
+      n += ACE_OS::sprintf (buffer + n, ACE_TEXT ("%") ACE_TEXT_PRIs, this->hostname_);
     }
   if (this->path_ != 0)
     {
       n += ACE_OS::sprintf (buffer + n,
-                            ACE_TEXT ("/") ACE_PRINTF_S,
+                            ACE_TEXT ("/%") ACE_TEXT_PRIs,
                             this->path_);
     }
   return 0;
@@ -915,12 +905,12 @@ ACE_Mailto_Addr::addr_to_string (ACE_TCHAR *buffer,
     return -1;
 
   size_t n = ACE_OS::sprintf (buffer,
-                              ACE_TEXT ("mailto:") ACE_PRINTF_S ACE_TEXT
-                              ("@") ACE_PRINTF_S,
+                              ACE_TEXT ("mailto:%") ACE_TEXT_PRIs
+                              ACE_TEXT ("@%") ACE_TEXT_PRIs,
                               this->user_, this->hostname_);
   if (this->headers_ != 0)
     {
-      n += ACE_OS::sprintf (buffer + n, ACE_TEXT ("?") ACE_PRINTF_S,
+      n += ACE_OS::sprintf (buffer + n, ACE_TEXT ("?%") ACE_TEXT_PRIs,
                             this->headers_);
     }