Wed Mar 9 10:48:48 UTC 2011 Vladimir Zykov <vladimir.zykov@prismtech.com>

        * tao/GIOP_Message_Base.cpp:
        * TAO_IDL/be/be_visitor_arg_traits.cpp:
        * TAO_IDL/be/be_visitor_array/array_ci.cpp:
        * TAO_IDL/be/be_sequence.cpp:
        * orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.cpp:
          Changed my previous fix to these files. That change was too shallow.

        * orbsvcs/orbsvcs/Notify/XML_Saver.cpp:
        * orbsvcs/orbsvcs/PortableGroup/PG_Object_Group_Manipulator.cpp:
        * orbsvcs/orbsvcs/Scheduler_Factory.cpp:
        * orbsvcs/tests/Notify/lib/Task_Stats.cpp:
        * orbsvcs/tests/FT_App/FT_Client.cpp:
        * orbsvcs/tests/FT_App/FT_Creator.cpp:
        * orbsvcs/tests/FT_App/FT_Creator.h:
        * utils/catior/Catior_i.cpp:
        * utils/logWalker/HostProcess.cpp:
        * utils/logWalker/Log.cpp:
          Fixed use of types for printf format.

16 files changed, 85 insertions, 45 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 7468ebc74e4..540138538bb 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,24 @@
+Wed Mar  9 10:48:48 UTC 2011  Vladimir Zykov  <vladimir.zykov@prismtech.com>
+
+        * tao/GIOP_Message_Base.cpp:
+        * TAO_IDL/be/be_visitor_arg_traits.cpp:
+        * TAO_IDL/be/be_visitor_array/array_ci.cpp:
+        * TAO_IDL/be/be_sequence.cpp:
+        * orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.cpp:
+          Changed my previous fix to these files. That change was too shallow.
+
+        * orbsvcs/orbsvcs/Notify/XML_Saver.cpp:
+        * orbsvcs/orbsvcs/PortableGroup/PG_Object_Group_Manipulator.cpp:
+        * orbsvcs/orbsvcs/Scheduler_Factory.cpp:
+        * orbsvcs/tests/Notify/lib/Task_Stats.cpp:
+        * orbsvcs/tests/FT_App/FT_Client.cpp:
+        * orbsvcs/tests/FT_App/FT_Creator.cpp:
+        * orbsvcs/tests/FT_App/FT_Creator.h:
+        * utils/catior/Catior_i.cpp:
+        * utils/logWalker/HostProcess.cpp:
+        * utils/logWalker/Log.cpp:
+          Fixed use of types for printf format.
+
 Mon Mar  7 16:19:40 UTC 2011  Vladimir Zykov  <vladimir.zykov@prismtech.com>
 
         * orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.cpp:
diff --git a/TAO/TAO_IDL/be/be_sequence.cpp b/TAO/TAO_IDL/be/be_sequence.cpp
index eb11c450481..d557215fb5e 100644
--- a/TAO/TAO_IDL/be/be_sequence.cpp
+++ b/TAO/TAO_IDL/be/be_sequence.cpp
@@ -204,7 +204,7 @@ be_sequence::gen_name (void)
     {
       char ulval_str [NAMEBUFSIZE];
       ACE_OS::sprintf (ulval_str,
-                       "_%u",
+                       "_" ACE_UINT32_FORMAT_SPECIFIER_ASCII,
                        this->max_size ()->ev ()->u.ulval);
       ACE_OS::strcat (namebuf,
                       ulval_str);
@@ -465,7 +465,8 @@ be_sequence::instance_name ()
       else
         {
           ACE_OS::sprintf (namebuf,
-                           "_TAO_bounded_object_reference_sequence_%s_%u",
+                           "_TAO_bounded_object_reference_sequence_%s_"
+                           ACE_UINT32_FORMAT_SPECIFIER_ASCII,
                            prim_type->local_name ()->get_string (),
                            this->max_size ()->ev ()->u.ulval);
         }
@@ -481,7 +482,8 @@ be_sequence::instance_name ()
       else
         {
           ACE_OS::sprintf (namebuf,
-                           "_TAO_bounded_valuetype_sequence_%s_%u",
+                           "_TAO_bounded_valuetype_sequence_%s_"
+                           ACE_UINT32_FORMAT_SPECIFIER_ASCII,
                            prim_type->local_name ()->get_string (),
                            this->max_size ()->ev ()->u.ulval);
         }
@@ -539,9 +541,10 @@ be_sequence::instance_name ()
       else
         {
           ACE_OS::sprintf (namebuf,
-                           "_TAO_bounded_value_sequence_%s_%u",
-                            prim_type->local_name ()->get_string (),
-                            this->max_size ()->ev ()->u.ulval);
+                           "_TAO_bounded_value_sequence_%s_"
+                           ACE_UINT32_FORMAT_SPECIFIER_ASCII,
+                           prim_type->local_name ()->get_string (),
+                           this->max_size ()->ev ()->u.ulval);
         }
 
       break;
@@ -826,7 +829,7 @@ be_sequence::compute_tc_name (void)
   char bound[30] = { 0 };
 
   ACE_OS::sprintf (bound,
-                   "_%u",
+                   "_" ACE_UINT32_FORMAT_SPECIFIER_ASCII,
                    this->max_size ()->ev ()->u.ulval);
 
   ACE_CString local_tc_name =
diff --git a/TAO/TAO_IDL/be/be_visitor_arg_traits.cpp b/TAO/TAO_IDL/be/be_visitor_arg_traits.cpp
index 18c71ba78ed..a15234e5d61 100644
--- a/TAO/TAO_IDL/be/be_visitor_arg_traits.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_arg_traits.cpp
@@ -687,7 +687,7 @@ be_visitor_arg_traits::visit_string (be_string *node)
       size_t bound_length = num_digits + 1;
       char* bound_string = 0;
       ACE_NEW_RETURN (bound_string, char[bound_length], -1) ;
-      ACE_OS::sprintf (bound_string, "%u", bound);
+      ACE_OS::sprintf (bound_string, ACE_UINT32_FORMAT_SPECIFIER_ASCII, bound);
 
       size_t cat_length = ACE_OS::strlen (alias->local_name ()->get_string ()) +
                           ACE_OS::strlen (bound_string) +
diff --git a/TAO/TAO_IDL/be/be_visitor_array/array_ci.cpp b/TAO/TAO_IDL/be/be_visitor_array/array_ci.cpp
index b87b2afc2e2..078f9fae73d 100644
--- a/TAO/TAO_IDL/be/be_visitor_array/array_ci.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_array/array_ci.cpp
@@ -179,7 +179,7 @@ int be_visitor_array_ci::visit_array (be_array *node)
                       '\0',
                       NAMEBUFSIZE);
       ACE_OS::sprintf (buf,
-                       "_%d",
+                       "_" ACE_UINT32_FORMAT_SPECIFIER_ASCII,
                        node->dims ()[i]->ev ()->u.ulval);
       unique += buf;
     }
diff --git a/TAO/orbsvcs/orbsvcs/Notify/XML_Saver.cpp b/TAO/orbsvcs/orbsvcs/Notify/XML_Saver.cpp
index 90b3b415903..a3468558fa4 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/XML_Saver.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/XML_Saver.cpp
@@ -37,7 +37,7 @@ namespace TAO_Notify
   {
     ACE_OS::snprintf(file_path, MAXPATHLEN, ACE_TEXT("%s.%3.3d"),
       this->base_name_.c_str (),
-      nfile);
+      static_cast<int> (nfile));
   }
 
   void
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group_Manipulator.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group_Manipulator.cpp
index cd286bb9948..8e91038f8be 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group_Manipulator.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group_Manipulator.cpp
@@ -47,8 +47,8 @@ PortableServer::ObjectId * TAO::PG_Object_Group_Manipulator::convert_ogid_to_oid
   // 4294967295 -- Largest 32 bit unsigned integer
   char oid_str[11];
   ACE_OS::snprintf (oid_str, sizeof(oid_str),
-                   "%lu",
-                   static_cast<ACE_UINT32> (ogid));
+                    ACE_UINT32_FORMAT_SPECIFIER_ASCII,
+                    static_cast<ACE_UINT32> (ogid));
   oid_str[sizeof(oid_str) - 1] = '\0';
 
   return PortableServer::string_to_ObjectId (oid_str);
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.cpp
index 67a6aeeec76..0fd854dfe70 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.cpp
@@ -550,7 +550,8 @@ TAO_UIPMC_Profile::to_string (void)
   char * buf = CORBA::string_alloc (static_cast<CORBA::ULong> (buflen));
 
   ACE_OS::sprintf (buf,
-                   "corbaloc:%s:%c.%c@%c.%c-%s-%u",
+                   "corbaloc:%s:%c.%c@%c.%c-%s-"
+                   ACE_UINT64_FORMAT_SPECIFIER_ASCII,
                    ::the_prefix,
                    digits [this->version_.major],
                    digits [this->version_.minor],
@@ -562,7 +563,7 @@ TAO_UIPMC_Profile::to_string (void)
   if (this->has_ref_version_)
     {
       ACE_OS::sprintf (&buf[ACE_OS::strlen (buf)],
-                       "-%u",
+                       "-" ACE_UINT32_FORMAT_SPECIFIER_ASCII,
                        this->ref_version_);
     }
 
diff --git a/TAO/orbsvcs/orbsvcs/Scheduler_Factory.cpp b/TAO/orbsvcs/orbsvcs/Scheduler_Factory.cpp
index c8f06d77ffa..99b2825be99 100644
--- a/TAO/orbsvcs/orbsvcs/Scheduler_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Scheduler_Factory.cpp
@@ -342,13 +342,13 @@ int ACE_Scheduler_Factory::dump_schedule
       if (file == 0)
           return -1;
     }
-  ACE_OS::fprintf (file, header);
+  ACE_OS::fprintf (file, "%s", header);
 
   // Indicate anomalies encountered during scheduling.
 
-  ACE_OS::fprintf(file, (anomalies.length () > 0
-                         ? start_anomalies_found
-                         : start_anomalies_none));
+  ACE_OS::fprintf(file, "%s", (anomalies.length () > 0
+                               ? start_anomalies_found
+                               : start_anomalies_none));
 
   for (i = 0; i < anomalies.length (); ++i)
     {
@@ -388,7 +388,7 @@ int ACE_Scheduler_Factory::dump_schedule
     }
 
   // Print out operation QoS info.
-  ACE_OS::fprintf (file, start_infos);
+  ACE_OS::fprintf (file, "%s", start_infos);
 
   for (i = 0;
        i < infos.length ();
@@ -437,9 +437,9 @@ int ACE_Scheduler_Factory::dump_schedule
   ACE_OS::fprintf(file, "\n");
 
   if (infos.length () > 0)
-    ACE_OS::fprintf (file, end_infos);
+    ACE_OS::fprintf (file, "%s", end_infos);
   else
-    ACE_OS::fprintf (file, end_infos_empty);
+    ACE_OS::fprintf (file, "%s", end_infos_empty);
 
   // Print out banner indicating which dependencies are dumped.
   if (dump_disabled_dependencies)
@@ -452,7 +452,7 @@ int ACE_Scheduler_Factory::dump_schedule
     }
 
   // Print out operation dependency info.
-  ACE_OS::fprintf (file, start_dependencies);
+  ACE_OS::fprintf (file, "%s", start_dependencies);
 
   for (i = 0;
        i < dependencies.length ();
@@ -484,13 +484,13 @@ int ACE_Scheduler_Factory::dump_schedule
   ACE_OS::fprintf (file, "\n");
 
   if (dependencies.length () > 0)
-    ACE_OS::fprintf (file, end_dependencies);
+    ACE_OS::fprintf (file, "%s", end_dependencies);
   else
-    ACE_OS::fprintf (file, end_dependencies_empty);
+    ACE_OS::fprintf (file, "%s", end_dependencies_empty);
 
 
   // Print out queue configuration info.
-  ACE_OS::fprintf (file, start_configs);
+  ACE_OS::fprintf (file, "%s", start_configs);
 
   for (i = 0;
        i < configs.length ();
@@ -512,11 +512,11 @@ int ACE_Scheduler_Factory::dump_schedule
   ACE_OS::fprintf (file, "\n");
 
   if (configs.length () > 0)
-    ACE_OS::fprintf (file, end_configs);
+    ACE_OS::fprintf (file, "%s", end_configs);
   else
-    ACE_OS::fprintf (file, end_configs_empty);
+    ACE_OS::fprintf (file, "%s", end_configs_empty);
 
-  ACE_OS::fprintf (file, footer);
+  ACE_OS::fprintf (file, "%s", footer);
   ACE_OS::fclose (file);
   return 0;
 }
diff --git a/TAO/orbsvcs/tests/FT_App/FT_Client.cpp b/TAO/orbsvcs/tests/FT_App/FT_Client.cpp
index d9c33457395..872d06dec35 100644
--- a/TAO/orbsvcs/tests/FT_App/FT_Client.cpp
+++ b/TAO/orbsvcs/tests/FT_App/FT_Client.cpp
@@ -510,7 +510,11 @@ int FTClientMain::next_replica (void)
   }
   else
   {
-    ACE_OS::fprintf (stderr, "***OUT_OF_REPLICAS*** %d\n", this->replica_pos_);
+    ACE_OS::fprintf (stderr,
+                     "***OUT_OF_REPLICAS*** "
+                     ACE_SIZE_T_FORMAT_SPECIFIER_ASCII
+                     "\n",
+                     this->replica_pos_);
   }
   return result;
 }
diff --git a/TAO/orbsvcs/tests/FT_App/FT_Creator.cpp b/TAO/orbsvcs/tests/FT_App/FT_Creator.cpp
index cf764bf72c4..6a08013f12b 100644
--- a/TAO/orbsvcs/tests/FT_App/FT_Creator.cpp
+++ b/TAO/orbsvcs/tests/FT_App/FT_Creator.cpp
@@ -192,7 +192,8 @@ int FTAPP::FT_Creator::run (void)
       CORBA::String_var iogr = this->orb_->object_to_string (group.in ());
 
       char iogr_filename[1000];
-      ACE_OS::snprintf (iogr_filename, sizeof(iogr_filename), "%s%s_%d.iogr",
+      ACE_OS::snprintf (iogr_filename, sizeof(iogr_filename),
+        "%s%s_" ACE_SIZE_T_FORMAT_SPECIFIER_ASCII ".iogr",
         this->prefix_.c_str (),
         role,
         this->iogr_seq_);
@@ -213,7 +214,8 @@ int FTAPP::FT_Creator::run (void)
     if(this->ns_register_)
     {
       char iogr_name[1000];
-      ACE_OS::snprintf (iogr_name, sizeof(iogr_name), "%s_%s_%d",
+      ACE_OS::snprintf (iogr_name, sizeof(iogr_name),
+        "%s_%s_" ACE_SIZE_T_FORMAT_SPECIFIER_ASCII,
         this->prefix_.c_str (),
         role,
         this->iogr_seq_);
diff --git a/TAO/orbsvcs/tests/FT_App/FT_Creator.h b/TAO/orbsvcs/tests/FT_App/FT_Creator.h
index 1f8c767c02c..44e7b6125f4 100644
--- a/TAO/orbsvcs/tests/FT_App/FT_Creator.h
+++ b/TAO/orbsvcs/tests/FT_App/FT_Creator.h
@@ -100,7 +100,7 @@ namespace FTAPP
     /**
      * sequence number applied to created IOGRs
      */
-    unsigned long iogr_seq_;
+    size_t iogr_seq_;
 
     /**
      * prefix for names
diff --git a/TAO/orbsvcs/tests/Notify/lib/Task_Stats.cpp b/TAO/orbsvcs/tests/Notify/lib/Task_Stats.cpp
index 2dc62fce802..c224c6a4d1a 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Task_Stats.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/Task_Stats.cpp
@@ -83,7 +83,9 @@ Task_Stats::dump_samples (const ACE_TCHAR *file_name, const ACE_TCHAR *msg, int
   double t_avg = samples_count_ / seconds;
 
   ACE_OS::sprintf (out_msg,
-                   "# Throughput: %.2f (events/second) [%u samples in %.2f seconds]\n",
+                   "# Throughput: %.2f (events/second) ["
+                   ACE_SIZE_T_FORMAT_SPECIFIER_ASCII
+                   " samples in %.2f seconds]\n",
                    t_avg, samples_count_, seconds);
   ACE_OS::fprintf (output_file, "%s",out_msg);
 
diff --git a/TAO/tao/GIOP_Message_Base.cpp b/TAO/tao/GIOP_Message_Base.cpp
index 58f848df66c..bae56ecbf68 100644
--- a/TAO/tao/GIOP_Message_Base.cpp
+++ b/TAO/tao/GIOP_Message_Base.cpp
@@ -687,8 +687,8 @@ TAO_GIOP_Message_Base::process_request_message (TAO_Transport *transport,
   if (TAO_debug_level > 9)
     {
       char buf[48];
-      ACE_OS::sprintf (buf, "Transport[%d] recv",
-                       static_cast<int> (transport->id ()));
+      ACE_OS::sprintf (buf, "Transport[" ACE_SIZE_T_FORMAT_SPECIFIER_ASCII "] recv",
+                       transport->id ());
       //due to alignment data block has an offset which needs to be corrected
       this->dump_msg (buf,
                       reinterpret_cast <u_char *> (db->base () + rd_pos - TAO_GIOP_MESSAGE_HEADER_LEN),
@@ -802,8 +802,8 @@ TAO_GIOP_Message_Base::process_reply_message (
   if (TAO_debug_level > 9)
     {
       char buf[48];
-      ACE_OS::sprintf (buf, "Transport[%d] recv",
-                       static_cast<int> (params.transport_->id ()));
+      ACE_OS::sprintf (buf, "Transport[" ACE_SIZE_T_FORMAT_SPECIFIER_ASCII "] recv",
+                       params.transport_->id ());
       this->dump_msg (buf,
                       reinterpret_cast <u_char *> (db->base () + rd_pos - TAO_GIOP_MESSAGE_HEADER_LEN),
                       db->size ()  + rd_pos - TAO_GIOP_MESSAGE_HEADER_LEN);
diff --git a/TAO/utils/catior/Catior_i.cpp b/TAO/utils/catior/Catior_i.cpp
index 61520147e0a..c3fac2f0759 100644
--- a/TAO/utils/catior/Catior_i.cpp
+++ b/TAO/utils/catior/Catior_i.cpp
@@ -989,7 +989,7 @@ Catior_i::cat_octet_seq (const char *object_name,
       if (!stream.read_octet (anOctet))
         return false;
 
-      ACE_OS::snprintf (buf, bufsize, "%02.2x ", anOctet);
+      ACE_OS::snprintf (buf, bufsize, "%2.2x ", anOctet);
       buffer_ += buf;
       objKey[i] = (char) anOctet;
     }
@@ -1110,7 +1110,9 @@ Catior_i::cat_codeset_info (TAO_InputCDR& cdr)
   for ( ; index < c_ccslen; ++index)
     {
       // CodesetId for char
-      ACE_OS::snprintf (buf, bufsize, "\t%u) ", index + 1L);
+      ACE_OS::snprintf (buf, bufsize,
+                        "\t" ACE_UINT32_FORMAT_SPECIFIER_ASCII ") ",
+                        index + 1);
       buffer_ += buf;
       displayHex (stream);
     }
@@ -1137,7 +1139,9 @@ Catior_i::cat_codeset_info (TAO_InputCDR& cdr)
   //  Loop through and display them
   for (index = 0; index < w_ccslen; ++index)
     {
-      ACE_OS::snprintf (buf, bufsize, "\t %u) ", index + 1L);
+      ACE_OS::snprintf (buf, bufsize,
+                        "\t " ACE_UINT32_FORMAT_SPECIFIER_ASCII ") ",
+                        index + 1);
       buffer_ += buf;
       displayHex (stream);
     }
@@ -1170,7 +1174,9 @@ Catior_i::cat_tagged_components (TAO_InputCDR& stream)
 
       indent ();
       ACE_OS::snprintf (buf, bufsize,
-                        "The component <%d> ID is ", i+1, tag);
+                        "The component <" ACE_UINT32_FORMAT_SPECIFIER_ASCII
+                        "> ID is " ACE_UINT32_FORMAT_SPECIFIER_ASCII,
+                        i+1, tag);
       buffer_ += buf;
 
       if (tag == IOP::TAG_ORB_TYPE) {
@@ -1273,7 +1279,7 @@ Catior_i::cat_profile_helper (TAO_InputCDR& stream,
     {
       indent ();
       ACE_OS::snprintf (buf, bufsize,
-                        "detected new v%d.%d %C profile that catior cannot decode\n",
+                        "detected new v%d.%d %s profile that catior cannot decode\n",
                         iiop_version_major,
                         iiop_version_minor,
                         protocol);
@@ -1626,7 +1632,7 @@ Catior_i::cat_nsk_profile_helper (TAO_InputCDR& stream,
     {
       indent ();
       ACE_OS::snprintf (buf, bufsize,
-                        "detected new v%d.%d %C profile that catior cannot decode",
+                        "detected new v%d.%d %s profile that catior cannot decode",
                         iiop_version_major,
                         iiop_version_minor,
                         protocol);
diff --git a/TAO/utils/logWalker/HostProcess.cpp b/TAO/utils/logWalker/HostProcess.cpp
index 899d8569fbf..e464d3a4647 100644
--- a/TAO/utils/logWalker/HostProcess.cpp
+++ b/TAO/utils/logWalker/HostProcess.cpp
@@ -69,7 +69,8 @@ HostProcess::find_thread (long tid)
         return thr;
     }
   char alias[20];
-  ACE_OS::sprintf (alias,"Thread[%d]",this->threads_.size() + 1);
+  ACE_OS::sprintf (alias,"Thread[" ACE_SIZE_T_FORMAT_SPECIFIER_ASCII "]",
+                   this->threads_.size() + 1);
   thr = new Thread (tid, alias);
   threads_.insert_tail (thr);
   return thr;
diff --git a/TAO/utils/logWalker/Log.cpp b/TAO/utils/logWalker/Log.cpp
index 9dd05ee745f..5aae755dda6 100644
--- a/TAO/utils/logWalker/Log.cpp
+++ b/TAO/utils/logWalker/Log.cpp
@@ -126,7 +126,7 @@ Log::get_host (long pid)
         default:
           {
             char ext[10];
-            ACE_OS::sprintf(ext,"_%d",numprocs+1);
+            ACE_OS::sprintf(ext,"_" ACE_SIZE_T_FORMAT_SPECIFIER_ASCII,numprocs+1);
             ACE_CString a2 = alias_ + ext;
             hp->proc_name(a2);
           }