Thu Jul 12 23:21:29 UTC 2007 Abdullah Sowayan <abdullah.sowayan@lmco.com>

33 files changed, 275 insertions, 213 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 7ca562ba7d4..549d771de76 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,42 @@
+Thu Jul 12 23:21:29 UTC 2007  Abdullah Sowayan  <abdullah.sowayan@lmco.com>
+
+        * orbsvcs/FTRT_Event_Service/Event_Service/FT_EventService.cpp:
+        * orbsvcs/FTRT_Event_Service/Factory_Service/EventChannelFactory_i.cpp:
+        * orbsvcs/ImplRepo_Service/ImR_Activator_i.cpp:
+        * orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp:
+        * orbsvcs/Notify_Service/Notify_Service.cpp:
+        * orbsvcs/PSS/PSDL_Interpreter.cpp:
+        * orbsvcs/PSS/PSDL_Node.cpp:
+        * orbsvcs/PSS/PSDL_l.cpp:
+        * orbsvcs/PSS/PSDL_y.cpp:
+        * orbsvcs/Scheduling_Service/Scheduling_Service.cpp:
+        * orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Loader.cpp:
+        * orbsvcs/orbsvcs/FtRtEvent/EventChannel/ConnectionHandler_T.cpp:
+        * orbsvcs/orbsvcs/FtRtEvent/EventChannel/Dynamic_Bitset.cpp:
+        * orbsvcs/orbsvcs/FtRtEvent/EventChannel/Identification_Service.cpp:
+        * orbsvcs/orbsvcs/FtRtEvent/EventChannel/SCTP_Fault_Detector.cpp:
+        * orbsvcs/orbsvcs/FtRtEvent/EventChannel/Set_Update_Interceptor.cpp:
+        * orbsvcs/orbsvcs/FtRtEvent/EventChannel/UpdateableHandler.cpp:
+        * orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.cpp:
+        * orbsvcs/orbsvcs/FtRtEvent/Utils/UUID.inl:
+        * orbsvcs/orbsvcs/FtRtEvent/Utils/UUID.cpp:
+        * orbsvcs/orbsvcs/HTIOP/HTIOP_Factory.cpp:
+        * orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Load_Average_Monitor.cpp:
+        * orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Utilization_Monitor.cpp:
+        * orbsvcs/orbsvcs/Naming/Flat_File_Persistence.cpp:
+        * orbsvcs/orbsvcs/Naming/Naming_Context_Interface.cpp:
+        * orbsvcs/orbsvcs/Notify/Name_Value_Pair.cpp:
+        * orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.cpp:
+        * orbsvcs/orbsvcs/Sched/DynSched.cpp:
+        * orbsvcs/orbsvcs/Scheduler_Factory.cpp:
+        * orbsvcs/orbsvcs/Trader/Constraint_l.cpp:
+        * orbsvcs/orbsvcs/Trader/Constraint_y.cpp:
+        * orbsvcs/orbsvcs/Trader/Interpreter.cpp:
+
+          Fixed ACE_OS fuzz warnings. Use ACE_OS calls instead of raw OS function
+          where possible. If fuzz detected a false-positive, then disable
+          the ACE_OS fuzz check for that section of the code.
+
 Thu Jul 12 18:33:31 UTC 2007  Phil Mesnier  <mesnier_p@ociweb.com>
 
         * tao/Strategies/DIOP_Profile.cpp (parse_string_i):
diff --git a/TAO/orbsvcs/FTRT_Event_Service/Event_Service/FT_EventService.cpp b/TAO/orbsvcs/FTRT_Event_Service/Event_Service/FT_EventService.cpp
index 6648a74bba9..c4c3884b4b6 100644
--- a/TAO/orbsvcs/FTRT_Event_Service/Event_Service/FT_EventService.cpp
+++ b/TAO/orbsvcs/FTRT_Event_Service/Event_Service/FT_EventService.cpp
@@ -258,7 +258,7 @@ FT_EventService::report_factory(CORBA::ORB_ptr orb,
       ACE_DEBUG((LM_DEBUG,"Factory connected\n"));
       CORBA::String_var my_ior_string = orb->object_to_string(ec);
 
-      int len = strlen(my_ior_string.in()) ;
+      int len = ACE_OS::strlen(my_ior_string.in()) ;
 
       if (stream.send_n(my_ior_string.in(), len) != len)
         ACE_ERROR_RETURN((LM_ERROR, "(%P|%t) IOR Transmission Error\n"), -1);
diff --git a/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/EventChannelFactory_i.cpp b/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/EventChannelFactory_i.cpp
index 6bb082d39e9..f5b23e34005 100644
--- a/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/EventChannelFactory_i.cpp
+++ b/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/EventChannelFactory_i.cpp
@@ -33,7 +33,7 @@ CORBA::Object_ptr EventChannelFactory_i::create_object (
 
   try{
 
-    file = fopen(conf_file, "r");
+    file = ACE_OS::fopen(conf_file, "r");
     if (file == 0)
       throw PortableGroup::NoFactory();
 
@@ -42,13 +42,13 @@ CORBA::Object_ptr EventChannelFactory_i::create_object (
     while ((id_str = read_buf.read(' ')) != 0 &&
       (prog = read_buf.read('\n')) != 0) {
         id_str[strlen(id_str)-1] = '\0';
-        if (strcmp(id_str, type_id) == 0) {
+        if (ACE_OS::strcmp(id_str, type_id) == 0) {
           return create_process(prog, the_criteria, factory_creation_id);
       }
     }
   }
   catch (...){
-    if (file) fclose(file);
+    if (file) ACE_OS::fclose(file);
     if (id_str) ACE_Allocator::instance()->free(id_str);
     if (prog) ACE_Allocator::instance()->free(prog);
     throw;
@@ -166,13 +166,13 @@ CORBA::Object_ptr EventChannelFactory_i::create_process (
     byteRead += n;
   }
 
-  if (strlen(ior)  ==0)
+  if (ACE_OS::strlen(ior) == 0)
     return result;
 
   try{
     CORBA::Object_var result  = orb->string_to_object(ior);
 
-    if (objects.bind(id, result) ==0){
+    if (objects.bind(id, result) == 0){
       return result._retn();
     }
   }
diff --git a/TAO/orbsvcs/ImplRepo_Service/ImR_Activator_i.cpp b/TAO/orbsvcs/ImplRepo_Service/ImR_Activator_i.cpp
index c0e7d14433d..1e88a9bd689 100644
--- a/TAO/orbsvcs/ImplRepo_Service/ImR_Activator_i.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/ImR_Activator_i.cpp
@@ -259,7 +259,7 @@ ImR_Activator_i::run (void)
 void
 ImR_Activator_i::shutdown (void)
 {
-  shutdown (false);
+  this->shutdown (false);
 }
 
 void
diff --git a/TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp b/TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp
index bdcf22ed097..858a1658ca0 100644
--- a/TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp
@@ -263,7 +263,7 @@ ImR_Locator_i::shutdown (CORBA::Boolean activators, CORBA::Boolean servers)
     }
   // Technically, we should wait for all the activators to unregister, but
   // ,for now at least, it doesn't seem worth it.
-  shutdown (false);
+  this->shutdown (false);
 }
 
 void
diff --git a/TAO/orbsvcs/Notify_Service/Notify_Service.cpp b/TAO/orbsvcs/Notify_Service/Notify_Service.cpp
index 412664a3d8e..15844882be8 100644
--- a/TAO/orbsvcs/Notify_Service/Notify_Service.cpp
+++ b/TAO/orbsvcs/Notify_Service/Notify_Service.cpp
@@ -32,7 +32,7 @@ TAO_Notify_Service_Driver::TAO_Notify_Service_Driver (void)
 TAO_Notify_Service_Driver::~TAO_Notify_Service_Driver (void)
 {
   if (ior_output_file_)
-    fclose(ior_output_file_);
+    ACE_OS::fclose(ior_output_file_);
 }
 
 int
diff --git a/TAO/orbsvcs/PSS/PSDL_Interpreter.cpp b/TAO/orbsvcs/PSS/PSDL_Interpreter.cpp
index 0ee126084bc..c3bf8d7a1c0 100644
--- a/TAO/orbsvcs/PSS/PSDL_Interpreter.cpp
+++ b/TAO/orbsvcs/PSS/PSDL_Interpreter.cpp
@@ -88,9 +88,9 @@ TAO_Lex_String_Input::copy_into (char* buf,
 
   if (n > 0)
     {
-      ACE_OS:: memcpy (buf,
-                       TAO_Lex_String_Input::current_,
-                       n);
+      ACE_OS::memcpy (buf,
+                      TAO_Lex_String_Input::current_,
+                      n);
       TAO_Lex_String_Input::current_ += n;
     }
 
diff --git a/TAO/orbsvcs/PSS/PSDL_Node.cpp b/TAO/orbsvcs/PSS/PSDL_Node.cpp
index 0b5a1e5ff49..806058b561b 100644
--- a/TAO/orbsvcs/PSS/PSDL_Node.cpp
+++ b/TAO/orbsvcs/PSS/PSDL_Node.cpp
@@ -943,7 +943,7 @@ TAO_PSDL_Local_Op_Dcl::raises_expr (void) const
 
 /// = The Node methods.
 int
-TAO_PSDL_Local_Op_Dcl:: accept (TAO_PSDL_Node_Visitor *visitor)
+TAO_PSDL_Local_Op_Dcl::accept (TAO_PSDL_Node_Visitor *visitor)
 {
   return visitor->visit_local_op_dcl (this);
 }
diff --git a/TAO/orbsvcs/PSS/PSDL_l.cpp b/TAO/orbsvcs/PSS/PSDL_l.cpp
index 965c5e6a57c..03347aff067 100644
--- a/TAO/orbsvcs/PSS/PSDL_l.cpp
+++ b/TAO/orbsvcs/PSS/PSDL_l.cpp
@@ -169,61 +169,61 @@ typedef unsigned int yy_size_t;
 
 
 struct yy_buffer_state
-	{
-	FILE *yy_input_file;
-
-	char *yy_ch_buf;		/* input buffer */
-	char *yy_buf_pos;		/* current position in input buffer */
-
-	/* Size of input buffer in bytes, not including room for EOB
-	 * characters.
-	 */
-	yy_size_t yy_buf_size;
-
-	/* Number of characters read into yy_ch_buf, not including EOB
-	 * characters.
-	 */
-	int yy_n_chars;
-
-	/* Whether we "own" the buffer - i.e., we know we created it,
-	 * and can realloc() it to grow it, and should free() it to
-	 * delete it.
-	 */
-	int yy_is_our_buffer;
-
-	/* Whether this is an "interactive" input source; if so, and
-	 * if we're using stdio for input, then we want to use getc()
-	 * instead of fread(), to make sure we stop fetching input after
-	 * each newline.
-	 */
-	int yy_is_interactive;
-
-	/* Whether we're considered to be at the beginning of a line.
-	 * If so, '^' rules will be active on the next match, otherwise
-	 * not.
-	 */
-	int yy_at_bol;
-
-	/* Whether to try to fill the input buffer when we reach the
-	 * end of it.
-	 */
-	int yy_fill_buffer;
-
-	int yy_buffer_status;
+{
+  FILE *yy_input_file;
+
+  char *yy_ch_buf;		/* input buffer */
+  char *yy_buf_pos;		/* current position in input buffer */
+
+  /* Size of input buffer in bytes, not including room for EOB
+   * characters.
+   */
+  yy_size_t yy_buf_size;
+
+  /* Number of characters read into yy_ch_buf, not including EOB
+   * characters.
+   */
+  int yy_n_chars;
+
+  /* Whether we "own" the buffer - i.e., we know we created it,
+   * and can realloc() it to grow it, and should free() it to
+   * delete it.
+   */
+  int yy_is_our_buffer;
+
+  /* Whether this is an "interactive" input source; if so, and
+   * if we're using stdio for input, then we want to use getc()
+   * instead of fread(), to make sure we stop fetching input after
+   * each newline.
+   */
+  int yy_is_interactive;
+
+  /* Whether we're considered to be at the beginning of a line.
+   * If so, '^' rules will be active on the next match, otherwise
+   * not.
+   */
+  int yy_at_bol;
+
+  /* Whether to try to fill the input buffer when we reach the
+   * end of it.
+   */
+  int yy_fill_buffer;
+
+  int yy_buffer_status;
 #define YY_BUFFER_NEW 0
 #define YY_BUFFER_NORMAL 1
-	/* When an EOF's been seen but there's still some text to process
-	 * then we mark the buffer as YY_EOF_PENDING, to indicate that we
-	 * shouldn't try reading from the input source any more.  We might
-	 * still have a bunch of tokens to match, though, because of
-	 * possible backing-up.
-	 *
-	 * When we actually see the EOF, we change the status to "new"
-	 * (via yyrestart()), so that the user can continue scanning by
-	 * just pointing yyin at a new input file.
-	 */
+  /* When an EOF's been seen but there's still some text to process
+   * then we mark the buffer as YY_EOF_PENDING, to indicate that we
+   * shouldn't try reading from the input source any more.  We might
+   * still have a bunch of tokens to match, though, because of
+   * possible backing-up.
+   *
+   * When we actually see the EOF, we change the status to "new"
+   * (via yyrestart()), so that the user can continue scanning by
+   * just pointing yyin at a new input file.
+   */
 #define YY_BUFFER_EOF_PENDING 2
-	};
+};
 
 static YY_BUFFER_STATE yy_current_buffer = 0;
 
@@ -716,12 +716,14 @@ YY_MALLOC_DECL
 
 /* Copy whatever the last rule matched to the standard output. */
 
+//FUZZ: disable check_for_lack_ACE_OS
 #ifndef TAO_PSDL_ECHO
 /* This used to be an fputs(), but since the string might contain NUL's,
  * we now use fwrite().
  */
 #define TAO_PSDL_ECHO (void) fwrite( yytext, yyleng, 1, yyout )
 #endif
+//FUZZ: enable check_for_lack_ACE_OS
 
 /* Gets input and stuffs it into "buf".  number of characters read, or YY_NULL,
  * is returned in "result".
@@ -732,7 +734,7 @@ YY_MALLOC_DECL
 		{ \
 		int c = '*', n; \
 		for ( n = 0; n < max_size && \
-			     (c = getc( yyin )) != EOF && c != '\n'; ++n ) \
+         (c = ACE_OS:getc( yyin )) != EOF && c != '\n'; ++n ) \
 			buf[n] = (char) c; \
 		if ( c == '\n' ) \
 			buf[n++] = (char) c; \
@@ -743,7 +745,7 @@ YY_MALLOC_DECL
 	else \
 		{ \
 		errno=0; \
-		while ( (result = fread(buf, 1, max_size, yyin))==0 && ferror(yyin)) \
+    while ( (result = ACE_OS::fread(buf, 1, max_size, yyin))==0 && ferror(yyin)) \
 			{ \
 			if( errno != EINTR) \
 				{ \
@@ -751,7 +753,7 @@ YY_MALLOC_DECL
 				break; \
 				} \
 			errno=0; \
-			clearerr(yyin); \
+      ACE_OS::clearerr(yyin); \
 			} \
 		}
 #endif
@@ -1983,7 +1985,7 @@ FILE *file;
 #if YY_NEVER_INTERACTIVE
 	b->yy_is_interactive = 0;
 #else
-	b->yy_is_interactive = file ? (isatty( fileno(file) ) > 0) : 0;
+  b->yy_is_interactive = file ? (ACE_OS::ace_isatty( fileno(file) ) > 0) : 0;
 #endif
 #endif
 	}
@@ -2176,8 +2178,8 @@ static void yy_fatal_error( msg )
 char msg[];
 #endif
 	{
-	(void) fprintf( stderr, "%s\n", msg );
-	exit( YY_EXIT_FAILURE );
+  (void) ACE_OS::fprintf( stderr, "%s\n", msg );
+  ACE_OS::exit( YY_EXIT_FAILURE );
 	}
 
 
@@ -2240,7 +2242,7 @@ static void *yy_flex_alloc( size )
 yy_size_t size;
 #endif
 	{
-	return (void *) malloc( size );
+  return (void *) ACE_OS::malloc( size );
 	}
 
 #ifdef YY_USE_PROTOS
@@ -2258,7 +2260,7 @@ yy_size_t size;
 	 * any pointer type to void*, and deal with argument conversions
 	 * as though doing an assignment.
 	 */
-	return (void *) realloc( (char *) ptr, size );
+   return (void *) ACE_OS::realloc( (char *) ptr, size );
 	}
 
 #ifdef YY_USE_PROTOS
@@ -2268,7 +2270,7 @@ static void yy_flex_free( ptr )
 void *ptr;
 #endif
 	{
-	free( ptr );
+  ACE_OS::free( ptr );
 	}
 
 #if YY_MAIN
diff --git a/TAO/orbsvcs/PSS/PSDL_y.cpp b/TAO/orbsvcs/PSS/PSDL_y.cpp
index 35f7f3f1b6b..762daee8a93 100644
--- a/TAO/orbsvcs/PSS/PSDL_y.cpp
+++ b/TAO/orbsvcs/PSS/PSDL_y.cpp
@@ -134,7 +134,7 @@ extern int yylex (void);
 
 static void yyerror (const char *error)
 {
-  printf ("Error %s\n", error);
+  ACE_OS::printf ("Error %s\n", error);
 }
 
 #ifndef YYSTYPE
diff --git a/TAO/orbsvcs/Scheduling_Service/Scheduling_Service.cpp b/TAO/orbsvcs/Scheduling_Service/Scheduling_Service.cpp
index 8e9c433e38b..b893eb0dd7c 100644
--- a/TAO/orbsvcs/Scheduling_Service/Scheduling_Service.cpp
+++ b/TAO/orbsvcs/Scheduling_Service/Scheduling_Service.cpp
@@ -121,7 +121,7 @@ TAO_Scheduling_Service::init (int argc, ACE_TCHAR* argv[])
 
       if (this->ior_file_name_.rep() != 0)
         {
-          FILE *iorf = fopen (this->ior_file_name_.rep(), "w");
+          FILE *iorf = ACE_OS::fopen (this->ior_file_name_.rep(), "w");
           if (iorf != 0)
             {
               ACE_OS::fprintf (iorf,
@@ -133,7 +133,7 @@ TAO_Scheduling_Service::init (int argc, ACE_TCHAR* argv[])
 
       if (this->pid_file_name_.rep() != 0)
         {
-          FILE *pidf = fopen (this->pid_file_name_.rep(), "w");
+          FILE *pidf = ACE_OS::fopen (this->pid_file_name_.rep(), "w");
           if (pidf != 0)
             {
               ACE_OS::fprintf (pidf,
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Loader.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Loader.cpp
index 5dd426e4846..649f6dff9ea 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Loader.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Loader.cpp
@@ -47,7 +47,7 @@ namespace TAO_FTRT {
       {
         curarg++;
         if (curarg < argc)
-          transaction_depth = atoi(argv[curarg]);
+          transaction_depth = ACE_OS::atoi(argv[curarg]);
       }
 
 
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ConnectionHandler_T.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ConnectionHandler_T.cpp
index a14d2c327eb..88fb48cab74 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ConnectionHandler_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ConnectionHandler_T.cpp
@@ -80,7 +80,7 @@ int ConnectionDetectHandler<ACE_PEER_STREAM_2>::handle_close (ACE_HANDLE,
                                                         ACE_Reactor_Mask)
 {
   ACE_TRACE("ConnectionDetectHandler::handle_close\n");
-  close();
+  this->close();
   return 0;
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Dynamic_Bitset.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Dynamic_Bitset.cpp
index 264de9de473..3278a9ce899 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Dynamic_Bitset.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Dynamic_Bitset.cpp
@@ -8,19 +8,23 @@
 #include "orbsvcs/FtRtEvent/EventChannel/Dynamic_Bitset.inl"
 #endif /* __ACE_INLINE__ */
 
+//FUZZ: disable check_for_lack_ACE_OS/
 inline unsigned ceil(unsigned numerator, unsigned denominator)
 {
   return numerator/denominator+ (numerator%denominator ? 1 : 0);
 }
+//FUZZ: enable check_for_lack_ACE_OS/
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
+//FUZZ: disable check_for_lack_ACE_OS/
 Dynamic_Bitset::Dynamic_Bitset(Dynamic_Bitset::size_type size)
   : buffer_size_(ceil(size,BITS_PER_BLOCK))
   , bit_size_(size)
   , buffer_(new block[buffer_size_])
 {
-  memset(buffer_, 0, buffer_size_*BYTES_PER_BLOCK);
+//FUZZ: enable check_for_lack_ACE_OS/
+  ACE_OS::memset(buffer_, 0, buffer_size_*BYTES_PER_BLOCK);
 }
 
 
@@ -40,7 +44,11 @@ Dynamic_Bitset& Dynamic_Bitset::operator = (const Dynamic_Bitset& other)
 Dynamic_Bitset& Dynamic_Bitset::operator &=(const Dynamic_Bitset& other)
 {
   assert(other.bit_size_ == this->bit_size_);
+
+  //FUZZ: disable check_for_lack_ACE_OS/
   size_type len = ceil(bit_size_,BITS_PER_BLOCK);
+  //FUZZ: enable check_for_lack_ACE_OS/
+
   for (size_type i = 0; i < len; ++i)
     buffer_[i] &= other.buffer_[i];
   return *this;
@@ -66,7 +74,10 @@ void Dynamic_Bitset::set(Dynamic_Bitset::size_type bit, bool val)
 
 void Dynamic_Bitset::flip()
 {
+  //FUZZ: disable check_for_lack_ACE_OS/
   size_type len = ceil(bit_size_,BITS_PER_BLOCK);
+  //FUZZ: enable check_for_lack_ACE_OS/
+
   block mask = static_cast<block> (-1);
   for (size_type i = 0; i < len; ++i)
     buffer_[i] ^= mask;
@@ -74,10 +85,13 @@ void Dynamic_Bitset::flip()
 
 void Dynamic_Bitset::resize(Dynamic_Bitset::size_type num_bits, bool value)
 {
+  //FUZZ: disable check_for_lack_ACE_OS/
   size_type len = ceil(num_bits, BITS_PER_BLOCK);
+  //FUZZ: enable check_for_lack_ACE_OS/
+
   if (len > this->buffer_size_) {
     Dynamic_Bitset tmp(num_bits);
-    memcpy(tmp.buffer_, this->buffer_, this->buffer_size_*BYTES_PER_BLOCK);
+    ACE_OS::memcpy(tmp.buffer_, this->buffer_, this->buffer_size_*BYTES_PER_BLOCK);
     block mask = static_cast<block> (-1);
 
     size_type block_pos = this->bit_size_/BITS_PER_BLOCK;
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Identification_Service.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Identification_Service.cpp
index 7b356e36f4d..4dc2d3e3ff5 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Identification_Service.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Identification_Service.cpp
@@ -64,7 +64,7 @@ namespace FTRTEC {
     if (object_id_.length() == 0) {
       // assign an default value for object id
       object_id_.length(16);
-      memcpy(&object_id_[0], oid, 16);
+      ACE_OS::memcpy(&object_id_[0], oid, 16);
     }
     service = this;
     return 0;
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/SCTP_Fault_Detector.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/SCTP_Fault_Detector.cpp
index 222d5daa3fb..a40edf6b7d6 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/SCTP_Fault_Detector.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/SCTP_Fault_Detector.cpp
@@ -86,7 +86,7 @@ int SCTP_Fault_Detector::parse_conf(int argc, char** argv)
     {
       curarg++;
       if (curarg < argc)
-        connector_.set_heart_beat(atoi(argv[curarg]));
+        connector_.set_heart_beat(ACE_OS::atoi(argv[curarg]));
     }
   return 0;
 }
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Set_Update_Interceptor.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Set_Update_Interceptor.cpp
index f688b10864d..47c242c6d7e 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Set_Update_Interceptor.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Set_Update_Interceptor.cpp
@@ -45,8 +45,9 @@ TAO_Set_Update_Interceptor::send_request (
 {
   CORBA::String_var operation = ri->operation ();
 
-  if (strcmp(operation.in(), "set_update")==0 ||
-    strcmp(operation.in(), "oneway_set_update") ==0) {
+  if (ACE_OS::strcmp(operation.in(), "set_update")==0 ||
+      ACE_OS::strcmp(operation.in(), "oneway_set_update") ==0) 
+    {
       CORBA::Any_var a = Request_Context_Repository().get_ft_request_service_context(ri);
 
       IOP::ServiceContext* sc;
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/UpdateableHandler.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/UpdateableHandler.cpp
index 826664b8a8e..93879192db3 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/UpdateableHandler.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/UpdateableHandler.cpp
@@ -26,8 +26,8 @@ FTRT::AMI_UpdateableHandler_ptr UpdateableHandler::activate(
   PortableServer::ObjectId& object_id)
 {
   object_id.length(sizeof(mgr) + sizeof(id));
-  memcpy(object_id.get_buffer(), &mgr, sizeof(mgr));
-  memcpy(object_id.get_buffer() + sizeof(mgr), &id, sizeof(id));
+  ACE_OS::memcpy(object_id.get_buffer(), &mgr, sizeof(mgr));
+  ACE_OS::memcpy(object_id.get_buffer() + sizeof(mgr), &id, sizeof(id));
   strategy_->poa()->activate_object_with_id(object_id,
                                             this);
   CORBA::Object_var object = strategy_->poa()->id_to_reference(
@@ -50,8 +50,8 @@ void UpdateableHandler::dispatch(UpdateableHandler::Handler handler)
   Update_Manager* mgr;
   int id;
 
-  memcpy(&mgr, object_id->get_buffer(), sizeof(mgr));
-  memcpy(&id, object_id->get_buffer()+sizeof(mgr), sizeof(id));
+  ACE_OS::memcpy(&mgr, object_id->get_buffer(), sizeof(mgr));
+  ACE_OS::memcpy(&id, object_id->get_buffer()+sizeof(mgr), sizeof(id));
 
   ACE_DEBUG((LM_DEBUG, "%d\n", id));
 
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.cpp
index ab7250abb9d..c64a9891525 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.cpp
@@ -247,7 +247,7 @@ void FTEC_Gateway::push(RtecEventChannelAdmin::ProxyPushConsumer_ptr proxy_consu
   PortableServer::ObjectId_var object_id =
     impl_->poa->reference_to_id(proxy_consumer);
   FtRtecEventComm::ObjectId** result;
-  memcpy(&result, &object_id[0], sizeof(FtRtecEventComm::ObjectId**));
+  ACE_OS::memcpy(&result, &object_id[0], sizeof(FtRtecEventComm::ObjectId**));
 
   impl_->ftec->push(**result, data);
 }
@@ -273,7 +273,7 @@ FTEC_Gateway_ConsumerAdmin::obtain_push_supplier (void)
 
   FtRtecEventComm::ObjectId local_oid;
   local_oid.length(sizeof(remote_proxy_oid_ptr));
-  memcpy(&local_oid[0], &remote_proxy_oid_ptr, sizeof(remote_proxy_oid_ptr));
+  ACE_OS::memcpy(&local_oid[0], &remote_proxy_oid_ptr, sizeof(remote_proxy_oid_ptr));
 
   RtecEventChannelAdmin::ProxyPushSupplier_ptr result;
   activate_object_with_id(result, impl_->poa.in(),
@@ -302,7 +302,7 @@ FTEC_Gateway_SupplierAdmin::obtain_push_consumer (void)
 
   FtRtecEventComm::ObjectId local_oid;
   local_oid.length(sizeof(remote_proxy_oid_ptr));
-  memcpy(&local_oid[0], &remote_proxy_oid_ptr, sizeof(remote_proxy_oid_ptr));
+  ACE_OS::memcpy(&local_oid[0], &remote_proxy_oid_ptr, sizeof(remote_proxy_oid_ptr));
 
   RtecEventChannelAdmin::ProxyPushConsumer_ptr result;
   activate_object_with_id(result, impl_->poa.in(),
@@ -323,7 +323,7 @@ get_remote_oid_ptr(CORBA::ORB_ptr orb)
     current->get_object_id();
 
   FtRtecEventComm::ObjectId** result;
-  memcpy(&result, &object_id[0], sizeof(FtRtecEventComm::ObjectId**));
+  ACE_OS::memcpy(&result, &object_id[0], sizeof(FtRtecEventComm::ObjectId**));
   return result;
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/UUID.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/UUID.cpp
index 6a34e95164b..cc29c3345c5 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/UUID.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/UUID.cpp
@@ -161,7 +161,7 @@ UUID::create (unsigned char *buffer)
   buffer[8] = (unsigned char) ((clockSequence >> 8) & 0x1f);
   buffer[9] = (unsigned char) (clockSequence & 0x1f);
 
-  memcpy(buffer + 10, &node, 6);
+  ACE_OS::memcpy(buffer + 10, &node, 6);
 }
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/UUID.inl b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/UUID.inl
index e1238a12ff1..a94affd5dd5 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/UUID.inl
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/UUID.inl
@@ -19,13 +19,13 @@ UUID::UUID(int)
 ACE_INLINE
 UUID::UUID(const unsigned char* id)
 {
-  memcpy(rep_.uuid, id, 16);
+  ACE_OS::memcpy(rep_.uuid, id, 16);
 }
 
 ACE_INLINE
 bool UUID::operator == (const UUID& other) const
 {
-  return memcmp(this->rep_.uuid, other.rep_.uuid, BINRARY_LENGTH) == 0;
+  return ACE_OS::memcmp(this->rep_.uuid, other.rep_.uuid, BINRARY_LENGTH) == 0;
 }
 
 ACE_INLINE
@@ -45,7 +45,7 @@ bool UUID::is_valid() const
 ACE_INLINE
 void UUID::to_binary(unsigned char* binary_rep) const
 {
-  memcpy(binary_rep, rep_.uuid, 16);
+  ACE_OS::memcpy(binary_rep, rep_.uuid, 16);
 }
 
 ACE_INLINE
diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Factory.cpp b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Factory.cpp
index c66494c76a8..820c5c7ad01 100644
--- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Factory.cpp
@@ -78,7 +78,7 @@ TAO::HTIOP::Protocol_Factory::init (int argc,
       else if (ACE_OS::strcasecmp(argv[i], ACE_TEXT("-inside")) == 0)
         {
           if (++i < argc)
-            this->inside_ = ::atoi (ACE_TEXT_ALWAYS_CHAR(argv[i]));
+            this->inside_ = ACE_OS::atoi (ACE_TEXT_ALWAYS_CHAR(argv[i]));
         }
     }
 
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Load_Average_Monitor.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Load_Average_Monitor.cpp
index 94c2b13c87a..3a1934d10bf 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Load_Average_Monitor.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Load_Average_Monitor.cpp
@@ -115,7 +115,7 @@ TAO_LB_CPU_Load_Average_Monitor::loads (void)
   // defined.
 
   // Obtain the load average directly from the `/proc' filesystem.
-  FILE * s = ::fopen ("/proc/loadavg", "r");
+  FILE * s = ACE_OS::fopen ("/proc/loadavg", "r");
 
   if (s == 0)
     throw CORBA::NO_IMPLEMENT (
@@ -126,7 +126,7 @@ TAO_LB_CPU_Load_Average_Monitor::loads (void)
 
   fscanf (s, "%f", &loadavg[0]);
 
-  (void) fclose (s);
+  (void) ACE_OS::fclose (s);
 
   const int samples = 1;
 
@@ -148,7 +148,7 @@ TAO_LB_CPU_Load_Average_Monitor::loads (void)
 
   if (samples == 1)
     {
-      const long num_processors = ::sysconf (_SC_NPROCESSORS_ONLN);
+      const long num_processors = ACE_OS::sysconf (_SC_NPROCESSORS_ONLN);
 
       ACE_ASSERT (num_processors > 0);
 
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Utilization_Monitor.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Utilization_Monitor.cpp
index 6af2f8c23c0..35d2952619c 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Utilization_Monitor.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Utilization_Monitor.cpp
@@ -30,17 +30,17 @@ double calc_cpu_loading (void)
 
   double percent_cpu_load = 0.0;
 
-  if ((file_ptr = fopen("/proc/stat", "r")) == 0)
+  if ((file_ptr = ACE_OS::fopen("/proc/stat", "r")) == 0)
           return percent_cpu_load;
 
-  while ((fgets (buf, sizeof (buf), file_ptr)) != 0)
+  while ((ACE_OS::fgets (buf, sizeof (buf), file_ptr)) != 0)
   {
     item = ACE_OS::strtok (buf, " \t\n");
     arg = ACE_OS::strtok (0, "\n");
 
     if (item == 0 || arg == 0)
             continue;
-    if (item[0] == 'c' && strlen (item) == 3)
+    if (item[0] == 'c' && ACE_OS::strlen (item) == 3)
     {
       sscanf (arg, "%lu %lu %lu %lu", &user, &nice, &sys, &idle);
       break;
@@ -49,7 +49,7 @@ double calc_cpu_loading (void)
 
   }
 
-  fclose (file_ptr);
+  ACE_OS::fclose (file_ptr);
 
   delta_idle = idle - prev_idle;
   double total;
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Flat_File_Persistence.cpp b/TAO/orbsvcs/orbsvcs/Naming/Flat_File_Persistence.cpp
index efaa900e534..598e383a895 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Flat_File_Persistence.cpp
+++ b/TAO/orbsvcs/orbsvcs/Naming/Flat_File_Persistence.cpp
@@ -52,14 +52,14 @@ TAO_NS_FlatFileStream::open()
   // For now, three flags exist "r", "w",  and "c"
   int flags = 0;
   const char *fdmode = 0;
-  if( strchr(mode_.c_str(), 'r') )
-    if( strchr(mode_.c_str(), 'w') )
+  if( ACE_OS::strchr(mode_.c_str(), 'r') )
+    if( ACE_OS::strchr(mode_.c_str(), 'w') )
       flags = O_RDWR, fdmode = "r+";
     else
       flags = O_RDONLY, fdmode = "r";
   else
     flags = O_WRONLY, fdmode = "w";
-  if( strchr(mode_.c_str(), 'c') )
+  if( ACE_OS::strchr(mode_.c_str(), 'c') )
     flags |= O_CREAT;
 #ifndef ACE_WIN32
   if( ACE_OS::flock_init (&filelock_, flags, ACE_TEXT_CHAR_TO_TCHAR(file_.c_str()), 0666) != 0 )
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.cpp b/TAO/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.cpp
index dde7935e404..ec4445b528d 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.cpp
+++ b/TAO/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.cpp
@@ -13,7 +13,7 @@
 #include "orbsvcs/Naming/Naming_Context_Interface.h"
 #include "ace/ACE.h"
 #include "ace/OS_NS_string.h"
-#include "ace/os_include/os_ctype.h"
+#include "ace/OS_NS_ctype.h"
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
@@ -329,7 +329,7 @@ TAO_Naming_Context::to_name (const char *sn)
 int
 TAO_Naming_Context::to_url_is_alnum_or_punctuation (char c)
 {
-  if (isalnum (c))
+  if (ACE_OS::ace_isalnum (c))
     return 1;
 
   // NON US-ASCII charcters excluding those in this array are the
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Name_Value_Pair.cpp b/TAO/orbsvcs/orbsvcs/Notify/Name_Value_Pair.cpp
index 7d1109eb65e..166ec1ed817 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Name_Value_Pair.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Name_Value_Pair.cpp
@@ -12,13 +12,13 @@ namespace
     size_t const len = ACE_OS::strlen (s);
     if (len == 0)
       return 0;
-    if (! isdigit(s[0]))
+    if (! ACE_OS::ace_isdigit(s[0]))
       return 0;
 
     ACE_UINT64 t = 0;
     for (size_t i = 0; i < len; ++i)
     {
-      if (isdigit(s[i]) == 0)
+      if (ACE_OS::ace_isdigit(s[i]) == 0)
       {
         break;
       }
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.cpp
index d571d733fc3..61abb1e0e4e 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.cpp
@@ -7,7 +7,7 @@
 #include "tao/ORB_Core.h"
 #include "tao/debug.h"
 #include "tao/target_specification.h"
-#include "ace/os_include/os_ctype.h"
+#include "ace/OS_NS_ctype.h"
 
 #include "orbsvcs/miopC.h"
 #include "orbsvcs/PortableGroupC.h"
@@ -186,9 +186,9 @@ TAO_UIPMC_Profile::parse_string_i (const char *string)
   // version is one that we accept.
 
   // Check for MIOP version
-  if (isdigit (string [0]) &&
+  if (ACE_OS::ace_isdigit (string [0]) &&
       string[1] == '.' &&
-      isdigit (string [2]) &&
+      ACE_OS::ace_isdigit (string [2]) &&
       string[3] == '@')
     {
       if (string[0] != '1' ||
@@ -213,9 +213,9 @@ TAO_UIPMC_Profile::parse_string_i (const char *string)
   //
 
   // Parse the group component version.
-  if (isdigit (string [0]) &&
+  if (ACE_OS::ace_isdigit (string [0]) &&
       string[1] == '.' &&
-      isdigit (string [2]) &&
+      ACE_OS::ace_isdigit (string [2]) &&
       string[3] == '-')
     {
       CORBA::Char major;
@@ -302,7 +302,7 @@ TAO_UIPMC_Profile::parse_string_i (const char *string)
   const char* str_check;
   for (str_check = string; str_check < pos; str_check++)
     {
-      if (!isdigit (str_check[0]))
+      if (!ACE_OS::ace_isdigit (str_check[0]))
         {
           // Throw an exception if it's not a proper number
           throw CORBA::INV_OBJREF (
@@ -342,7 +342,7 @@ TAO_UIPMC_Profile::parse_string_i (const char *string)
 
       for (str_check = string; str_check < pos; str_check++)
         {
-          if (!isdigit (str_check[0]))
+          if (!ACE_OS::ace_isdigit (str_check[0]))
             {
               // Throw an exception if it's not a proper number
               throw CORBA::INV_OBJREF (
@@ -422,7 +422,7 @@ TAO_UIPMC_Profile::parse_string_i (const char *string)
 
   for (str_check = mcast_addr.c_str (); str_check[0] != '\0'; str_check++)
     {
-      if (!isdigit (str_check[0]) && !isxdigit (str_check[0]) &&
+      if (!ACE_OS::ace_isdigit (str_check[0]) && !ACE_OS::ace_isxdigit (str_check[0]) &&
           str_check[0] != ':' && str_check[0] != '.')
         {
           // Throw an exception if it's not a proper IPv4/IPv6 address
@@ -450,7 +450,7 @@ TAO_UIPMC_Profile::parse_string_i (const char *string)
 
   for (str_check = string; str_check[0] != '\0'; str_check++)
     {
-      if (!isdigit (str_check[0]))
+      if (!ACE_OS::ace_isdigit (str_check[0]))
         {
           // Throw an exception if it's not a proper number
           throw CORBA::INV_OBJREF (
diff --git a/TAO/orbsvcs/orbsvcs/Sched/DynSched.cpp b/TAO/orbsvcs/orbsvcs/Sched/DynSched.cpp
index 16586d1d7f2..c2e336f1a8c 100644
--- a/TAO/orbsvcs/orbsvcs/Sched/DynSched.cpp
+++ b/TAO/orbsvcs/orbsvcs/Sched/DynSched.cpp
@@ -1930,7 +1930,7 @@ ACE_DynScheduler::output_dispatch_priorities (const char *filename)
   if (file)
   {
     status = output_dispatch_priorities (file);
-    fclose (file);
+    ACE_OS::fclose (file);
   }
   else
   {
@@ -2025,7 +2025,7 @@ ACE_DynScheduler::output_dispatch_timeline (const char *filename)
   if (file)
   {
     status = output_dispatch_timeline (file);
-    fclose (file);
+    ACE_OS::fclose (file);
   }
   else
   {
@@ -2041,6 +2041,7 @@ ACE_DynScheduler::output_dispatch_timeline (const char *filename)
 ACE_DynScheduler::status_t
 ACE_DynScheduler::output_dispatch_timeline (FILE *file)
 {
+  //FUZZ: disable check_for_lack_ACE_OS
   if (ACE_OS::fprintf (
       file, "\n\nDISPATCH TIMELINE:\n\n"
             "                dispatch  arrival  deadline     start        stop    execution     latency        laxity\n"
@@ -2052,6 +2053,7 @@ ACE_DynScheduler::output_dispatch_timeline (FILE *file)
                        ACE_TEXT("Could not write to schedule file")),
                       UNABLE_TO_WRITE_SCHEDULE_FILE);
   }
+  //FUZZ: enable check_for_lack_ACE_OS
 
   // iterate through timeline, picking out entries whose prev_ pointer
   // is null (i.e. those representing the start of a dispatch), find end
@@ -2150,7 +2152,7 @@ ACE_DynScheduler::output_preemption_timeline (const char *filename)
   if (file)
   {
     status = output_preemption_timeline (file);
-    fclose (file);
+    ACE_OS::fclose (file);
   }
   else
   {
@@ -2240,7 +2242,7 @@ ACE_DynScheduler::output_viewer_timeline (const char *filename)
   if (file)
   {
     status = output_dispatch_timeline (file);
-    fclose (file);
+    ACE_OS::fclose (file);
   }
 
   return status;
@@ -2249,6 +2251,7 @@ ACE_DynScheduler::output_viewer_timeline (const char *filename)
 ACE_DynScheduler::status_t
 ACE_DynScheduler::output_viewer_timeline (FILE *file)
 {
+  //FUZZ: disable check_for_lack_ACE_OS
   if (ACE_OS::fprintf (
       file, "\n\nVIEWER TIMELINE:\n\n"
             "                                    arrival  deadline   completion    execution  \n"
@@ -2257,6 +2260,7 @@ ACE_DynScheduler::output_viewer_timeline (FILE *file)
   {
     return UNABLE_TO_WRITE_SCHEDULE_FILE;
   }
+  //FUZZ: enable check_for_lack_ACE_OS
 
   // iterate through timeline, picking out dispatches in chronological
   // order of operation completion time
@@ -2408,7 +2412,7 @@ ACE_DynScheduler::output_timeline (const char *filename, const char *heading)
 
   if (file)
   {
-    fclose (file);
+    ACE_OS::fclose (file);
   }
 
   return status;
diff --git a/TAO/orbsvcs/orbsvcs/Scheduler_Factory.cpp b/TAO/orbsvcs/orbsvcs/Scheduler_Factory.cpp
index 90d8a330272..d4e7cb74979 100644
--- a/TAO/orbsvcs/orbsvcs/Scheduler_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Scheduler_Factory.cpp
@@ -713,16 +713,16 @@ ACE_Scheduler_Factory::log_scheduling_tuples(
 
    for (int ndx = 0; ndx < tuple_ptr_array_size; ndx++)
      {
-       fprintf(file,
-               subset_tuple_format,
-               tuple_ptr_array[ndx]->handle,
-               tuple_ptr_array[ndx]->rate_index,
-               tuple_ptr_array[ndx]->period,
-               tuple_ptr_array[ndx]->criticality,
-               tuple_ptr_array[ndx]->priority,
-               tuple_ptr_array[ndx]->preemption_subpriority,
-               tuple_ptr_array[ndx]->preemption_priority,
-               tuple_ptr_array[ndx]->enabled);
+       ACE_OS::fprintf(file,
+                       subset_tuple_format,
+                       tuple_ptr_array[ndx]->handle,
+                       tuple_ptr_array[ndx]->rate_index,
+                       tuple_ptr_array[ndx]->period,
+                       tuple_ptr_array[ndx]->criticality,
+                       tuple_ptr_array[ndx]->priority,
+                       tuple_ptr_array[ndx]->preemption_subpriority,
+                       tuple_ptr_array[ndx]->preemption_priority,
+                       tuple_ptr_array[ndx]->enabled);
      }
 
    ACE_OS::fclose (file);
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Constraint_l.cpp b/TAO/orbsvcs/orbsvcs/Trader/Constraint_l.cpp
index c3f0c5d4e28..36829370242 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Constraint_l.cpp
+++ b/TAO/orbsvcs/orbsvcs/Trader/Constraint_l.cpp
@@ -143,61 +143,61 @@ typedef unsigned int yy_size_t;
 
 
 struct yy_buffer_state
-	{
-	FILE *yy_input_file;
-
-	char *yy_ch_buf;		/* input buffer */
-	char *yy_buf_pos;		/* current position in input buffer */
-
-	/* Size of input buffer in bytes, not including room for EOB
-	 * characters.
-	 */
-	yy_size_t yy_buf_size;
-
-	/* Number of characters read into yy_ch_buf, not including EOB
-	 * characters.
-	 */
-	int yy_n_chars;
-
-	/* Whether we "own" the buffer - i.e., we know we created it,
-	 * and can realloc() it to grow it, and should free() it to
-	 * delete it.
-	 */
-	int yy_is_our_buffer;
-
-	/* Whether this is an "interactive" input source; if so, and
-	 * if we're using stdio for input, then we want to use getc()
-	 * instead of fread(), to make sure we stop fetching input after
-	 * each newline.
-	 */
-	int yy_is_interactive;
-
-	/* Whether we're considered to be at the beginning of a line.
-	 * If so, '^' rules will be active on the next match, otherwise
-	 * not.
-	 */
-	int yy_at_bol;
-
-	/* Whether to try to fill the input buffer when we reach the
-	 * end of it.
-	 */
-	int yy_fill_buffer;
-
-	int yy_buffer_status;
+{
+  FILE *yy_input_file;
+
+  char *yy_ch_buf;		/* input buffer */
+  char *yy_buf_pos;		/* current position in input buffer */
+
+  /* Size of input buffer in bytes, not including room for EOB
+   * characters.
+   */
+  yy_size_t yy_buf_size;
+
+  /* Number of characters read into yy_ch_buf, not including EOB
+   * characters.
+   */
+  int yy_n_chars;
+
+  /* Whether we "own" the buffer - i.e., we know we created it,
+   * and can realloc() it to grow it, and should free() it to
+   * delete it.
+   */
+  int yy_is_our_buffer;
+
+  /* Whether this is an "interactive" input source; if so, and
+   * if we're using stdio for input, then we want to use getc()
+   * instead of fread(), to make sure we stop fetching input after
+   * each newline.
+   */
+  int yy_is_interactive;
+
+  /* Whether we're considered to be at the beginning of a line.
+   * If so, '^' rules will be active on the next match, otherwise
+   * not.
+   */
+  int yy_at_bol;
+
+  /* Whether to try to fill the input buffer when we reach the
+   * end of it.
+   */
+  int yy_fill_buffer;
+
+  int yy_buffer_status;
 #define YY_BUFFER_NEW 0
 #define YY_BUFFER_NORMAL 1
-	/* When an EOF's been seen but there's still some text to process
-	 * then we mark the buffer as YY_EOF_PENDING, to indicate that we
-	 * shouldn't try reading from the input source any more.  We might
-	 * still have a bunch of tokens to match, though, because of
-	 * possible backing-up.
-	 *
-	 * When we actually see the EOF, we change the status to "new"
-	 * (via yyrestart()), so that the user can continue scanning by
-	 * just pointing yyin at a new input file.
-	 */
+  /* When an EOF's been seen but there's still some text to process
+   * then we mark the buffer as YY_EOF_PENDING, to indicate that we
+   * shouldn't try reading from the input source any more.  We might
+   * still have a bunch of tokens to match, though, because of
+   * possible backing-up.
+   *
+   * When we actually see the EOF, we change the status to "new"
+   * (via yyrestart()), so that the user can continue scanning by
+   * just pointing yyin at a new input file.
+   */
 #define YY_BUFFER_EOF_PENDING 2
-	};
+};
 
 static YY_BUFFER_STATE yy_current_buffer = 0;
 
@@ -525,12 +525,14 @@ YY_MALLOC_DECL
 
 /* Copy whatever the last rule matched to the standard output. */
 
+//FUZZ: disable check_for_lack_ACE_OS
 #ifndef TAO_TRADER_ECHO
 /* This used to be an fputs(), but since the string might contain NUL's,
  * we now use fwrite().
  */
 #define TAO_TRADER_ECHO (void) fwrite( yytext, yyleng, 1, yyout )
 #endif
+ //FUZZ: enable check_for_lack_ACE_OS
 
 /* Gets input and stuffs it into "buf".  number of characters read, or YY_NULL,
  * is returned in "result".
@@ -541,7 +543,7 @@ YY_MALLOC_DECL
 		{ \
 		int c = '*', n; \
 		for ( n = 0; n < max_size && \
-			     (c = getc( yyin )) != EOF && c != '\n'; ++n ) \
+           (c = ACE_OS::getc( yyin )) != EOF && c != '\n'; ++n ) \
 			buf[n] = (char) c; \
 		if ( c == '\n' ) \
 			buf[n++] = (char) c; \
@@ -549,7 +551,7 @@ YY_MALLOC_DECL
 			YY_FATAL_ERROR( "input in flex scanner failed" ); \
 		result = n; \
 		} \
-	else if ( ((result = fread( buf, 1, max_size, yyin )) == 0) \
+  else if ( ((result = ACE_OS::fread( buf, 1, max_size, yyin )) == 0) \
 		  && ferror( yyin ) ) \
 		YY_FATAL_ERROR( "input in flex scanner failed" );
 #endif
@@ -1628,8 +1630,8 @@ static void yy_fatal_error( msg )
 char msg[];
 #endif
 	{
-	(void) fprintf( stderr, "%s\n", msg );
-	exit( YY_EXIT_FAILURE );
+  (void) ACE_OS::fprintf( stderr, "%s\n", msg );
+  ACE_OS::exit( YY_EXIT_FAILURE );
 	}
 
 
@@ -1692,7 +1694,7 @@ static void *yy_flex_alloc( size )
 yy_size_t size;
 #endif
 	{
-	return (void *) malloc( size );
+  return (void *) ACE_OS::malloc( size );
 	}
 
 #ifdef YY_USE_PROTOS
@@ -1710,7 +1712,7 @@ yy_size_t size;
 	 * any pointer type to void*, and deal with argument conversions
 	 * as though doing an assignment.
 	 */
-	return (void *) realloc( (char *) ptr, size );
+  return (void *) ACE_OS::realloc( (char *) ptr, size );
 	}
 
 #ifdef YY_USE_PROTOS
@@ -1720,7 +1722,7 @@ static void yy_flex_free( ptr )
 void *ptr;
 #endif
 	{
-	free( ptr );
+  ACE_OS::free( ptr );
 	}
 
 #if YY_MAIN
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Constraint_y.cpp b/TAO/orbsvcs/orbsvcs/Trader/Constraint_y.cpp
index b7bcda4de52..bb5d752e962 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Constraint_y.cpp
+++ b/TAO/orbsvcs/orbsvcs/Trader/Constraint_y.cpp
@@ -374,8 +374,8 @@ yyloop:
             yys = 0;
             if (yychar <= YYMAXTOKEN) yys = yyname[yychar];
             if (!yys) yys = "illegal-symbol";
-            printf("%sdebug: state %d, reading %d (%s)\n",
-                    YYPREFIX, yystate, yychar, yys);
+            ACE_OS::printf("%sdebug: state %d, reading %d (%s)\n",
+                           YYPREFIX, yystate, yychar, yys);
         }
 #endif
     }
@@ -384,8 +384,8 @@ yyloop:
     {
 #if YYDEBUG
         if (yydebug)
-            printf("%sdebug: state %d, shifting to state %d\n",
-                    YYPREFIX, yystate, yytable[yyn]);
+          ACE_OS::printf("%sdebug: state %d, shifting to state %d\n",
+                         YYPREFIX, yystate, yytable[yyn]);
 #endif
         if (yyssp >= yysslim && yygrowstack())
         {
@@ -425,7 +425,7 @@ yyinrecovery:
             {
 #if YYDEBUG
                 if (yydebug)
-                    printf("%sdebug: state %d, error recovery shifting\
+                  ACE_OS::printf("%sdebug: state %d, error recovery shifting\
  to state %d\n", YYPREFIX, *yyssp, yytable[yyn]);
 #endif
                 if (yyssp >= yysslim && yygrowstack())
@@ -440,8 +440,8 @@ yyinrecovery:
             {
 #if YYDEBUG
                 if (yydebug)
-                    printf("%sdebug: error recovery discarding state %d\n",
-                            YYPREFIX, *yyssp);
+                  ACE_OS::printf("%sdebug: error recovery discarding state %d\n",
+                                 YYPREFIX, *yyssp);
 #endif
                 if (yyssp <= yyss) goto yyabort;
                 --yyssp;
@@ -458,8 +458,8 @@ yyinrecovery:
             yys = 0;
             if (yychar <= YYMAXTOKEN) yys = yyname[yychar];
             if (!yys) yys = "illegal-symbol";
-            printf("%sdebug: state %d, error recovery discards token %d (%s)\n",
-                    YYPREFIX, yystate, yychar, yys);
+            ACE_OS::printf("%sdebug: state %d, error recovery discards token %d (%s)\n",
+                           YYPREFIX, yystate, yychar, yys);
         }
 #endif
         yychar = (-1);
@@ -468,8 +468,8 @@ yyinrecovery:
 yyreduce:
 #if YYDEBUG
     if (yydebug)
-        printf("%sdebug: state %d, reducing by rule %d (%s)\n",
-                YYPREFIX, yystate, yyn, yyrule[yyn]);
+      ACE_OS::printf("%sdebug: state %d, reducing by rule %d (%s)\n",
+                     YYPREFIX, yystate, yyn, yyrule[yyn]);
 #endif
     yym = yylen[yyn];
     yyval = yyvsp[1-yym];
@@ -595,7 +595,7 @@ break;
     {
 #if YYDEBUG
         if (yydebug)
-            printf("%sdebug: after reduction, shifting from state 0 to\
+          ACE_OS::printf("%sdebug: after reduction, shifting from state 0 to\
  state %d\n", YYPREFIX, YYFINAL);
 #endif
         yystate = YYFINAL;
@@ -610,8 +610,8 @@ break;
                 yys = 0;
                 if (yychar <= YYMAXTOKEN) yys = yyname[yychar];
                 if (!yys) yys = "illegal-symbol";
-                printf("%sdebug: state %d, reading %d (%s)\n",
-                        YYPREFIX, YYFINAL, yychar, yys);
+                ACE_OS::printf("%sdebug: state %d, reading %d (%s)\n",
+                               YYPREFIX, YYFINAL, yychar, yys);
             }
 #endif
         }
@@ -625,7 +625,7 @@ break;
         yystate = yydgoto[yym];
 #if YYDEBUG
     if (yydebug)
-        printf("%sdebug: after reduction, shifting from state %d \
+      ACE_OS::printf("%sdebug: after reduction, shifting from state %d \
 to state %d\n", YYPREFIX, *yyssp, yystate);
 #endif
     if (yyssp >= yysslim && yygrowstack())
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Interpreter.cpp b/TAO/orbsvcs/orbsvcs/Trader/Interpreter.cpp
index 9c29900ca1e..26aac49da64 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Interpreter.cpp
+++ b/TAO/orbsvcs/orbsvcs/Trader/Interpreter.cpp
@@ -81,9 +81,9 @@ TAO_Lex_String_Input::copy_into (char* buf, int max_size)
 
   if (n > 0)
     {
-      ACE_OS:: memcpy (buf,
-                       TAO_Lex_String_Input::current_,
-                       n);
+      ACE_OS::memcpy (buf,
+                      TAO_Lex_String_Input::current_,
+                      n);
       TAO_Lex_String_Input::current_ += n;
     }