ChangeLogTag:Thu Oct 28 10:54:42 1999 Nanbor Wang <nanbor@ace.cs.wustl.edu>

4 files changed, 22 insertions, 23 deletions

diff --git a/ace/Message_Block.cpp b/ace/Message_Block.cpp
index 4d0dfd264de..00d49cd725f 100644
--- a/ace/Message_Block.cpp
+++ b/ace/Message_Block.cpp
@@ -1061,13 +1061,13 @@ ACE_Dynamic_Message_Strategy::dump (void) const
   ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
 
   ACE_DEBUG ((LM_DEBUG,
-              ASYS_TEXT ("static_bit_field_mask_ = %lu\n")
-              ASYS_TEXT ("static_bit_field_shift_ = %lu\n")
-              ASYS_TEXT ("dynamic_priority_max_ = %lu\n")
-              ASYS_TEXT ("dynamic_priority_offset_ = %lu\n")
-              ASYS_TEXT ("max_late_ = [%ld sec, %ld usec]\n")
-              ASYS_TEXT ("min_pending_ = [%ld sec, %ld usec]\n")
-              ASYS_TEXT ("pending_shift_ = [%ld sec, %ld usec]\n"),
+              ASYS_TEXT ("static_bit_field_mask_ = %u\n")
+              ASYS_TEXT ("static_bit_field_shift_ = %u\n")
+              ASYS_TEXT ("dynamic_priority_max_ = %u\n")
+              ASYS_TEXT ("dynamic_priority_offset_ = %u\n")
+              ASYS_TEXT ("max_late_ = [%d sec, %d usec]\n")
+              ASYS_TEXT ("min_pending_ = [%d sec, %d usec]\n")
+              ASYS_TEXT ("pending_shift_ = [%d sec, %d usec]\n"),
               this->static_bit_field_mask_,
               this->static_bit_field_shift_,
               this->dynamic_priority_max_,
diff --git a/ace/Name_Request_Reply.cpp b/ace/Name_Request_Reply.cpp
index a92caf5641c..80ecf7f4db6 100644
--- a/ace/Name_Request_Reply.cpp
+++ b/ace/Name_Request_Reply.cpp
@@ -382,7 +382,7 @@ ACE_Name_Request::dump (void) const
       ACE_Time_Value tv = this->timeout ();
 #endif /* ! ACE_NLOGGING */
       ACE_DEBUG ((LM_DEBUG,
-                  ASYS_TEXT ("waiting for %ld secs and %ld usecs\n"),
+                  ASYS_TEXT ("waiting for %d secs and %d usecs\n"),
                   tv.sec (),
                   tv.usec ()));
     }
diff --git a/ace/Time_Request_Reply.cpp b/ace/Time_Request_Reply.cpp
index 338f3bf909f..404411f832a 100644
--- a/ace/Time_Request_Reply.cpp
+++ b/ace/Time_Request_Reply.cpp
@@ -179,7 +179,7 @@ ACE_Time_Request::dump (void) const
 #if !defined (ACE_NLOGGING)
       ACE_Time_Value tv = this->timeout ();
 #endif /* ! ACE_NLOGGING */
-      ACE_DEBUG ((LM_DEBUG,  ASYS_TEXT ("waiting for %ld secs and %ld usecs\n"),
+      ACE_DEBUG ((LM_DEBUG,  ASYS_TEXT ("waiting for %d secs and %d usecs\n"),
                   tv.sec (), tv.usec ()));
     }
   ACE_DEBUG ((LM_DEBUG,  ASYS_TEXT ("*******\ntime = %d\n"),
diff --git a/ace/Token_Request_Reply.cpp b/ace/Token_Request_Reply.cpp
index e88f40e6505..8bb2c0fb009 100644
--- a/ace/Token_Request_Reply.cpp
+++ b/ace/Token_Request_Reply.cpp
@@ -18,7 +18,7 @@ ACE_Token_Request::ACE_Token_Request (void)
 {
 }
 
-// Create a ACE_Token_Request message.  
+// Create a ACE_Token_Request message.
 
 ACE_Token_Request::ACE_Token_Request (int token_type,
 				      int proxy_type,
@@ -38,7 +38,7 @@ ACE_Token_Request::ACE_Token_Request (int token_type,
   this->options (options);
 }
 
-// Encode the transfer buffer into network byte order 
+// Encode the transfer buffer into network byte order
 // so that it can be sent to the server.
 
 int
@@ -48,7 +48,7 @@ ACE_Token_Request::encode (void *&buf)
   return this->length ();
 }
 
-// Decode the transfer buffer into host byte byte order 
+// Decode the transfer buffer into host byte byte order
 // so that it can be used by the server.
 
 int
@@ -77,9 +77,9 @@ ACE_Token_Request::decode (void)
   // ':'
   // client_id_ plus '\0'
   size_t data_size = ACE_TOKEN_REQUEST_HEADER_SIZE
-                     + ACE_OS::strlen (this->token_name_) + 1 
-		     + ACE_OS::strlen (this->client_id_) + 1  
-		     + 1;	                     
+                     + ACE_OS::strlen (this->token_name_) + 1
+		     + ACE_OS::strlen (this->client_id_) + 1
+		     + 1;
 
   // Make sure the message was correctly received and framed.
   return this->length () == data_size ? 0 : -1;
@@ -91,7 +91,7 @@ void
 ACE_Token_Request::dump (void) const
 {
   ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
-  ACE_DEBUG ((LM_DEBUG,  ASYS_TEXT ("*******\nlength = %d\ntoken name = %s\nclient id = %s\n"), 
+  ACE_DEBUG ((LM_DEBUG,  ASYS_TEXT ("*******\nlength = %d\ntoken name = %s\nclient id = %s\n"),
 	     this->length (), this->token_name (), this->client_id ()));
   ACE_DEBUG ((LM_DEBUG,  ASYS_TEXT ("type = ")));
 
@@ -126,17 +126,17 @@ ACE_Token_Request::dump (void) const
     ACE_DEBUG ((LM_DEBUG,  ASYS_TEXT ("blocking forever\n")));
   else
     {
-      ACE_DEBUG ((LM_DEBUG,  ASYS_TEXT ("waiting for %ld secs and %ld usecs\n"), 
+      ACE_DEBUG ((LM_DEBUG,  ASYS_TEXT ("waiting for %d secs and %d usecs\n"),
 		 this->options ().timeout ().sec (), this->options ().timeout ().usec ()));
     }
-  ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));    
+  ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
 }
 
 // ************************************************************
 // ************************************************************
 // ************************************************************
 
-// Create a ACE_Token_Reply message.  
+// Create a ACE_Token_Reply message.
 
 ACE_Token_Reply::ACE_Token_Reply (void) // Type of reply.
 {
@@ -145,7 +145,7 @@ ACE_Token_Reply::ACE_Token_Reply (void) // Type of reply.
   this->length (sizeof (Transfer));
 }
 
-// Encode the transfer buffer into network byte order 
+// Encode the transfer buffer into network byte order
 // so that it can be sent to the client.
 
 int
@@ -155,7 +155,7 @@ ACE_Token_Reply::encode (void *&buf)
   return this->length ();
 }
 
-// Decode the transfer buffer into host byte order 
+// Decode the transfer buffer into host byte order
 // so that it can be used by the client.
 
 int
@@ -169,8 +169,7 @@ ACE_Token_Reply::decode (void)
 void
 ACE_Token_Reply::dump (void) const
 {
-  ACE_DEBUG ((LM_DEBUG,  ASYS_TEXT ("*******\nlength = %d\nerrnum = %d"), 
+  ACE_DEBUG ((LM_DEBUG,  ASYS_TEXT ("*******\nlength = %d\nerrnum = %d"),
 	     this->length (), this->errnum ()));
   ACE_DEBUG ((LM_DEBUG,  ASYS_TEXT ("arg = %d"), this->arg ()));
 }
-