diff options
author | Abdullah Sowayan <sowayan@users.noreply.github.com> | 2007-06-30 21:51:17 +0000 |
---|---|---|
committer | Abdullah Sowayan <sowayan@users.noreply.github.com> | 2007-06-30 21:51:17 +0000 |
commit | 26c98edb4783ede276a281ff0bd8ff50698a5704 (patch) | |
tree | bdfd62c198b36eb514dfbc470c29da7e76e0eb48 /TAO/orbsvcs | |
parent | 3cb966b52257743713c8bb423b904d6a02c51c4f (diff) | |
download | ATCD-26c98edb4783ede276a281ff0bd8ff50698a5704.tar.gz |
Sat Jun 30 21:38:25 UTC 2007 Abdullah Sowayan <abdullah.sowayan@lmco.com>
Diffstat (limited to 'TAO/orbsvcs')
38 files changed, 246 insertions, 213 deletions
diff --git a/TAO/orbsvcs/tests/AVStreams/Modify_QoS/sender.cpp b/TAO/orbsvcs/tests/AVStreams/Modify_QoS/sender.cpp index 9761d9ef279..ebc628953b7 100644 --- a/TAO/orbsvcs/tests/AVStreams/Modify_QoS/sender.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Modify_QoS/sender.cpp @@ -47,7 +47,7 @@ Sender_StreamEndPoint::modify_QoS (AVStreams::streamQoS &new_qos, if (new_qos.length () != 0) { // Check which qos parameter has changed. - if (strcmp (new_qos [0].QoSParams [0].property_name, "video_frame_rate") == 0) + if (ACE_OS::strcmp (new_qos [0].QoSParams [0].property_name, "video_frame_rate") == 0) { // The video frame rate for this flow has changed. diff --git a/TAO/orbsvcs/tests/BiDir_CORBALOC/TimeServer.cpp b/TAO/orbsvcs/tests/BiDir_CORBALOC/TimeServer.cpp index 641920ea2f1..ebea42eb1c3 100644 --- a/TAO/orbsvcs/tests/BiDir_CORBALOC/TimeServer.cpp +++ b/TAO/orbsvcs/tests/BiDir_CORBALOC/TimeServer.cpp @@ -5,6 +5,7 @@ #include "tao/Utils/PolicyList_Destroyer.h" #include "orbsvcs/CosNamingC.h" #include "tao/AnyTypeCode/Any.h" +#include "ace/OS_NS_time.h" class Time_impl : public POA_TimeModule::Time @@ -20,8 +21,8 @@ public: TimeModule::TimeOfDay Time_impl::get_gmt (void) { - time_t time_now = time(0); - struct tm *time_p = gmtime(&time_now); + time_t time_now = ACE_OS::time(0); + struct tm *time_p = ACE_OS::gmtime(&time_now); TimeModule::TimeOfDay tod; @@ -35,7 +36,7 @@ TimeModule::TimeOfDay Time_impl::get_gmt (void) void Time_impl::Shutdown (void) { - exit(0); + ACE_OS::exit(0); } int diff --git a/TAO/orbsvcs/tests/Bug_2247_Regression/test_i.cpp b/TAO/orbsvcs/tests/Bug_2247_Regression/test_i.cpp index 054b84275a5..87ef59a9e20 100644 --- a/TAO/orbsvcs/tests/Bug_2247_Regression/test_i.cpp +++ b/TAO/orbsvcs/tests/Bug_2247_Regression/test_i.cpp @@ -33,7 +33,9 @@ Simple_Server_i::remote_call (void) char* Simple_Server_i::shutdown (const char* key) { + //FUZZ: disable check_for_lack_ACE_OS ACE_DEBUG ((LM_DEBUG, "SERVER(%s)> executing shutdown()\n", _key.in())); + //FUZZ: enable check_for_lack_ACE_OS int still_alive = 1; if (!ACE_OS::strcmp (_key.in(), key)) @@ -52,7 +54,10 @@ Simple_Server_i::shutdown (const char* key) char* Simple_Server_i::abort (const char* key) { + //FUZZ: disable check_for_lack_ACE_OS ACE_DEBUG ((LM_DEBUG, "SERVER(%s)> executing abort()\n", _key.in())); + //FUZZ: enable check_for_lack_ACE_OS + int still_alive = 1; if (!ACE_OS::strcmp (_key.in(), key)) { diff --git a/TAO/orbsvcs/tests/Bug_2248_Regression/test_i.cpp b/TAO/orbsvcs/tests/Bug_2248_Regression/test_i.cpp index f76b17f2b1d..8d0e458ede9 100644 --- a/TAO/orbsvcs/tests/Bug_2248_Regression/test_i.cpp +++ b/TAO/orbsvcs/tests/Bug_2248_Regression/test_i.cpp @@ -33,7 +33,9 @@ Simple_Server_i::remote_call (void) char* Simple_Server_i::shutdown (const char* key) { + //FUZZ: disable check_for_lack_ACE_OS ACE_DEBUG ((LM_DEBUG, "SERVER(%s)> executing shutdown()\n", _key.in())); + //FUZZ: enable check_for_lack_ACE_OS int still_alive = 1; if (!ACE_OS::strcmp (_key.in(), key)) @@ -52,7 +54,10 @@ Simple_Server_i::shutdown (const char* key) char* Simple_Server_i::abort (const char* key) { + //FUZZ: disable check_for_lack_ACE_OS ACE_DEBUG ((LM_DEBUG, "SERVER(%s)> executing abort()\n", _key.in())); + //FUZZ: enable check_for_lack_ACE_OS + int still_alive = 1; if (!ACE_OS::strcmp (_key.in(), key)) { diff --git a/TAO/orbsvcs/tests/Bug_2377_Regression/Hello_Impl.cpp b/TAO/orbsvcs/tests/Bug_2377_Regression/Hello_Impl.cpp index 30eed3dd1b6..cd1f6e360cf 100644 --- a/TAO/orbsvcs/tests/Bug_2377_Regression/Hello_Impl.cpp +++ b/TAO/orbsvcs/tests/Bug_2377_Regression/Hello_Impl.cpp @@ -25,7 +25,9 @@ Hello_Impl::shutdown () } catch (const CORBA::Exception& ex) { + //FUZZ: disable check_for_lack_ACE_OS ex._tao_print_exception ("Exception caught in shutdown ():"); + //FUZZ: enable check_for_lack_ACE_OS } } diff --git a/TAO/orbsvcs/tests/Bug_2800_Regression/NamingTask.cpp b/TAO/orbsvcs/tests/Bug_2800_Regression/NamingTask.cpp index 325d3f7b9c7..a61c488aa29 100644 --- a/TAO/orbsvcs/tests/Bug_2800_Regression/NamingTask.cpp +++ b/TAO/orbsvcs/tests/Bug_2800_Regression/NamingTask.cpp @@ -33,7 +33,7 @@ void NamingTask::waitInit () void NamingTask::end() { orb_->shutdown(0); - wait(); + this->wait(); } const char* NamingTask::ior() diff --git a/TAO/orbsvcs/tests/Bug_2800_Regression/nsmain.cpp b/TAO/orbsvcs/tests/Bug_2800_Regression/nsmain.cpp index fae15a4ee43..0c2b4add23f 100644 --- a/TAO/orbsvcs/tests/Bug_2800_Regression/nsmain.cpp +++ b/TAO/orbsvcs/tests/Bug_2800_Regression/nsmain.cpp @@ -37,7 +37,7 @@ TestTask::TestTask(int argc, char **argv) void TestTask::end() { orb_->shutdown(0); - wait(); + this->wait(); } int diff --git a/TAO/orbsvcs/tests/Bug_2800_Regression/server.cpp b/TAO/orbsvcs/tests/Bug_2800_Regression/server.cpp index 28d959ce4a1..8962e0915c1 100644 --- a/TAO/orbsvcs/tests/Bug_2800_Regression/server.cpp +++ b/TAO/orbsvcs/tests/Bug_2800_Regression/server.cpp @@ -31,7 +31,7 @@ TestTask::TestTask(int argc, char **argv) void TestTask::end() { orb_->shutdown(0); - wait(); + this->wait(); } int diff --git a/TAO/orbsvcs/tests/Bug_2925_Regression/Hello_Impl.cpp b/TAO/orbsvcs/tests/Bug_2925_Regression/Hello_Impl.cpp index f8d58d852f8..9c94701468d 100644 --- a/TAO/orbsvcs/tests/Bug_2925_Regression/Hello_Impl.cpp +++ b/TAO/orbsvcs/tests/Bug_2925_Regression/Hello_Impl.cpp @@ -29,7 +29,9 @@ Hello_Impl::shutdown () } catch (const CORBA::Exception& ex) { + //FUZZ: disable check_for_lack_ACE_OS ex._tao_print_exception ("Exception caught in shutdown ():"); + //FUZZ: enable check_for_lack_ACE_OS } } diff --git a/TAO/orbsvcs/tests/COIOP_Naming_Test/NamingTask.cpp b/TAO/orbsvcs/tests/COIOP_Naming_Test/NamingTask.cpp index 38c35d8cf8f..cc88bd33ab3 100644 --- a/TAO/orbsvcs/tests/COIOP_Naming_Test/NamingTask.cpp +++ b/TAO/orbsvcs/tests/COIOP_Naming_Test/NamingTask.cpp @@ -24,7 +24,7 @@ void NamingTask::waitInit () void NamingTask::end() { orb_->shutdown(0); - wait(); + this->wait(); } CosNaming::NamingContext_ptr diff --git a/TAO/orbsvcs/tests/Concurrency/CC_client.cpp b/TAO/orbsvcs/tests/Concurrency/CC_client.cpp index ca5afcee699..3c6d9560c0c 100644 --- a/TAO/orbsvcs/tests/Concurrency/CC_client.cpp +++ b/TAO/orbsvcs/tests/Concurrency/CC_client.cpp @@ -25,7 +25,7 @@ #include "ace/Read_Buffer.h" #include "ace/OS_NS_stdio.h" #include "ace/OS_NS_unistd.h" -#include "ace/os_include/os_ctype.h" +#include "ace/OS_NS_ctype.h" #include "ace/OS_NS_string.h" #include "ace/OS_NS_fcntl.h" @@ -251,7 +251,7 @@ CC_Client::check_extended_test_params(char *params) switch(state) { case TAO_START: - if(isdigit(*cp)) + if(ACE_OS::ace_isdigit(*cp)) state = TAO_NUMBER; else state = TAO_ERROR; @@ -264,7 +264,7 @@ CC_Client::check_extended_test_params(char *params) no_of_params++; } else - if(!isdigit(*cp)) + if(!ACE_OS::ace_isdigit(*cp)) state = TAO_ERROR; break; diff --git a/TAO/orbsvcs/tests/Concurrency/CC_command.cpp b/TAO/orbsvcs/tests/Concurrency/CC_command.cpp index f9a2f695b3f..0dfc22ad033 100644 --- a/TAO/orbsvcs/tests/Concurrency/CC_command.cpp +++ b/TAO/orbsvcs/tests/Concurrency/CC_command.cpp @@ -104,13 +104,13 @@ int CC_Start_Cmd::execute(void) { if (excep_) { - printf ("Exception: %s\n", excep_->_rep_id ()); + ACE_OS::printf ("Exception: %s\n", excep_->_rep_id ()); delete excep_; excep_ = 0; return 0; // CC_FAIL } - printf ("Executing start command (script file: %s)\n", cfg_name_); + ACE_OS::printf ("Executing start command (script file: %s)\n", cfg_name_); char cmd_line[1024]; int success = ACE_OS::sprintf(&cmd_line[0], "%s -c %s", @@ -152,13 +152,13 @@ int CC_CreateLockSet_Cmd::execute(void) { if(excep_) { - printf("Exception: %s\n", excep_->_rep_id ()); + ACE_OS::printf("Exception: %s\n", excep_->_rep_id ()); delete excep_; excep_ = 0; return 0; // CC_FAIL } - printf("Executing create command (lock set: %s)\n", name_); + ACE_OS::printf("Executing create command (lock set: %s)\n", name_); try { @@ -201,14 +201,14 @@ int CC_Lock_Cmd::execute(void) { if(excep_) { - printf("Exception: %s\n", excep_->_rep_id ()); + ACE_OS::printf("Exception: %s\n", excep_->_rep_id ()); delete excep_; excep_ = 0; return 0; // CC_FAIL } - printf("Executing lock command (lock set: %s, mode: %s)\n", - name_, CC_TestUtils::get_lock_mode_name(mode_)); + ACE_OS::printf("Executing lock command (lock set: %s, mode: %s)\n", + name_, CC_TestUtils::get_lock_mode_name(mode_)); try { @@ -242,14 +242,14 @@ int CC_UnLock_Cmd::execute(void) { if(excep_) { - printf("Exception: %s\n", excep_->_rep_id ()); + ACE_OS::printf("Exception: %s\n", excep_->_rep_id ()); delete excep_; excep_ = 0; return 0; // CC_FAIL } - printf("Executing unlock command (lock set: %s, mode: %s)\n", - name_, CC_TestUtils::get_lock_mode_name(mode_)); + ACE_OS::printf("Executing unlock command (lock set: %s, mode: %s)\n", + name_, CC_TestUtils::get_lock_mode_name(mode_)); try { @@ -284,14 +284,14 @@ int CC_TryLock_Cmd::execute(void) { if(excep_) { - printf("Exception: %s\n", excep_->_rep_id ()); + ACE_OS::printf("Exception: %s\n", excep_->_rep_id ()); delete excep_; excep_ = 0; return 0; // CC_FAIL } - printf("Executing try_lock command (lock set: %s, mode: %s)\n", - name_, CC_TestUtils::get_lock_mode_name(mode_)); + ACE_OS::printf("Executing try_lock command (lock set: %s, mode: %s)\n", + name_, CC_TestUtils::get_lock_mode_name(mode_)); CORBA::Boolean lock_not_held; @@ -344,15 +344,15 @@ int CC_ChangeMode_Cmd::execute(void) { if(excep_) { - printf("Exception: %s\n", excep_->_rep_id ()); + ACE_OS::printf("Exception: %s\n", excep_->_rep_id ()); delete excep_; excep_ = 0; return 0; // CC_FAIL } - printf("Executing change_mode command (lock set: %s, held_mode: %s, new_mode: %s)\n", - name_, CC_TestUtils::get_lock_mode_name(held_mode_), - CC_TestUtils::get_lock_mode_name(new_mode_)); + ACE_OS::printf("Executing change_mode command (lock set: %s, held_mode: %s, new_mode: %s)\n", + name_, CC_TestUtils::get_lock_mode_name(held_mode_), + CC_TestUtils::get_lock_mode_name(new_mode_)); try { @@ -381,13 +381,13 @@ int CC_Sleep_Cmd::execute(void) { if(excep_) { - printf("Exception: %s\n", excep_->_rep_id ()); + ACE_OS::printf("Exception: %s\n", excep_->_rep_id ()); delete excep_; excep_ = 0; return 0; // CC_FAIL } - printf("Executing sleep command (time: %i)\n", time_); + ACE_OS::printf("Executing sleep command (time: %i)\n", time_); ACE_OS::sleep(time_); return 1; // CC_SUCCESS @@ -406,13 +406,13 @@ int CC_Repeat_Cmd::execute(void) { if(excep_) { - printf("Exception: %s\n", excep_->_rep_id ()); + ACE_OS::printf("Exception: %s\n", excep_->_rep_id ()); delete excep_; excep_ = 0; return 0; // CC_FAIL } - printf("Executing repeat command (times: %i)\n", times_); + ACE_OS::printf("Executing repeat command (times: %i)\n", times_); return 1; // CC_SUCCESS } @@ -431,15 +431,15 @@ int CC_Wait_Cmd::execute(void) { if (excep_) { - printf ("Exception: %s\n", excep_->_rep_id ()); + ACE_OS::printf ("Exception: %s\n", excep_->_rep_id ()); delete excep_; excep_ = 0; return 0; // CC_FAIL } - printf ("Executing wait command\n"); + ACE_OS::printf ("Executing wait command\n"); - printf ("%s", prompt_); + ACE_OS::printf ("%s", prompt_); (void) ACE_OS::fgetc (stdin); return 1; // CC_SUCCESS @@ -459,7 +459,7 @@ CC_Excep_Cmd::~CC_Excep_Cmd(void) int CC_Excep_Cmd::execute(void) { - printf ("Executing excep command (expected: %s)\n", ex_); + ACE_OS::printf ("Executing excep command (expected: %s)\n", ex_); // First we check to see if an exception has occured. If not we fail // because we expected to see one if(excep_==0) @@ -474,7 +474,7 @@ CC_Excep_Cmd::execute(void) } else { - printf ("Exception: %s\n", excep_->_rep_id ()); + ACE_OS::printf ("Exception: %s\n", excep_->_rep_id ()); delete excep_; excep_ = 0; return 0; // CC_FAIL @@ -508,7 +508,7 @@ CC_Print_Cmd::~CC_Print_Cmd(void) int CC_Print_Cmd::execute(void) { - printf ("%s\n", msg_); + ACE_OS::printf ("%s\n", msg_); return 1; // CC_SUCCESS } @@ -531,13 +531,13 @@ CC_Lookup_Cmd::execute(void) { if(excep_) { - printf ("Exception: %s\n", excep_->_rep_id ()); + ACE_OS::printf ("Exception: %s\n", excep_->_rep_id ()); delete excep_; excep_ = 0; return 0; // CC_FAIL } - printf ("Executing lookup command (lock set: %s)\n", name_); + ACE_OS::printf ("Executing lookup command (lock set: %s)\n", name_); // Do the lookup if we haven't done it before if(cc_lockset_.in() == 0) @@ -591,7 +591,7 @@ CC_CommandElem::SetNext(CC_CommandElem *next) CC_CommandList::CC_CommandList(void) : head_ (0), last_ (0), times_ (1) { - printf("CC_CommandList::CC_CommandList\n"); + ACE_OS::printf("CC_CommandList::CC_CommandList\n"); } CC_CommandList::~CC_CommandList(void) diff --git a/TAO/orbsvcs/tests/Concurrency/CC_command.tab.cpp b/TAO/orbsvcs/tests/Concurrency/CC_command.tab.cpp index 8a67df0eb67..69e9e1a83fb 100644 --- a/TAO/orbsvcs/tests/Concurrency/CC_command.tab.cpp +++ b/TAO/orbsvcs/tests/Concurrency/CC_command.tab.cpp @@ -491,7 +491,7 @@ ace_cc_yyparse(ACE_CC_YYPARSE_PARAM_ARG) #if ACE_CC_YYDEBUG != 0 if (ace_cc_yydebug) - fprintf(stderr, "Starting parse\n"); + ACE_OS::fprintf(stderr, "Starting parse\n"); #endif ace_cc_yystate = 0; @@ -559,10 +559,10 @@ ace_cc_yynewstate: ace_cc_yyerror("parser stack overflow"); if (ace_cc_yyfree_stacks) { - free (ace_cc_yyss); - free (ace_cc_yyvs); + ACE_OS::free (ace_cc_yyss); + ACE_OS::free (ace_cc_yyvs); #ifdef ACE_CC_YYLSP_NEEDED - free (ace_cc_yyls); + ACE_OS::free (ace_cc_yyls); #endif } return 2; @@ -594,7 +594,7 @@ ace_cc_yynewstate: #if ACE_CC_YYDEBUG != 0 if (ace_cc_yydebug) - fprintf(stderr, "Stack size increased to %d\n", ace_cc_yystacksize); + ACE_OS::fprintf(stderr, "Stack size increased to %d\n", ace_cc_yystacksize); #endif if (ace_cc_yyssp >= ace_cc_yyss + ace_cc_yystacksize - 1) @@ -603,7 +603,7 @@ ace_cc_yynewstate: #if ACE_CC_YYDEBUG != 0 if (ace_cc_yydebug) - fprintf(stderr, "Entering state %d\n", ace_cc_yystate); + ACE_OS::fprintf(stderr, "Entering state %d\n", ace_cc_yystate); #endif goto ace_cc_yybackup; @@ -628,7 +628,7 @@ ace_cc_yynewstate: { #if ACE_CC_YYDEBUG != 0 if (ace_cc_yydebug) - fprintf(stderr, "Reading a token: "); + ACE_OS::fprintf(stderr, "Reading a token: "); #endif ace_cc_yychar = ACE_CC_YYLEX; } @@ -642,7 +642,7 @@ ace_cc_yynewstate: #if ACE_CC_YYDEBUG != 0 if (ace_cc_yydebug) - fprintf(stderr, "Now at end of input.\n"); + ACE_OS::fprintf(stderr, "Now at end of input.\n"); #endif } else @@ -652,13 +652,13 @@ ace_cc_yynewstate: #if ACE_CC_YYDEBUG != 0 if (ace_cc_yydebug) { - fprintf (stderr, "Next token is %d (%s", ace_cc_yychar, ace_cc_yytname[ace_cc_yychar1]); + ACE_OS::fprintf (stderr, "Next token is %d (%s", ace_cc_yychar, ace_cc_yytname[ace_cc_yychar1]); /* Give the individual parser a way to print the precise meaning of a token, for further debugging info. */ #ifdef ACE_CC_YYPRINT ACE_CC_YYPRINT (stderr, ace_cc_yychar, ace_cc_yylval); #endif - fprintf (stderr, ")\n"); + ACE_OS::fprintf (stderr, ")\n"); } #endif } @@ -693,7 +693,7 @@ ace_cc_yynewstate: #if ACE_CC_YYDEBUG != 0 if (ace_cc_yydebug) - fprintf(stderr, "Shifting token %d (%s), ", ace_cc_yychar, ace_cc_yytname[ace_cc_yychar1]); + ACE_OS::fprintf(stderr, "Shifting token %d (%s), ", ace_cc_yychar, ace_cc_yytname[ace_cc_yychar1]); #endif /* Discard the token being shifted unless it is eof. */ @@ -729,13 +729,13 @@ ace_cc_yyreduce: { int i; - fprintf (stderr, "Reducing via rule %d (line %d), ", - ace_cc_yyn, ace_cc_yyrline[ace_cc_yyn]); + ACE_OS::fprintf (stderr, "Reducing via rule %d (line %d), ", + ace_cc_yyn, ace_cc_yyrline[ace_cc_yyn]); /* Print the symbols being reduced, and their result. */ for (i = ace_cc_yyprhs[ace_cc_yyn]; ace_cc_yyrhs[i] > 0; i++) - fprintf (stderr, "%s ", ace_cc_yytname[ace_cc_yyrhs[i]]); - fprintf (stderr, " -> %s\n", ace_cc_yytname[ace_cc_yyr1[ace_cc_yyn]]); + ACE_OS::fprintf (stderr, "%s ", ace_cc_yytname[ace_cc_yyrhs[i]]); + ACE_OS::fprintf (stderr, " -> %s\n", ace_cc_yytname[ace_cc_yyr1[ace_cc_yyn]]); } #endif @@ -746,9 +746,9 @@ case 2: { cmdlist->add(new CC_Sleep_Cmd(0)); /* dummy to check exeption in the last command */ if(cmdlist->execute()!=0) //CC_FAIL - { printf(" ** Test succeded!!\n"); } + { ACE_OS::printf(" ** Test succeded!!\n"); } else - { printf(" ** Test FAILED!!\n"); } ; + { ACE_OS::printf(" ** Test FAILED!!\n"); } ; break;} case 3: { cmdlist->add(ace_cc_yyvsp[0].command); ; @@ -849,10 +849,10 @@ case 30: if (ace_cc_yydebug) { short *ssp1 = ace_cc_yyss - 1; - fprintf (stderr, "state stack now"); + ACE_OS::fprintf (stderr, "state stack now"); while (ssp1 != ace_cc_yyssp) - fprintf (stderr, " %d", *++ssp1); - fprintf (stderr, "\n"); + ACE_OS::fprintf (stderr, " %d", *++ssp1); + ACE_OS::fprintf (stderr, "\n"); } #endif @@ -911,11 +911,11 @@ ace_cc_yyerrlab: /* here on detecting error */ for (x = (ace_cc_yyn < 0 ? -ace_cc_yyn : 0); x < (sizeof(ace_cc_yytname) / sizeof(char *)); x++) if (ace_cc_yycheck[x + ace_cc_yyn] == x) - size += strlen(ace_cc_yytname[x]) + 15, count++; - msg = (char *) malloc(size + 15); + size += ACE_OS::strlen(ace_cc_yytname[x]) + 15, count++; + msg = (char *) ACE_OS::malloc(size + 15); if (msg != 0) { - strcpy(msg, "parse error"); + ACE_OS::strcpy(msg, "parse error"); if (count < 5) { @@ -924,14 +924,14 @@ ace_cc_yyerrlab: /* here on detecting error */ x < (sizeof(ace_cc_yytname) / sizeof(char *)); x++) if (ace_cc_yycheck[x + ace_cc_yyn] == x) { - strcat(msg, count == 0 ? ", expecting `" : " or `"); - strcat(msg, ace_cc_yytname[x]); - strcat(msg, "'"); - count++; + ACE_OS::strcat(msg, count == 0 ? ", expecting `" : " or `"); + ACE_OS::strcat(msg, ace_cc_yytname[x]); + ACE_OS::strcat(msg, "'"); + count++; } } ace_cc_yyerror(msg); - free(msg); + ACE_OS::free(msg); } else ace_cc_yyerror ("parse error; also virtual memory exceeded"); @@ -954,7 +954,7 @@ ace_cc_yyerrlab1: /* here on error raised explicitly by an action */ #if ACE_CC_YYDEBUG != 0 if (ace_cc_yydebug) - fprintf(stderr, "Discarding token %d (%s).\n", ace_cc_yychar, ace_cc_yytname[ace_cc_yychar1]); + ACE_OS::fprintf(stderr, "Discarding token %d (%s).\n", ace_cc_yychar, ace_cc_yytname[ace_cc_yychar1]); #endif ace_cc_yychar = ACE_CC_YYEMPTY; @@ -989,10 +989,10 @@ ace_cc_yyerrpop: /* pop the current state because it cannot handle the error t if (ace_cc_yydebug) { short *ssp1 = ace_cc_yyss - 1; - fprintf (stderr, "Error: state stack now"); + ACE_OS::fprintf (stderr, "Error: state stack now"); while (ssp1 != ace_cc_yyssp) - fprintf (stderr, " %d", *++ssp1); - fprintf (stderr, "\n"); + ACE_OS::fprintf (stderr, " %d", *++ssp1); + ACE_OS::fprintf (stderr, "\n"); } #endif @@ -1022,7 +1022,7 @@ ace_cc_yyerrhandle: #if ACE_CC_YYDEBUG != 0 if (ace_cc_yydebug) - fprintf(stderr, "Shifting error token, "); + ACE_OS::fprintf(stderr, "Shifting error token, "); #endif *++ace_cc_yyvsp = ace_cc_yylval; @@ -1037,10 +1037,10 @@ ace_cc_yyerrhandle: /* ACE_CC_YYACCEPT comes here. */ if (ace_cc_yyfree_stacks) { - free (ace_cc_yyss); - free (ace_cc_yyvs); + ACE_OS::free (ace_cc_yyss); + ACE_OS::free (ace_cc_yyvs); #ifdef ACE_CC_YYLSP_NEEDED - free (ace_cc_yyls); + ACE_OS::free (ace_cc_yyls); #endif } return 0; @@ -1049,10 +1049,10 @@ ace_cc_yyerrhandle: /* ACE_CC_YYABORT comes here. */ if (ace_cc_yyfree_stacks) { - free (ace_cc_yyss); - free (ace_cc_yyvs); + ACE_OS::free (ace_cc_yyss); + ACE_OS::free (ace_cc_yyvs); #ifdef ACE_CC_YYLSP_NEEDED - free (ace_cc_yyls); + ACE_OS::free (ace_cc_yyls); #endif } return 1; diff --git a/TAO/orbsvcs/tests/Concurrency/lex.CC_command.cpp b/TAO/orbsvcs/tests/Concurrency/lex.CC_command.cpp index d301a466f67..627fbc0f4a2 100644 --- a/TAO/orbsvcs/tests/Concurrency/lex.CC_command.cpp +++ b/TAO/orbsvcs/tests/Concurrency/lex.CC_command.cpp @@ -142,61 +142,61 @@ typedef unsigned int ace_cc_yy_size_t; struct ace_cc_yy_buffer_state - { - FILE *ace_cc_yy_input_file; - - char *ace_cc_yy_ch_buf; /* input buffer */ - char *ace_cc_yy_buf_pos; /* current position in input buffer */ - - /* Size of input buffer in bytes, not including room for EOB - * characters. - */ - ace_cc_yy_size_t ace_cc_yy_buf_size; - - /* Number of characters read into ace_cc_yy_ch_buf, not including EOB - * characters. - */ - int ace_cc_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 ace_cc_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 ace_cc_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 ace_cc_yy_at_bol; - - /* Whether to try to fill the input buffer when we reach the - * end of it. - */ - int ace_cc_yy_fill_buffer; - - int ace_cc_yy_buffer_status; +{ + FILE *ace_cc_yy_input_file; + + char *ace_cc_yy_ch_buf; /* input buffer */ + char *ace_cc_yy_buf_pos; /* current position in input buffer */ + + /* Size of input buffer in bytes, not including room for EOB + * characters. + */ + ace_cc_yy_size_t ace_cc_yy_buf_size; + + /* Number of characters read into ace_cc_yy_ch_buf, not including EOB + * characters. + */ + int ace_cc_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 ace_cc_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 ace_cc_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 ace_cc_yy_at_bol; + + /* Whether to try to fill the input buffer when we reach the + * end of it. + */ + int ace_cc_yy_fill_buffer; + + int ace_cc_yy_buffer_status; #define ACE_CC_YY_BUFFER_NEW 0 #define ACE_CC_YY_BUFFER_NORMAL 1 - /* When an EOF's been seen but there's still some text to process - * then we mark the buffer as ACE_CC_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 ace_cc_yyrestart()), so that the user can continue scanning by - * just pointing ace_cc_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 ACE_CC_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 ace_cc_yyrestart()), so that the user can continue scanning by + * just pointing ace_cc_yyin at a new input file. + */ #define ACE_CC_YY_BUFFER_EOF_PENDING 2 - }; +}; static ACE_CC_YY_BUFFER_STATE ace_cc_yy_current_buffer = 0; @@ -541,33 +541,35 @@ ACE_CC_YY_MALLOC_DECL /* Copy whatever the last rule matched to the standard output. */ +//FUZZ: disable check_for_lack_ACE_OS #ifndef ACE_CC_ECHO /* This used to be an fputs(), but since the string might contain NUL's, * we now use fwrite(). */ #define ACE_CC_ECHO (void) fwrite( ace_cc_yytext, ace_cc_yyleng, 1, ace_cc_yyout ) #endif +//FUZZ: enable check_for_lack_ACE_OS /* Gets input and stuffs it into "buf". number of characters read, or ACE_CC_YY_NULL, * is returned in "result". */ #ifndef ACE_CC_YY_INPUT #define ACE_CC_YY_INPUT(buf,result,max_size) \ - if ( ace_cc_yy_current_buffer->ace_cc_yy_is_interactive ) \ - { \ - int c = '*', n; \ - for ( n = 0; n < max_size && \ - (c = getc( ace_cc_yyin )) != EOF && c != '\n'; ++n ) \ - buf[n] = (char) c; \ - if ( c == '\n' ) \ - buf[n++] = (char) c; \ - if ( c == EOF && ferror( ace_cc_yyin ) ) \ - ACE_CC_YY_FATAL_ERROR( "input in flex scanner failed" ); \ - result = n; \ - } \ - else if ( ((result = fread( buf, 1, max_size, ace_cc_yyin )) == 0) \ - && ferror( ace_cc_yyin ) ) \ - ACE_CC_YY_FATAL_ERROR( "input in flex scanner failed" ); + if ( ace_cc_yy_current_buffer->ace_cc_yy_is_interactive ) \ + { \ + int c = '*', n; \ + for ( n = 0; n < max_size && \ + (c = ACE_OS::getc( ace_cc_yyin )) != EOF && c != '\n'; ++n ) \ + buf[n] = (char) c; \ + if ( c == '\n' ) \ + buf[n++] = (char) c; \ + if ( c == EOF && ferror( ace_cc_yyin ) ) \ + ACE_CC_YY_FATAL_ERROR( "input in flex scanner failed" ); \ + result = n; \ + } \ + else if ( ((result = ACE_OS::fread( buf, 1, max_size, ace_cc_yyin )) == 0) \ + && ferror( ace_cc_yyin ) ) \ + ACE_CC_YY_FATAL_ERROR( "input in flex scanner failed" ); #endif /* No semi-colon after return; correct usage is to write "ace_cc_yyterminate();" - @@ -786,7 +788,7 @@ ACE_CC_YY_RULE_SETUP /* ACE_CC_YY_BREAK */ case 20: ACE_CC_YY_RULE_SETUP -{ ace_cc_yylval.num = atoi(ace_cc_yytext); return T_NUM; } +{ ace_cc_yylval.num = ACE_OS::atoi(ace_cc_yytext); return T_NUM; } /* ACE_CC_YY_BREAK */ case 21: ACE_CC_YY_RULE_SETUP @@ -1405,7 +1407,7 @@ FILE *file; #if ACE_CC_YY_NEVER_INTERACTIVE b->ace_cc_yy_is_interactive = 0; #else - b->ace_cc_yy_is_interactive = file ? (isatty( fileno(file) ) > 0) : 0; + b->ace_cc_yy_is_interactive = file ? (ACE_OS::ace_isatty( fileno(file) ) > 0) : 0; #endif #endif } @@ -1598,8 +1600,8 @@ static void ace_cc_yy_fatal_error( msg ) char msg[]; #endif { - (void) fprintf( stderr, "%s\n", msg ); - exit( ACE_CC_YY_EXIT_FAILURE ); + (void) ACE_OS::fprintf( stderr, "%s\n", msg ); + ACE_OS::exit( ACE_CC_YY_EXIT_FAILURE ); } @@ -1662,7 +1664,7 @@ static void *ace_cc_yy_flex_alloc( size ) ace_cc_yy_size_t size; #endif { - return (void *) malloc( size ); + return (void *) ACE_OS::malloc( size ); } #ifdef ACE_CC_YY_USE_PROTOS @@ -1680,7 +1682,7 @@ ace_cc_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 ACE_CC_YY_USE_PROTOS @@ -1690,7 +1692,7 @@ static void ace_cc_yy_flex_free( ptr ) void *ptr; #endif { - free( ACE_MALLOC_T (ptr) ); + ACE_OS::free( ACE_MALLOC_T (ptr) ); } #if ACE_CC_YY_MAIN diff --git a/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.cpp b/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.cpp index 314938f9f7e..d9fa497aaf8 100644 --- a/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.cpp +++ b/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.cpp @@ -17,7 +17,7 @@ #include "ace/Read_Buffer.h" #include "ace/OS_NS_sys_time.h" #include "ace/OS_NS_unistd.h" -#include "ace/os_include/os_ctype.h" +#include "ace/OS_NS_ctype.h" #if !defined (__ACE_INLINE__) #include "EC_Mcast.inl" @@ -521,7 +521,7 @@ ECM_Driver::skip_blanks (FILE* file, { int c; // Consume all the blanks. - while (isspace (c = fgetc (file))); + while (ACE_OS::ace_isspace (c = ACE_OS::fgetc (file))); if (c == EOF) { ACE_ERROR_RETURN ((LM_ERROR, @@ -529,7 +529,7 @@ ECM_Driver::skip_blanks (FILE* file, error_msg), -1); } - ungetc (c, file); + ACE_OS::ungetc (c, file); return 0; } // **************************************************************** diff --git a/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.cpp b/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.cpp index 3d90eadbbe0..1538fcf674a 100644 --- a/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.cpp +++ b/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.cpp @@ -97,7 +97,9 @@ print_priority_info (const char *const name) #ifdef sun // Find what scheduling class the thread's LWP is in. + //FUZZ: disable check_for_lack_ACE_OS ACE_Sched_Params sched_params (ACE_SCHED_OTHER, 0); + //FUZZ: enable check_for_lack_ACE_OS if (ACE_OS::lwp_getparams (sched_params) == -1) { ACE_OS::perror ("ACE_OS::lwp_getparams"); @@ -912,7 +914,9 @@ Test_ECG::shutdown_supplier (void* /* supplier_cookie */, return; // We propagate a shutdown event through the system... + //FUZZ: disable check_for_lack_ACE_OS RtecEventComm::EventSet shutdown (1); + //FUZZ: enable check_for_lack_ACE_OS shutdown.length (1); RtecEventComm::Event& s = shutdown[0]; diff --git a/TAO/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/EchoEventConsumerMain.cpp b/TAO/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/EchoEventConsumerMain.cpp index 511f9ba1594..4fc71f48a0c 100644 --- a/TAO/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/EchoEventConsumerMain.cpp +++ b/TAO/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/EchoEventConsumerMain.cpp @@ -25,7 +25,7 @@ int main (int argc, char* argv[]) const char* ecname = "EventService"; for (int i = 0; argv[i] != 0; i++) { - if (strcmp(argv[i], "-ecname") == 0) { + if (ACE_OS::strcmp(argv[i], "-ecname") == 0) { if (argv[i+1] != 0) { ecname = argv[i+1]; } else { diff --git a/TAO/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/EchoEventConsumer_i.cpp b/TAO/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/EchoEventConsumer_i.cpp index 2973fd62445..41cb931c8af 100644 --- a/TAO/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/EchoEventConsumer_i.cpp +++ b/TAO/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/EchoEventConsumer_i.cpp @@ -6,6 +6,7 @@ #include "EchoEventConsumer_i.h" #include "tao/PortableServer/PS_CurrentC.h" #include "ace/OS_NS_stdio.h" +#include "ace/OS_NS_unistd.h" #include <sstream> @@ -27,8 +28,9 @@ void EchoEventConsumer_i::push(const RtecEventComm::EventSet& events) // Extract event data from the any. const char* eventData; std::ostringstream out; + #ifndef ACE_LACKS_GETPID - out << "[" << getpid(); + out << "[" << ACE_OS::getpid(); #endif out << "] Received event," << " type: " << events[i].header.type diff --git a/TAO/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/EchoEventSupplierMain.cpp b/TAO/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/EchoEventSupplierMain.cpp index b1535e20373..fcfb77c03ab 100644 --- a/TAO/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/EchoEventSupplierMain.cpp +++ b/TAO/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/EchoEventSupplierMain.cpp @@ -78,14 +78,14 @@ int main (int argc, char* argv[]) else ACE_ERROR_RETURN ((LM_ERROR, "Missing port\n"), 0); } - else if (strcmp(argv[i], "-iorfile") == 0) + else if (ACE_OS::strcmp(argv[i], "-iorfile") == 0) { if (argv[i+1] != 0) iorfile = argv[++i]; else ACE_ERROR_RETURN ((LM_ERROR, "Missing ior file\n"), 0); } - else if (strcmp(argv[i], "-udp") == 0) + else if (ACE_OS::strcmp(argv[i], "-udp") == 0) mcast = 0; } diff --git a/TAO/orbsvcs/tests/Event/Mcast/Two_Way/application.cpp b/TAO/orbsvcs/tests/Event/Mcast/Two_Way/application.cpp index 42b615358aa..7e6e19b4b63 100644 --- a/TAO/orbsvcs/tests/Event/Mcast/Two_Way/application.cpp +++ b/TAO/orbsvcs/tests/Event/Mcast/Two_Way/application.cpp @@ -58,10 +58,12 @@ public: void init (CORBA::ORB_var orb, RtecEventChannelAdmin::EventChannel_var ec); + //FUZZ: disable check_for_lack_ACE_OS // No-op if the object hasn't been fully initialized. Otherwise, // deregister from reactor and poa, destroy ec or just disconnect from it // (based on <destroy_ec> flag), and shut down the orb. void shutdown (void); + //FUZZ: enable check_for_lack_ACE_OS /// Send another heartbeat or, if we already sent/attempted the required /// number of heartbeats, perform shutdown(). diff --git a/TAO/orbsvcs/tests/FT_App/FT_Client.cpp b/TAO/orbsvcs/tests/FT_App/FT_Client.cpp index 10cc9236643..335b3034549 100644 --- a/TAO/orbsvcs/tests/FT_App/FT_Client.cpp +++ b/TAO/orbsvcs/tests/FT_App/FT_Client.cpp @@ -250,7 +250,7 @@ int FTClientMain::pass ( char op = command[0]; ACE_CString cdr = command.substr(1); char * junque; - long operand = strtol(cdr.c_str(),&junque, 10); + long operand = ACE_OS::strtol(cdr.c_str(),&junque, 10); if (this->verbose_ >= NOISY) { diff --git a/TAO/orbsvcs/tests/FT_App/FT_Creator.cpp b/TAO/orbsvcs/tests/FT_App/FT_Creator.cpp index e46dd521bb3..0566e428b96 100644 --- a/TAO/orbsvcs/tests/FT_App/FT_Creator.cpp +++ b/TAO/orbsvcs/tests/FT_App/FT_Creator.cpp @@ -108,7 +108,9 @@ FTAPP::FT_Creator::parse_args (int argc, char *argv[]) if ( this->create_roles_.size() == 0 && this->unregister_roles_.size() == 0) { + //FUZZ: disable check_for_lack_ACE_OS ACE_OS::fprintf (stderr, "Creator: neither create (-t) nor kill (-u) specified. Nothing to do.\n"); + //FUZZ: enable check_for_lack_ACE_OS usage (stderr); result = -1; } @@ -195,12 +197,12 @@ int FTAPP::FT_Creator::run (void) this->prefix_, role, this->iogr_seq_); - FILE * iogr_file = fopen (iogr_filename, "w"); + FILE * iogr_file = ACE_OS::fopen (iogr_filename, "w"); if (iogr_file != 0) { char const * siogr = static_cast<const char *> (iogr.in ()); - fwrite (siogr, 1, strlen(siogr), iogr_file); - fclose (iogr_file); + ACE_OS::fwrite (siogr, 1, ACE_OS::strlen(siogr), iogr_file); + ACE_OS::fclose (iogr_file); } else { diff --git a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/client.cpp b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/client.cpp index 91a2c2d10d4..bab602eb912 100644 --- a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/client.cpp +++ b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/client.cpp @@ -104,7 +104,7 @@ main (int argc, char *argv[]) CORBA::String_var marshaled_obj_snapshot2 = orb->object_to_string (server.in ()); - if (strcmp (marshaled_obj_snapshot1.in (), marshaled_obj_snapshot2.in ()) == 0) + if (ACE_OS::strcmp (marshaled_obj_snapshot1.in (), marshaled_obj_snapshot2.in ()) == 0) { // Error, before and after the marhaled object references look equal ACE_ERROR ((LM_ERROR, diff --git a/TAO/orbsvcs/tests/FtRtEvent/PushConsumer.cpp b/TAO/orbsvcs/tests/FtRtEvent/PushConsumer.cpp index 09440fb3def..1cbdb689a45 100644 --- a/TAO/orbsvcs/tests/FtRtEvent/PushConsumer.cpp +++ b/TAO/orbsvcs/tests/FtRtEvent/PushConsumer.cpp @@ -3,7 +3,7 @@ #include "ace/OS_NS_sys_time.h" #include "PushConsumer.h" #include "orbsvcs/FtRtEvent/Utils/resolve_init.h" -#include <stdio.h> +#include "ace/OS_NS_stdio.h" ACE_RCSID (FtRtEvent, PushConsumer, @@ -26,7 +26,7 @@ PushConsumer_impl::push (const RtecEventComm::EventSet & event TimeBase::TimeT elaps = time_val.sec () * 10000000 + time_val.usec ()* 10 - event[0].header.ec_send_time; event[0].data.any_value >>= x; - printf("Received data : %d, single trip time = %d usec\n", x, static_cast<int> (elaps/10)); + ACE_OS::printf("Received data : %d, single trip time = %d usec\n", x, static_cast<int> (elaps/10)); } } diff --git a/TAO/orbsvcs/tests/InterfaceRepo/IFR_Inheritance_Test/main.cpp b/TAO/orbsvcs/tests/InterfaceRepo/IFR_Inheritance_Test/main.cpp index b4946c34c67..d70b668d55f 100644 --- a/TAO/orbsvcs/tests/InterfaceRepo/IFR_Inheritance_Test/main.cpp +++ b/TAO/orbsvcs/tests/InterfaceRepo/IFR_Inheritance_Test/main.cpp @@ -28,14 +28,14 @@ void printContents( const CORBA::ContainedSeq& cont ) //printf( "-- %s:\n", (const char*)(desc->name) ); for( unsigned int j1=0; j1 < desc->operations.length (); j1++ ) - printf( "operation %s::%s\n", - (const char*)(desc->name), - (const char*)((desc->operations[j1]).name) ); + ACE_OS::printf( "operation %s::%s\n", + (const char*)(desc->name), + (const char*)((desc->operations[j1]).name) ); for( unsigned int j2=0; j2 < desc->attributes.length (); j2++ ) - printf( "attribute %s::%s\n", - (const char*)(desc->name), - (const char*)((desc->attributes[j2]).name) ); + ACE_OS::printf( "attribute %s::%s\n", + (const char*)(desc->name), + (const char*)((desc->attributes[j2]).name) ); } else if( cont[i]->describe ()->kind == CORBA::dk_Module ) { diff --git a/TAO/orbsvcs/tests/Interoperable_Naming/ncontextext_client_i.cpp b/TAO/orbsvcs/tests/Interoperable_Naming/ncontextext_client_i.cpp index 47a07134c43..cbeb4324271 100644 --- a/TAO/orbsvcs/tests/Interoperable_Naming/ncontextext_client_i.cpp +++ b/TAO/orbsvcs/tests/Interoperable_Naming/ncontextext_client_i.cpp @@ -23,6 +23,7 @@ #include "tao/debug.h" #include "ace/Get_Opt.h" #include "ace/Read_Buffer.h" +#include "ace/OS_NS_time.h" // FUZZ: disable check_for_streams_include #include "ace/streams.h" @@ -79,7 +80,7 @@ NContextExt_Client_i::get_name () { // USe time (NULL) to produce the seed: - srand (time (0)); + ACE_OS::srand (ACE_OS::time (0)); const int len = 10; char *name_component = CORBA::string_alloc (len); @@ -89,7 +90,7 @@ NContextExt_Client_i::get_name () for (int i = 0; i < len; ++i) { - int rand_value = rand () % 10; + int rand_value = ACE_OS::rand () % 10; switch (rand_value) { @@ -131,7 +132,7 @@ NContextExt_Client_i::get_name () case 7: case 8: case 9: - *name_componentPtr = 'A' + ( rand () % 26 ); + *name_componentPtr = 'A' + ( ACE_OS::rand () % 26 ); ++name_componentPtr; break; diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/LB_server.cpp b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/LB_server.cpp index 897fcb345a1..e547be63252 100644 --- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/LB_server.cpp +++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/LB_server.cpp @@ -202,7 +202,7 @@ LB_server::remove_basic_member (void) this->lm_->remove_member (this->basic_object_group_.in (), location); - printf("Removed Basic Member at location %s\n\n", loc); + ACE_OS::printf("Removed Basic Member at location %s\n\n", loc); } catch (const CORBA::Exception& ex) { @@ -228,7 +228,7 @@ LB_server::remove_simple_member (void) this->lm_->remove_member (this->simple_object_group_.in (), location); - printf("Removed Simple Member at location %s\n\n", loc); + ACE_OS::printf("Removed Simple Member at location %s\n\n", loc); } catch (const CORBA::Exception& ex) { @@ -259,7 +259,7 @@ LB_server::register_basic_servant (Basic *servant, const char *loc) CORBA::Short number = 0; number = servant->number (); - printf("Added Basic member %d at location %s\n", number, loc); + ACE_OS::printf("Added Basic member %d at location %s\n", number, loc); } catch (const CORBA::Exception& ex) { @@ -290,7 +290,7 @@ LB_server::register_simple_servant (Simple *servant, const char *loc) CORBA::Short number = 0; number = servant->number (); - printf("Added Simple member %d at location %s\n", number, loc); + ACE_OS::printf("Added Simple member %d at location %s\n", number, loc); } catch (const CORBA::Exception& ex) { diff --git a/TAO/orbsvcs/tests/Notify/Reconnecting/Consumer.cpp b/TAO/orbsvcs/tests/Notify/Reconnecting/Consumer.cpp index 28e30ac982b..184c9b546fb 100644 --- a/TAO/orbsvcs/tests/Notify/Reconnecting/Consumer.cpp +++ b/TAO/orbsvcs/tests/Notify/Reconnecting/Consumer.cpp @@ -181,8 +181,8 @@ StructuredPushConsumer_i::push_structured_event ( )); } } - else if (0 == ACE_OS::strcmp (notification.header.fixed_header.event_type.type_name, "%ANY") - && 0 == strcmp (notification.header.fixed_header.event_type.domain_name, "")) + else if (0 == ACE_OS::strcmp (notification.header.fixed_header.event_type.type_name, "%ANY") && + 0 == ACE_OS::strcmp (notification.header.fixed_header.event_type.domain_name, "")) { const CORBA::Any * any; if (notification.remainder_of_body >>= any) @@ -406,8 +406,8 @@ SequencePushConsumer_i::push_structured_events ( )); } } - else if (0 == ACE_OS::strcmp (notification.header.fixed_header.event_type.type_name, "%ANY") - && 0 == strcmp (notification.header.fixed_header.event_type.domain_name, "")) + else if (0 == ACE_OS::strcmp (notification.header.fixed_header.event_type.type_name, "%ANY") && + 0 == ACE_OS::strcmp (notification.header.fixed_header.event_type.domain_name, "")) { CORBA::ULong seq = 0; if (notification.remainder_of_body >>= seq) @@ -856,6 +856,7 @@ Consumer_Main::parse_single_arg (int argc, char *argv[]) void Consumer_Main::usage(FILE * out)const { + //FUZZ: disable check_for_lack_ACE_OS ACE_OS::fputs ( ACE_TEXT ("usage\n") ACE_TEXT (" -channel filename Where to find a channel number.\n") @@ -869,6 +870,7 @@ void Consumer_Main::usage(FILE * out)const ACE_TEXT (" -disconnect Disconnect from channel on exit (prevents reconnect.) \n") ACE_TEXT (" -nonamesvc Don't use the name service to find EventChannelFactory\n") , out); + //FUZZ: enable check_for_lack_ACE_OS } int Consumer_Main::init (int argc, char *argv[]) @@ -1275,7 +1277,7 @@ Consumer_Main::init_event_channel (void) if (chf != 0) { ACE_OS::fprintf (chf, "%d\n", static_cast<int> (this->ec_id_)); - fclose (chf); + ACE_OS::fclose (chf); } } } diff --git a/TAO/orbsvcs/tests/Notify/Reconnecting/Supplier.cpp b/TAO/orbsvcs/tests/Notify/Reconnecting/Supplier.cpp index 094db654538..df7edd2aae6 100644 --- a/TAO/orbsvcs/tests/Notify/Reconnecting/Supplier.cpp +++ b/TAO/orbsvcs/tests/Notify/Reconnecting/Supplier.cpp @@ -300,6 +300,7 @@ Supplier_Main::parse_single_arg (int argc, char *argv[]) void Supplier_Main::usage(FILE * log)const { + //FUZZ: disable check_for_lack_ACE_OS ACE_OS::fputs ( ACE_TEXT ("usage\n") ACE_TEXT (" -channel filename Where to find a channel number.\n") @@ -312,6 +313,7 @@ void Supplier_Main::usage(FILE * log)const ACE_TEXT (" -disconnect Disconnect from channel on exit (prevents reconnect.) \n") ACE_TEXT (" -nonamesvc Don't use the name service to find EventChannelFactory\n") , log); + //FUZZ: enable check_for_lack_ACE_OS } int Supplier_Main::init (int argc, char *argv[]) @@ -677,7 +679,7 @@ Supplier_Main::init_event_channel (void) if (chf != 0) { ACE_OS::fprintf (chf, "%d\n", static_cast<int> (this->ec_id_)); - fclose (chf); + ACE_OS::fclose (chf); } } } diff --git a/TAO/orbsvcs/tests/Notify/Structured_Filter/Structured_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Structured_Filter/Structured_Consumer.cpp index d8cc6198789..0a99d90c3f0 100644 --- a/TAO/orbsvcs/tests/Notify/Structured_Filter/Structured_Consumer.cpp +++ b/TAO/orbsvcs/tests/Notify/Structured_Filter/Structured_Consumer.cpp @@ -37,7 +37,7 @@ Consumer_Client::parse_args (int argc, char *argv[]) switch (x) { case 'e': - numEvents = atoi (get_opts.optarg); + numEvents = ACE_OS::atoi (get_opts.optarg); break; case 'f': diff --git a/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Structured_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Structured_Consumer.cpp index 9a06127d352..ecda07e9a39 100644 --- a/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Structured_Consumer.cpp +++ b/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Structured_Consumer.cpp @@ -38,7 +38,7 @@ Consumer_Client::parse_args (int argc, char *argv[]) switch (x) { case 'e': - numEvents = atoi (get_opts.optarg); + numEvents = ACE_OS::atoi (get_opts.optarg); break; case 'f': diff --git a/TAO/orbsvcs/tests/Notify/XML_Persistence/main.cpp b/TAO/orbsvcs/tests/Notify/XML_Persistence/main.cpp index 508cc88b296..dde747a17d9 100644 --- a/TAO/orbsvcs/tests/Notify/XML_Persistence/main.cpp +++ b/TAO/orbsvcs/tests/Notify/XML_Persistence/main.cpp @@ -91,10 +91,10 @@ int main(int ac, char **av) if (! pass1 && !pass2) { FILE *f; - f = fopen ("loadtest.xml", "r"); + f = ACE_OS::fopen ("loadtest.xml", "r"); if (f != 0) { - fclose (f); + ACE_OS::fclose (f); pass1 = false; pass2 = true; } diff --git a/TAO/orbsvcs/tests/RTCosScheduling/client.cpp b/TAO/orbsvcs/tests/RTCosScheduling/client.cpp index edaf7ed145d..3f0b7654b74 100644 --- a/TAO/orbsvcs/tests/RTCosScheduling/client.cpp +++ b/TAO/orbsvcs/tests/RTCosScheduling/client.cpp @@ -151,8 +151,8 @@ int svc(void) { return 1; } - if (strcmp(activity_,"Client2") == 0 - || strcmp(activity_,"Client3") == 0) + if (ACE_OS::strcmp(activity_,"Client2") == 0 || + ACE_OS::strcmp(activity_,"Client3") == 0) { ACE_OS::sleep(1); } diff --git a/TAO/orbsvcs/tests/RTCosScheduling/server.cpp b/TAO/orbsvcs/tests/RTCosScheduling/server.cpp index f4b6a475d5e..0c572f33c66 100644 --- a/TAO/orbsvcs/tests/RTCosScheduling/server.cpp +++ b/TAO/orbsvcs/tests/RTCosScheduling/server.cpp @@ -42,7 +42,8 @@ ORB_Thread(CORBA::ORB_var orb) : orb_(orb) } int -svc(void) { +svc(void) +{ try { @@ -54,7 +55,7 @@ svc(void) { return 1; } - exit(0); + ACE_OS::exit(0); return 0; } diff --git a/TAO/orbsvcs/tests/Redundant_Naming/client.cpp b/TAO/orbsvcs/tests/Redundant_Naming/client.cpp index 142dc77809f..e2bc46925d8 100644 --- a/TAO/orbsvcs/tests/Redundant_Naming/client.cpp +++ b/TAO/orbsvcs/tests/Redundant_Naming/client.cpp @@ -100,7 +100,7 @@ main (int argc, ACE_TCHAR **argv) { ACE_ERROR((LM_ERROR, ACE_TEXT ("Invalid breath, must be 2 or more\n"))); - exit(1); + ACE_OS::exit(1); } c_breath = i; break; @@ -110,7 +110,7 @@ main (int argc, ACE_TCHAR **argv) { ACE_ERROR((LM_ERROR, ACE_TEXT ("Invalid depth, must be 2 or more\n"))); - exit(1); + ACE_OS::exit(1); } c_depth = i; break; @@ -120,7 +120,7 @@ main (int argc, ACE_TCHAR **argv) { ACE_ERROR((LM_ERROR, ACE_TEXT ("Invalid breath, must be 2 or more\n"))); - exit(1); + ACE_OS::exit(1); } o_breath = i; break; diff --git a/TAO/orbsvcs/tests/Sched/DynSched_Test.cpp b/TAO/orbsvcs/tests/Sched/DynSched_Test.cpp index fe06daf6ba8..b711f653685 100644 --- a/TAO/orbsvcs/tests/Sched/DynSched_Test.cpp +++ b/TAO/orbsvcs/tests/Sched/DynSched_Test.cpp @@ -101,7 +101,7 @@ DynSched_Test::register_rt_info (ACE_DynScheduler &scheduler, ACE_DynScheduler::SUCCEEDED) { result = 1; - printf ("Could not register info for \"%s\"\n", info.entry_point.in ()); + ACE_OS::printf ("Could not register info for \"%s\"\n", info.entry_point.in ()); } return result; @@ -277,9 +277,9 @@ main (int, char *[]) "RMS Scheduling Strategy"); if (result < 0) { - printf ("run_schedule (rms_strategy, \"RMS_Timelines\", " - "\"RMS Scheduling Strategy\") returned %d\n", - result); + ACE_OS::printf ("run_schedule (rms_strategy, \"RMS_Timelines\", " + "\"RMS Scheduling Strategy\") returned %d\n", + result); return 1; } @@ -288,9 +288,9 @@ main (int, char *[]) "MLF Scheduling Strategy"); if (result < 0) { - printf ("run_schedule (mlf_strategy, \"MLF_Timelines\", " - "\"MLF Scheduling Strategy\") returned %d\n", - result); + ACE_OS::printf ("run_schedule (mlf_strategy, \"MLF_Timelines\", " + "\"MLF Scheduling Strategy\") returned %d\n", + result); return 1; } @@ -299,9 +299,9 @@ main (int, char *[]) "EDF Scheduling Strategy"); if (result < 0) { - printf ("run_schedule (edf_strategy, \"EDF_Timelines\", " - "\"EDF Scheduling Strategy\") returned %d\n", - result); + ACE_OS::printf ("run_schedule (edf_strategy, \"EDF_Timelines\", " + "\"EDF Scheduling Strategy\") returned %d\n", + result); return 1; } @@ -310,9 +310,9 @@ main (int, char *[]) "MUF Scheduling Strategy"); if (result < 0) { - printf ("run_schedule (muf_strategy, \"MUF_Timelines\", " - "\"MUF Scheduling Strategy\") returned %d\n", - result); + ACE_OS::printf ("run_schedule (muf_strategy, \"MUF_Timelines\", " + "\"MUF Scheduling Strategy\") returned %d\n", + result); return 1; } diff --git a/TAO/orbsvcs/tests/Security/EndpointPolicy/test.cpp b/TAO/orbsvcs/tests/Security/EndpointPolicy/test.cpp index 4e05e598c06..ae351becf32 100644 --- a/TAO/orbsvcs/tests/Security/EndpointPolicy/test.cpp +++ b/TAO/orbsvcs/tests/Security/EndpointPolicy/test.cpp @@ -26,7 +26,7 @@ parse_args (int argc, char *argv[]) { endpoint_port = ACE_OS::atoi (argv[++c]); } - else if (strstr(argv[c],"-ORB") == argv[c]) + else if (ACE_OS::strstr(argv[c],"-ORB") == argv[c]) { c++; continue; diff --git a/TAO/orbsvcs/tests/Security/InsecureReferences/test.cpp b/TAO/orbsvcs/tests/Security/InsecureReferences/test.cpp index 38585b67cd0..2119425d950 100644 --- a/TAO/orbsvcs/tests/Security/InsecureReferences/test.cpp +++ b/TAO/orbsvcs/tests/Security/InsecureReferences/test.cpp @@ -29,7 +29,7 @@ parse_args (int argc, char *argv[]) { endpoint_port = ACE_OS::atoi (argv[++c]); } - else if (strstr(argv[c],"-ORB") == argv[c]) + else if (ACE_OS::strstr(argv[c],"-ORB") == argv[c]) { c++; continue; |