ChangeLogTag:Mon Feb 11 13:49:35 2002 Ossama Othman <ossama@uci.edu>

7 files changed, 102 insertions, 7 deletions

diff --git a/ChangeLog b/ChangeLog
index 2d54e05c310..ccea813bf5c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,23 @@
+Mon Feb 11 13:49:35 2002  Ossama Othman  <ossama@uci.edu>
+
+	* bin/fuzz.pl (check_for_push_and_pop):
+
+	  New test that verifies the number of #pragma warning(push)
+	  pragmas matches the number of #pragma warning(pop) pragmas.
+
+	* examples/IPC_SAP/SSL_SAP/SSL-client.cpp (shared_client_test): 
+	* examples/IPC_SAP/SSL_SAP/SSL-client-simple.cpp
+	  (shared_client_test):
+
+	  Do not convert the buffer length to network byte order when
+	  allocating the buffer.  Fixes excessive memory allocation.  This
+	  was apparently a cut-n-paste bug.  Thanks to M Schulze
+	  <m2.schulze@gmx.net>.
+
+	* THANKS:
+
+	  Added M Schulze to the Hall of Fame.
+
 Mon Feb 11 05:42:02 2002  Balachandran Natarajan  <bala@cs.wustl.edu>
 
 	* ace/Connector.h: Fixed a typo in the coments. Thanks to Miljenko
diff --git a/ChangeLogs/ChangeLog-02a b/ChangeLogs/ChangeLog-02a
index 2d54e05c310..ccea813bf5c 100644
--- a/ChangeLogs/ChangeLog-02a
+++ b/ChangeLogs/ChangeLog-02a
@@ -1,3 +1,23 @@
+Mon Feb 11 13:49:35 2002  Ossama Othman  <ossama@uci.edu>
+
+	* bin/fuzz.pl (check_for_push_and_pop):
+
+	  New test that verifies the number of #pragma warning(push)
+	  pragmas matches the number of #pragma warning(pop) pragmas.
+
+	* examples/IPC_SAP/SSL_SAP/SSL-client.cpp (shared_client_test): 
+	* examples/IPC_SAP/SSL_SAP/SSL-client-simple.cpp
+	  (shared_client_test):
+
+	  Do not convert the buffer length to network byte order when
+	  allocating the buffer.  Fixes excessive memory allocation.  This
+	  was apparently a cut-n-paste bug.  Thanks to M Schulze
+	  <m2.schulze@gmx.net>.
+
+	* THANKS:
+
+	  Added M Schulze to the Hall of Fame.
+
 Mon Feb 11 05:42:02 2002  Balachandran Natarajan  <bala@cs.wustl.edu>
 
 	* ace/Connector.h: Fixed a typo in the coments. Thanks to Miljenko
diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a
index 2d54e05c310..ccea813bf5c 100644
--- a/ChangeLogs/ChangeLog-03a
+++ b/ChangeLogs/ChangeLog-03a
@@ -1,3 +1,23 @@
+Mon Feb 11 13:49:35 2002  Ossama Othman  <ossama@uci.edu>
+
+	* bin/fuzz.pl (check_for_push_and_pop):
+
+	  New test that verifies the number of #pragma warning(push)
+	  pragmas matches the number of #pragma warning(pop) pragmas.
+
+	* examples/IPC_SAP/SSL_SAP/SSL-client.cpp (shared_client_test): 
+	* examples/IPC_SAP/SSL_SAP/SSL-client-simple.cpp
+	  (shared_client_test):
+
+	  Do not convert the buffer length to network byte order when
+	  allocating the buffer.  Fixes excessive memory allocation.  This
+	  was apparently a cut-n-paste bug.  Thanks to M Schulze
+	  <m2.schulze@gmx.net>.
+
+	* THANKS:
+
+	  Added M Schulze to the Hall of Fame.
+
 Mon Feb 11 05:42:02 2002  Balachandran Natarajan  <bala@cs.wustl.edu>
 
 	* ace/Connector.h: Fixed a typo in the coments. Thanks to Miljenko
diff --git a/THANKS b/THANKS
index 21f04e3fe94..54eef1b48a6 100644
--- a/THANKS
+++ b/THANKS
@@ -1444,6 +1444,7 @@ Marco Kranawetter <Marco.Kranawetter@icn.siemens.de>
 Christian Veleba <christian.veleba@porsche.co.at>
 Olli Savia <ops@iki.fi>
 Bhaskara Rao G <bhaskar@mihy.mot.com>
+M Schulze <m2.schulze@gmx.net>
 
 I would particularly like to thank Paul Stephenson, who worked with me
 at Ericsson in the early 1990's.  Paul devised the recursive Makefile
diff --git a/bin/fuzz.pl b/bin/fuzz.pl
index f32e647d42b..2e329efef09 100755
--- a/bin/fuzz.pl
+++ b/bin/fuzz.pl
@@ -419,6 +419,44 @@ sub check_for_pre_and_post ()
     }
 }
 
+# This test verifies that the same number of "#pragma warning(push)" and
+# "#pragma warning(pop)" pragmas are used in a given header.
+sub check_for_push_and_pop ()
+{
+    print "Running #pragma warning(push)/(pop) test\n";
+    foreach $file (@files_h) {
+        my $push = 0;
+        my $pop = 0;
+        if (open (FILE, $file)) {
+            my $disable = 0;
+            print "Looking at file $file\n" if $opt_d;
+            while (<FILE>) {
+                if (/FUZZ\: disable check_for_push_and_pop/) {
+                    $disable = 1;
+                }
+                if (/FUZZ\: enable check_for_push_and_pop/) {
+                    $disable = 0;
+                }
+                if ($disable == 0) {
+                    if (/^\s*#\s*pragma\s*warning\s*\(\s*push\s*\)/) {
+                        ++$push;
+                    }
+                    if (/^\s*#\s*pragma\s*warning\s*\(\s*pop\s*\)/) {
+                        ++$pop;
+                    }
+                }
+            }
+            close (FILE);
+
+            if ($disable == 0 && $push != $pop) {
+	        print_error ("#pragma warning(push)/(pop) mismatch in $file");
+            }
+        }
+        else {
+            print STDERR "Error: Could not open $file\n";
+        }
+    }
+}
 
 # Check doxygen @file comments
 sub check_for_mismatched_filename ()
@@ -805,6 +843,7 @@ check_for_line_length () if ($opt_l >= 8);
 check_for_preprocessor_comments () if ($opt_l >= 7);
 check_for_tchar () if ($opt_l >= 4);
 check_for_pre_and_post () if ($opt_l >= 4);
+check_for_push_and_pop () if ($opt_l >= 4);
 check_for_mismatched_filename () if ($opt_l >= 2);
 check_for_bad_run_test () if ($opt_l >= 6);
 check_for_absolute_ace_wrappers () if ($opt_l >= 3);
diff --git a/examples/IPC_SAP/SSL_SAP/SSL-client-simple.cpp b/examples/IPC_SAP/SSL_SAP/SSL-client-simple.cpp
index b998c1322a5..197f8a1f837 100644
--- a/examples/IPC_SAP/SSL_SAP/SSL-client-simple.cpp
+++ b/examples/IPC_SAP/SSL_SAP/SSL-client-simple.cpp
@@ -183,12 +183,9 @@ Options::shared_client_test (u_short port,
                 remote_addr.get_host_name (),
                 remote_addr.get_port_number ()));
 
-  ACE_INT32 len = htonl (this->message_len ());
-
-  // Allocate the transmit buffer.
   char *buf;
   ACE_NEW_RETURN (buf,
-                  char[len],
+                  char[this->message_len ()],
                   0);
 
   ACE_DEBUG ((LM_DEBUG,
diff --git a/examples/IPC_SAP/SSL_SAP/SSL-client.cpp b/examples/IPC_SAP/SSL_SAP/SSL-client.cpp
index 966292d0d9d..ec9c57c4134 100644
--- a/examples/IPC_SAP/SSL_SAP/SSL-client.cpp
+++ b/examples/IPC_SAP/SSL_SAP/SSL-client.cpp
@@ -203,12 +203,10 @@ Options::shared_client_test (u_short port,
                 remote_addr.get_host_name (),
                 remote_addr.get_port_number ()));
 
-  ACE_INT32 len = htonl (this->message_len ());
-
   // Allocate the transmit buffer.
   char *buf;
   ACE_NEW_RETURN (buf,
-                  char[len],
+                  char[this->message_len ()],
                   0);
 
   ACE_DEBUG ((LM_DEBUG,