Mon Mar 3 10:49:28 UTC 2008 Abdullah Sowayan <abdullah.sowayan@lmco.com>

27 files changed, 85 insertions, 8 deletions

diff --git a/ACE/ChangeLog b/ACE/ChangeLog
index 18d1e1603d9..4d85345c388 100644
--- a/ACE/ChangeLog
+++ b/ACE/ChangeLog
@@ -1,3 +1,44 @@
+Mon Mar  3 10:49:28 UTC 2008  Abdullah Sowayan  <abdullah.sowayan@lmco.com>
+
+        * apps/JAWS/clients/WebSTONE/src/cgi-send.c:
+        * apps/JAWS/clients/WebSTONE/src/genrand.c:
+        * apps/JAWS/clients/WebSTONE/src/webmaster.c:
+        * contrib/utility/Example/CommandLine/Foo/command.cpp:
+        * contrib/utility/Example/ExH/BadCast/bad_cast.cpp:
+        * contrib/utility/Example/ExH/Compound/compound.cpp:
+        * contrib/utility/Example/ExH/HelloWorld/hello_world.cpp:
+        * contrib/utility/Example/ExH/LogicToSystem/logic_to_system.cpp:
+        * contrib/utility/Example/Hetero/Container/container.cpp:
+        * contrib/utility/Example/Introspection/InheritanceTree/inheritance_tree.cpp:
+        * contrib/utility/Example/Introspection/Traversal/driver.cpp:
+        * contrib/utility/Test/ExH/Converter/converter.cpp:
+        * contrib/utility/Test/ExH/Inline/inline.cpp:
+        * contrib/utility/Test/ExH/Logic/DescriptiveException/descriptive_exception.cpp:
+        * contrib/utility/Test/ExH/System/DescriptiveException/descriptive_exception.cpp:
+        * contrib/utility/Test/Introspection/Inline/inline.cpp:
+        * contrib/utility/Test/Synch/Inline/inline.cpp:
+        * etc/xlc_dummy.cpp:
+        * examples/Reactor/Proactor/test_aiocb.cpp:
+        * examples/Reactor/Proactor/test_aiosig.cpp:
+
+          Disable fuzz's check_for_improper_main_declaration check on these files.
+          These files don't use ACE.
+
+        * examples/Reactor/WFMO_Reactor/Multithreading.cpp:
+        * examples/Reactor/WFMO_Reactor/Registration.cpp:
+        * examples/Reactor/WFMO_Reactor/Registry_Changes.cpp:
+        * examples/Threads/task_three.cpp:
+
+          Use the proper form of ACE_TMAIN. Namely, the argv parameter
+          should be "ACE_TCHAR *argv[]" instead of "ACE_TCHAR **argv"
+          or "ACE_TCHAR *[]" instead of "ACE_TCHAR **"
+
+        * apps/JAWS3/bench/average.cpp:
+        * netsvcs/clients/Tokens/invariant/invariant.cpp:
+
+          Use ACE_TMAIN instead of main as the program entry point to comply
+          with ACE/TAO/CIAO coding standards.
+
 Mon Mar  3 08:58:18 UTC 2008  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * include/makeinclude/platform_openvms.GNU:
diff --git a/ACE/apps/JAWS/clients/WebSTONE/src/cgi-send.c b/ACE/apps/JAWS/clients/WebSTONE/src/cgi-send.c
index 0a63070b7b7..f1474d34c28 100644
--- a/ACE/apps/JAWS/clients/WebSTONE/src/cgi-send.c
+++ b/ACE/apps/JAWS/clients/WebSTONE/src/cgi-send.c
@@ -4,6 +4,8 @@
  *
  */
 
+//FUZZ: disable check_for_improper_main_declaration
+
 #include <stdio.h>
 #include <stdlib.h>
 
diff --git a/ACE/apps/JAWS/clients/WebSTONE/src/genrand.c b/ACE/apps/JAWS/clients/WebSTONE/src/genrand.c
index 58291d5063b..4c2c9598fd0 100644
--- a/ACE/apps/JAWS/clients/WebSTONE/src/genrand.c
+++ b/ACE/apps/JAWS/clients/WebSTONE/src/genrand.c
@@ -11,6 +11,8 @@
  **************************************************************************/
 
 /* FUZZ: disable check_for_math_include */
+/* FUZZ: disable check_for_improper_main_declaration */
+
 #include <stdio.h>
 #include <fcntl.h>
 #include <math.h>
diff --git a/ACE/apps/JAWS/clients/WebSTONE/src/webmaster.c b/ACE/apps/JAWS/clients/WebSTONE/src/webmaster.c
index 57464bc3018..1bfbcc06b9d 100644
--- a/ACE/apps/JAWS/clients/WebSTONE/src/webmaster.c
+++ b/ACE/apps/JAWS/clients/WebSTONE/src/webmaster.c
@@ -11,6 +11,8 @@
  **************************************************************************/
 
 /* FUZZ: disable check_for_math_include */
+/* FUZZ: disable check_for_improper_main_declaration */
+
 #include <stdio.h>
 #include <errno.h>
 #include <signal.h>
diff --git a/ACE/apps/JAWS3/bench/average.cpp b/ACE/apps/JAWS3/bench/average.cpp
index 965a1c94268..568f183dbb3 100644
--- a/ACE/apps/JAWS3/bench/average.cpp
+++ b/ACE/apps/JAWS3/bench/average.cpp
@@ -2,7 +2,7 @@
 #include "ace/OS.h"
 
 int
-main (void)
+ACE_TMAIN(int, ACE_TCHAR *[])
 {
   double sum = 0;
   double count = 0;
diff --git a/ACE/contrib/utility/Example/CommandLine/Foo/command.cpp b/ACE/contrib/utility/Example/CommandLine/Foo/command.cpp
index 50b78a15350..db829909f37 100644
--- a/ACE/contrib/utility/Example/CommandLine/Foo/command.cpp
+++ b/ACE/contrib/utility/Example/CommandLine/Foo/command.cpp
@@ -1,3 +1,5 @@
+/* FUZZ: disable check_for_improper_main_declaration */
+
 #include <string>
 #include <iostream>
 
diff --git a/ACE/contrib/utility/Example/ExH/BadCast/bad_cast.cpp b/ACE/contrib/utility/Example/ExH/BadCast/bad_cast.cpp
index 169ddaebf38..699add03047 100644
--- a/ACE/contrib/utility/Example/ExH/BadCast/bad_cast.cpp
+++ b/ACE/contrib/utility/Example/ExH/BadCast/bad_cast.cpp
@@ -3,6 +3,8 @@
 // copyright : Copyright (c) 2002-2003 Boris Kolpackov
 // license   : http://kolpackov.net/license.html
 
+/* FUZZ: disable check_for_improper_main_declaration */
+
 #include "Utility/ExH/System/Exception.hpp"
 
 #include <iostream>
diff --git a/ACE/contrib/utility/Example/ExH/Compound/compound.cpp b/ACE/contrib/utility/Example/ExH/Compound/compound.cpp
index 8b68b8d25ea..e9f585ce6d3 100644
--- a/ACE/contrib/utility/Example/ExH/Compound/compound.cpp
+++ b/ACE/contrib/utility/Example/ExH/Compound/compound.cpp
@@ -3,6 +3,8 @@
 // copyright : Copyright (c) 2002-2003 Boris Kolpackov
 // license   : http://kolpackov.net/license.html
 
+/* FUZZ: disable check_for_improper_main_declaration */
+
 #include "Utility/ExH/Compound.hpp"
 #include "Utility/ExH/System/Exception.hpp"
 #include "Utility/ExH/Logic/DescriptiveException.hpp"
diff --git a/ACE/contrib/utility/Example/ExH/HelloWorld/hello_world.cpp b/ACE/contrib/utility/Example/ExH/HelloWorld/hello_world.cpp
index cdbe41d915a..9499bf09fe1 100644
--- a/ACE/contrib/utility/Example/ExH/HelloWorld/hello_world.cpp
+++ b/ACE/contrib/utility/Example/ExH/HelloWorld/hello_world.cpp
@@ -3,6 +3,8 @@
 // copyright : Copyright (c) 2002-2003 Boris Kolpackov
 // license   : http://kolpackov.net/license.html
 
+/* FUZZ: disable check_for_improper_main_declaration */
+
 #include <cstdlib> // for std::abort ()
 
 #include <string>
diff --git a/ACE/contrib/utility/Example/ExH/LogicToSystem/logic_to_system.cpp b/ACE/contrib/utility/Example/ExH/LogicToSystem/logic_to_system.cpp
index 446da7f18d4..6f718e9c694 100644
--- a/ACE/contrib/utility/Example/ExH/LogicToSystem/logic_to_system.cpp
+++ b/ACE/contrib/utility/Example/ExH/LogicToSystem/logic_to_system.cpp
@@ -3,6 +3,8 @@
 // copyright : Copyright (c) 2002-2003 Boris Kolpackov
 // license   : http://kolpackov.net/license.html
 
+/* FUZZ: disable check_for_improper_main_declaration */
+
 #include "Utility/ExH/System/Exception.hpp"
 #include "Utility/ExH/Logic/Exception.hpp"
 
diff --git a/ACE/contrib/utility/Example/Hetero/Container/container.cpp b/ACE/contrib/utility/Example/Hetero/Container/container.cpp
index f6ba5560dda..30bc05fc1b9 100644
--- a/ACE/contrib/utility/Example/Hetero/Container/container.cpp
+++ b/ACE/contrib/utility/Example/Hetero/Container/container.cpp
@@ -3,6 +3,8 @@
 // copyright : Copyright (c) 2002-2003 Boris Kolpackov
 // license   : http://kolpackov.net/license.html
 
+/* FUZZ: disable check_for_improper_main_declaration */
+
 #include "Utility/Hetero/Container.hpp"
 #include "Utility/Hetero/TypedContainer.hpp"
 #include "Utility/Hetero/Vector.hpp"
diff --git a/ACE/contrib/utility/Example/Introspection/InheritanceTree/inheritance_tree.cpp b/ACE/contrib/utility/Example/Introspection/InheritanceTree/inheritance_tree.cpp
index 97c4c68dda6..61f68ab6aa5 100644
--- a/ACE/contrib/utility/Example/Introspection/InheritanceTree/inheritance_tree.cpp
+++ b/ACE/contrib/utility/Example/Introspection/InheritanceTree/inheritance_tree.cpp
@@ -6,7 +6,8 @@
 // Note: This example is by no means complete. In fact properly printing
 // arbitrary C++ inheritance tree is a non-trivial task. If you would like
 // to improve this example please feel free to send your results back ;-).
-//
+
+/* FUZZ: disable check_for_improper_main_declaration */
 
 #include "Hierarchy.hpp"
 
diff --git a/ACE/contrib/utility/Example/Introspection/Traversal/driver.cpp b/ACE/contrib/utility/Example/Introspection/Traversal/driver.cpp
index 35891ef58cc..30e1a4a3ab7 100644
--- a/ACE/contrib/utility/Example/Introspection/Traversal/driver.cpp
+++ b/ACE/contrib/utility/Example/Introspection/Traversal/driver.cpp
@@ -3,6 +3,8 @@
 // copyright : Copyright (c) 2002-2003 Boris Kolpackov
 // license   : http://kolpackov.net/license.html
 
+/* FUZZ: disable check_for_improper_main_declaration */
+
 #include <iostream>
 
 #include "SyntaxTree.hpp"
diff --git a/ACE/contrib/utility/Test/ExH/Converter/converter.cpp b/ACE/contrib/utility/Test/ExH/Converter/converter.cpp
index 00c65a04a3f..5e2fdc20db6 100644
--- a/ACE/contrib/utility/Test/ExH/Converter/converter.cpp
+++ b/ACE/contrib/utility/Test/ExH/Converter/converter.cpp
@@ -3,6 +3,8 @@
 // copyright : Copyright (c) 2002-2003 Boris Kolpackov
 // license   : http://kolpackov.net/license.html
 
+/* FUZZ: disable check_for_improper_main_declaration */
+
 #include "Utility/ExH/Converter.hpp"
 #include "Utility/ExH/StringStreamConverter.hpp"
 
diff --git a/ACE/contrib/utility/Test/ExH/Inline/inline.cpp b/ACE/contrib/utility/Test/ExH/Inline/inline.cpp
index 7700728932f..10ca764a34f 100644
--- a/ACE/contrib/utility/Test/ExH/Inline/inline.cpp
+++ b/ACE/contrib/utility/Test/ExH/Inline/inline.cpp
@@ -6,7 +6,8 @@
 //
 // This is a link-time test to detect any problems with inline functions
 // (notably missing inline specifier).
-//
+
+/* FUZZ: disable check_for_improper_main_declaration */
 
 #include "Utility/ExH/ExH.hpp"
 
diff --git a/ACE/contrib/utility/Test/ExH/Logic/DescriptiveException/descriptive_exception.cpp b/ACE/contrib/utility/Test/ExH/Logic/DescriptiveException/descriptive_exception.cpp
index f225c0c0b4e..c8ed217b824 100644
--- a/ACE/contrib/utility/Test/ExH/Logic/DescriptiveException/descriptive_exception.cpp
+++ b/ACE/contrib/utility/Test/ExH/Logic/DescriptiveException/descriptive_exception.cpp
@@ -3,6 +3,8 @@
 // copyright : Copyright (c) 2002-2003 Boris Kolpackov
 // license   : http://kolpackov.net/license.html
 
+/* FUZZ: disable check_for_improper_main_declaration */
+
 #include "Utility/ExH/Logic/DescriptiveException.hpp"
 
 #include <string>
diff --git a/ACE/contrib/utility/Test/ExH/System/DescriptiveException/descriptive_exception.cpp b/ACE/contrib/utility/Test/ExH/System/DescriptiveException/descriptive_exception.cpp
index 7eb39f431f5..5ae1c86803e 100644
--- a/ACE/contrib/utility/Test/ExH/System/DescriptiveException/descriptive_exception.cpp
+++ b/ACE/contrib/utility/Test/ExH/System/DescriptiveException/descriptive_exception.cpp
@@ -3,6 +3,8 @@
 // copyright : Copyright (c) 2002-2003 Boris Kolpackov
 // license   : http://kolpackov.net/license.html
 
+/* FUZZ: disable check_for_improper_main_declaration */
+
 #include "Utility/ExH/System/DescriptiveException.hpp"
 
 #include <string>
diff --git a/ACE/contrib/utility/Test/Introspection/Inline/inline.cpp b/ACE/contrib/utility/Test/Introspection/Inline/inline.cpp
index 99ff8ff590f..9d2b4828f17 100644
--- a/ACE/contrib/utility/Test/Introspection/Inline/inline.cpp
+++ b/ACE/contrib/utility/Test/Introspection/Inline/inline.cpp
@@ -8,6 +8,8 @@
 // (notably missing inline specifier).
 //
 
+/* FUZZ: disable check_for_improper_main_declaration */
+
 #include "Utility/Introspection/Introspection.hpp"
 
 int
diff --git a/ACE/contrib/utility/Test/Synch/Inline/inline.cpp b/ACE/contrib/utility/Test/Synch/Inline/inline.cpp
index 0b2db8a7d57..a70dd06d739 100644
--- a/ACE/contrib/utility/Test/Synch/Inline/inline.cpp
+++ b/ACE/contrib/utility/Test/Synch/Inline/inline.cpp
@@ -8,6 +8,8 @@
 // (notably missing inline specifier).
 //
 
+/* FUZZ: disable check_for_improper_main_declaration */
+
 #include "Utility/Synch/Policy/Null.hpp"
 
 int
diff --git a/ACE/etc/xlc_dummy.cpp b/ACE/etc/xlc_dummy.cpp
index 6a89bb5becf..400547dd463 100644
--- a/ACE/etc/xlc_dummy.cpp
+++ b/ACE/etc/xlc_dummy.cpp
@@ -3,4 +3,6 @@
 // This file exists only to help with template instantiation when building
 // shared libraries on AIX using C Set++.  See rules.lib.GNU for usage.
 
+/* FUZZ: disable check_for_improper_main_declaration */
+
 main() {}
diff --git a/ACE/examples/Reactor/Proactor/test_aiocb.cpp b/ACE/examples/Reactor/Proactor/test_aiocb.cpp
index 52eeb6524b9..36a1d51062b 100644
--- a/ACE/examples/Reactor/Proactor/test_aiocb.cpp
+++ b/ACE/examples/Reactor/Proactor/test_aiocb.cpp
@@ -22,6 +22,7 @@
 // ============================================================================
 
 //FUZZ: disable check_for_lack_ACE_OS
+//FUZZ: disable check_for_improper_main_declaration
 
 #include <unistd.h>
 #include <fcntl.h>
diff --git a/ACE/examples/Reactor/Proactor/test_aiosig.cpp b/ACE/examples/Reactor/Proactor/test_aiosig.cpp
index 0e1d1bc4cc4..5fc1737fae7 100644
--- a/ACE/examples/Reactor/Proactor/test_aiosig.cpp
+++ b/ACE/examples/Reactor/Proactor/test_aiosig.cpp
@@ -21,6 +21,7 @@
 // =====================================================================
 
 //FUZZ: disable check_for_lack_ACE_OS
+//FUZZ: disable check_for_improper_main_declaration
 
 #include <unistd.h>
 #include <fcntl.h>
diff --git a/ACE/examples/Reactor/WFMO_Reactor/Multithreading.cpp b/ACE/examples/Reactor/WFMO_Reactor/Multithreading.cpp
index 6ada1e55780..911c3ee9c2e 100644
--- a/ACE/examples/Reactor/WFMO_Reactor/Multithreading.cpp
+++ b/ACE/examples/Reactor/WFMO_Reactor/Multithreading.cpp
@@ -257,7 +257,7 @@ ACE_TMAIN (int argc, ACE_TCHAR **argv)
 }
 #else /* !ACE_WIN32 */
 int
-ACE_TMAIN (int, ACE_TCHAR **)
+ACE_TMAIN (int, ACE_TCHAR *[])
 {
   return 0;
 }
diff --git a/ACE/examples/Reactor/WFMO_Reactor/Registration.cpp b/ACE/examples/Reactor/WFMO_Reactor/Registration.cpp
index ea49e52fb48..5d9bcc2b27b 100644
--- a/ACE/examples/Reactor/WFMO_Reactor/Registration.cpp
+++ b/ACE/examples/Reactor/WFMO_Reactor/Registration.cpp
@@ -163,7 +163,7 @@ ACE_TMAIN (int, ACE_TCHAR *[])
 };
 #else /* !ACE_WIN32 */
 int
-ACE_TMAIN (int, ACE_TCHAR **)
+ACE_TMAIN (int, ACE_TCHAR *[])
 {
   return 0;
 }
diff --git a/ACE/examples/Reactor/WFMO_Reactor/Registry_Changes.cpp b/ACE/examples/Reactor/WFMO_Reactor/Registry_Changes.cpp
index 9f773cfd247..bcbdfff242d 100644
--- a/ACE/examples/Reactor/WFMO_Reactor/Registry_Changes.cpp
+++ b/ACE/examples/Reactor/WFMO_Reactor/Registry_Changes.cpp
@@ -139,7 +139,7 @@ ACE_TMAIN (int, ACE_TCHAR *[])
 }
 #else /* !ACE_WIN32 */
 int
-ACE_TMAIN (int, ACE_TCHAR **)
+ACE_TMAIN (int, ACE_TCHAR *[])
 {
   return 0;
 }
diff --git a/ACE/examples/Threads/task_three.cpp b/ACE/examples/Threads/task_three.cpp
index ec7bc3ad7c3..51bc95d3346 100644
--- a/ACE/examples/Threads/task_three.cpp
+++ b/ACE/examples/Threads/task_three.cpp
@@ -180,7 +180,7 @@ handler (int)
 }
 
 int
-ACE_TMAIN (int argc, ACE_TCHAR **)
+ACE_TMAIN (int argc, ACE_TCHAR *[])
 {
   if (argc > 1)
     {
diff --git a/ACE/netsvcs/clients/Tokens/invariant/invariant.cpp b/ACE/netsvcs/clients/Tokens/invariant/invariant.cpp
index c66b0d14a28..d9821bbc27d 100644
--- a/ACE/netsvcs/clients/Tokens/invariant/invariant.cpp
+++ b/ACE/netsvcs/clients/Tokens/invariant/invariant.cpp
@@ -157,7 +157,7 @@ run_final_test (void)
 }
 
 int
-main (int /* argc */, char* /* argv */ [])
+ACE_TMAIN(int, ACE_TCHAR *[])
 {
   ACE_Thread_Manager mgr;