diff options
author | parsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2001-12-05 18:31:06 +0000 |
---|---|---|
committer | parsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2001-12-05 18:31:06 +0000 |
commit | 7b5cb95a0278d375a0e75660f94ddd955879689f (patch) | |
tree | d8cdd5a953fdd56a7958088be2606fdeeed265a4 /TAO | |
parent | 7b07babe7466237a23498679740d311193d96cf1 (diff) | |
download | ATCD-7b5cb95a0278d375a0e75660f94ddd955879689f.tar.gz |
ChangeLogTag: Wed Dec 5 12:17:50 2001 Jeff Parsons <parsons@cs.wustl.edu>
Diffstat (limited to 'TAO')
-rw-r--r-- | TAO/TAO_IDL/driver/drv_args.cpp | 8 | ||||
-rw-r--r-- | TAO/TAO_IDL/driver/drv_preproc.cpp | 48 | ||||
-rw-r--r-- | TAO/orbsvcs/IFR_Service/drv_args_ifr.cpp | 4 | ||||
-rw-r--r-- | TAO/orbsvcs/IFR_Service/drv_preproc_ifr.cpp | 46 |
4 files changed, 53 insertions, 53 deletions
diff --git a/TAO/TAO_IDL/driver/drv_args.cpp b/TAO/TAO_IDL/driver/drv_args.cpp index d9f7c1565a7..85c40b3a79f 100644 --- a/TAO/TAO_IDL/driver/drv_args.cpp +++ b/TAO/TAO_IDL/driver/drv_args.cpp @@ -179,9 +179,9 @@ DRV_prep_be_arg (char *s, else { ACE_ERROR ((LM_ERROR, - ACE_TEXT (idl_global->prog_name ()), + idl_global->prog_name (), ACE_TEXT (": invalid or unknown argument <"), - ACE_TEXT (arg), + arg, ACE_TEXT ("> to back end\n"))); } } @@ -192,9 +192,9 @@ void DRV_usage (void) { ACE_DEBUG ((LM_DEBUG, - ACE_TEXT (idl_global->prog_name ()), + idl_global->prog_name (), ACE_TEXT (": usage: "), - ACE_TEXT (idl_global->prog_name ()), + idl_global->prog_name (), ACE_TEXT (" [flag | file]*\n"))); ACE_DEBUG ((LM_DEBUG, diff --git a/TAO/TAO_IDL/driver/drv_preproc.cpp b/TAO/TAO_IDL/driver/drv_preproc.cpp index 302c7257b3c..9c63284c95d 100644 --- a/TAO/TAO_IDL/driver/drv_preproc.cpp +++ b/TAO/TAO_IDL/driver/drv_preproc.cpp @@ -99,7 +99,7 @@ DRV_cpp_putarg (const char *str) { ACE_ERROR ((LM_ERROR, "%s%s %d %s\n", - ACE_TEXT (idl_global->prog_name ()), + idl_global->prog_name (), ACE_TEXT (": More than"), max_argcount, ACE_TEXT ("arguments to preprocessor"))); @@ -345,9 +345,9 @@ DRV_copy_input (FILE *fin, { ACE_ERROR ((LM_ERROR, "%s%s%s%s", - ACE_TEXT (idl_global->prog_name ()), + idl_global->prog_name (), ACE_TEXT (": cannot open temp file "), - ACE_TEXT (fn), + fn, ACE_TEXT (" for writing\n"))); ACE_OS::exit (99); @@ -357,7 +357,7 @@ DRV_copy_input (FILE *fin, { ACE_ERROR ((LM_ERROR, "%s%s", - ACE_TEXT (idl_global->prog_name ()), + idl_global->prog_name (), ACE_TEXT (": cannot open input file\n"))); ACE_OS::exit (99); @@ -543,9 +543,9 @@ DRV_pre_proc (const char *myfile) { ACE_ERROR ((LM_ERROR, "%s%s%s%s", - ACE_TEXT (idl_global->prog_name ()), + idl_global->prog_name (), ACE_TEXT (": cannot open temp file "), - ACE_TEXT (tmp_file), + tmp_file, ACE_TEXT (" for writing\n"))); return; @@ -558,9 +558,9 @@ DRV_pre_proc (const char *myfile) { ACE_ERROR ((LM_ERROR, "%s%s%s%s", - ACE_TEXT (idl_global->prog_name ()), + idl_global->prog_name (), ACE_TEXT (": spawn of "), - ACE_TEXT (arglist[0]), + arglist[0], ACE_TEXT (" failed\n"))); return; @@ -573,9 +573,9 @@ DRV_pre_proc (const char *myfile) { ACE_ERROR ((LM_ERROR, "%s%s%s%s", - ACE_TEXT (idl_global->prog_name ()), + idl_global->prog_name (), ACE_TEXT (": cannot close temp file"), - ACE_TEXT (tmp_file), + tmp_file, ACE_TEXT (" on parent\n"))); return; @@ -591,7 +591,7 @@ DRV_pre_proc (const char *myfile) { ACE_ERROR ((LM_ERROR, "%s%s", - ACE_TEXT (idl_global->prog_name ()), + idl_global->prog_name (), ACE_TEXT (": wait for child process failed\n"))); return; @@ -606,9 +606,9 @@ DRV_pre_proc (const char *myfile) ACE_ERROR ((LM_ERROR, "%s%s%s%s", - ACE_TEXT (idl_global->prog_name ()), + idl_global->prog_name (), ACE_TEXT (": preprocessor "), - ACE_TEXT (arglist[0]), + arglist[0], ACE_TEXT (" returned with an error\n"))); ACE_OS::exit (1); @@ -621,9 +621,9 @@ DRV_pre_proc (const char *myfile) ACE_ERROR ((LM_ERROR, "%s%s%s%s", - ACE_TEXT (idl_global->prog_name ()), + idl_global->prog_name (), ACE_TEXT (": preprocessor "), - ACE_TEXT (arglist[0]), + arglist[0], ACE_TEXT (" appears to have been interrupted\n"))); ACE_OS::exit (1); @@ -638,9 +638,9 @@ DRV_pre_proc (const char *myfile) { ACE_ERROR ((LM_ERROR, "%s%s %s\n", - ACE_TEXT (idl_global->prog_name ()), + idl_global->prog_name (), ACE_TEXT (": Could not open cpp output file"), - ACE_TEXT (tmp_file))); + tmp_file)); ACE_OS::exit (99); } @@ -653,12 +653,12 @@ DRV_pre_proc (const char *myfile) char buffer[ACE_Log_Record::MAXLOGMSGLEN]; int bytes; - if (preproc == NULL) + if (preproc == 0) { ACE_ERROR ((LM_ERROR, "%s: Could not open cpp output file: %s\n", - ACE_TEXT (idl_global->prog_name ()), - ACE_TEXT (tmp_file))); + idl_global->prog_name (), + tmp_file)); ACE_OS::exit (99); } @@ -692,9 +692,9 @@ DRV_pre_proc (const char *myfile) { ACE_ERROR ((LM_ERROR, "%s%s %s\n", - ACE_TEXT (idl_global->prog_name ()), + idl_global->prog_name (), ACE_TEXT (": Could not remove cpp input file"), - ACE_TEXT (tmp_ifile))); + tmp_ifile)); ACE_OS::exit (99); } @@ -704,9 +704,9 @@ DRV_pre_proc (const char *myfile) { ACE_ERROR ((LM_ERROR, "%s%s %s\n", - ACE_TEXT (idl_global->prog_name ()), + idl_global->prog_name (), ACE_TEXT (": Could not remove cpp output file"), - ACE_TEXT (tmp_file))); + tmp_file)); ACE_OS::exit (99); } diff --git a/TAO/orbsvcs/IFR_Service/drv_args_ifr.cpp b/TAO/orbsvcs/IFR_Service/drv_args_ifr.cpp index ba1bca896a3..99082592553 100644 --- a/TAO/orbsvcs/IFR_Service/drv_args_ifr.cpp +++ b/TAO/orbsvcs/IFR_Service/drv_args_ifr.cpp @@ -22,9 +22,9 @@ void DRV_usage (void) { ACE_DEBUG ((LM_DEBUG, - ACE_TEXT (idl_global->prog_name ()), + idl_global->prog_name (), ACE_TEXT (": usage: "), - ACE_TEXT (idl_global->prog_name ()), + idl_global->prog_name (), ACE_TEXT (" [flag | file]*\n"))); ACE_DEBUG ((LM_DEBUG, diff --git a/TAO/orbsvcs/IFR_Service/drv_preproc_ifr.cpp b/TAO/orbsvcs/IFR_Service/drv_preproc_ifr.cpp index 974286915c1..82df42f8f81 100644 --- a/TAO/orbsvcs/IFR_Service/drv_preproc_ifr.cpp +++ b/TAO/orbsvcs/IFR_Service/drv_preproc_ifr.cpp @@ -97,7 +97,7 @@ DRV_cpp_putarg (const char *str) { ACE_ERROR ((LM_ERROR, "%s%s %d %s\n", - ACE_TEXT (idl_global->prog_name ()), + idl_global->prog_name (), ACE_TEXT (": More than"), max_argcount, ACE_TEXT ("arguments to preprocessor"))); @@ -288,9 +288,9 @@ DRV_copy_input (FILE *fin, if (f == NULL) { ACE_ERROR ((LM_ERROR, - ACE_TEXT (idl_global->prog_name ()), + idl_global->prog_name (), ACE_TEXT (": cannot open temp file "), - ACE_TEXT (fn), + fn, ACE_TEXT (" for writing\n"))); ACE_OS::exit (99); @@ -299,7 +299,7 @@ DRV_copy_input (FILE *fin, if (fin == NULL) { ACE_ERROR ((LM_ERROR, - ACE_TEXT (idl_global->prog_name ()), + idl_global->prog_name (), ACE_TEXT (": cannot open input file\n"))); ACE_OS::exit (99); @@ -483,9 +483,9 @@ DRV_pre_proc (const char *myfile) if (fd == ACE_INVALID_HANDLE) { ACE_ERROR ((LM_ERROR, - ACE_TEXT (idl_global->prog_name ()), + idl_global->prog_name (), ACE_TEXT (": cannot open temp file "), - ACE_TEXT (tmp_file), + tmp_file, ACE_TEXT (" for writing\n"))); return; @@ -496,9 +496,9 @@ DRV_pre_proc (const char *myfile) if (process.spawn (cpp_options) == ACE_INVALID_PID) { ACE_ERROR ((LM_ERROR, - ACE_TEXT (idl_global->prog_name ()), + idl_global->prog_name (), ACE_TEXT (": spawn of "), - ACE_TEXT (arglist[0]), + arglist[0], ACE_TEXT (" failed\n"))); return; @@ -508,9 +508,9 @@ DRV_pre_proc (const char *myfile) if (ACE_OS::close (fd) == -1) { ACE_ERROR ((LM_ERROR, - ACE_TEXT (idl_global->prog_name ()), + idl_global->prog_name (), ACE_TEXT (": cannot close temp file"), - ACE_TEXT (tmp_file), + tmp_file, ACE_TEXT (" on parent\n"))); return; @@ -524,7 +524,7 @@ DRV_pre_proc (const char *myfile) if (process.wait (&status) == ACE_INVALID_PID) { ACE_ERROR ((LM_ERROR, - ACE_TEXT (idl_global->prog_name ()), + idl_global->prog_name (), ACE_TEXT (": wait for child process failed\n"))); return; @@ -538,9 +538,9 @@ DRV_pre_proc (const char *myfile) errno = WEXITSTATUS ((status)); ACE_ERROR ((LM_ERROR, - ACE_TEXT (idl_global->prog_name ()), + idl_global->prog_name (), ACE_TEXT (": preprocessor "), - ACE_TEXT (arglist[0]), + arglist[0], ACE_TEXT (" returned with an error\n"))); ACE_OS::exit (1); @@ -552,9 +552,9 @@ DRV_pre_proc (const char *myfile) errno = EINTR; ACE_ERROR ((LM_ERROR, - ACE_TEXT (idl_global->prog_name ()), + idl_global->prog_name (), ACE_TEXT (": preprocessor "), - ACE_TEXT (arglist[0]), + arglist[0], ACE_TEXT (" appears to have been interrupted\n"))); ACE_OS::exit (1); @@ -569,9 +569,9 @@ DRV_pre_proc (const char *myfile) { ACE_ERROR ((LM_ERROR, "%s%s %s\n", - ACE_TEXT (idl_global->prog_name ()), + idl_global->prog_name (), ACE_TEXT (": Could not open cpp output file"), - ACE_TEXT (tmp_file))); + tmp_file)); ACE_OS::exit (99); } @@ -588,8 +588,8 @@ DRV_pre_proc (const char *myfile) { ACE_ERROR ((LM_ERROR, "%s: Could not open cpp output file: %s\n", - ACE_TEXT (idl_global->prog_name ()), - ACE_TEXT (tmp_file))); + idl_global->prog_name (), + tmp_file)); ACE_OS::exit (99); } @@ -623,9 +623,9 @@ DRV_pre_proc (const char *myfile) { ACE_ERROR ((LM_ERROR, "%s%s %s\n", - ACE_TEXT (idl_global->prog_name ()), + idl_global->prog_name (), ACE_TEXT (": Could not remove cpp input file"), - ACE_TEXT (tmp_ifile))); + tmp_ifile)); ACE_OS::exit (99); } @@ -635,9 +635,9 @@ DRV_pre_proc (const char *myfile) { ACE_ERROR ((LM_ERROR, "%s%s %s\n", - ACE_TEXT (idl_global->prog_name ()), + idl_global->prog_name (), ACE_TEXT (": Could not remove cpp output file"), - ACE_TEXT (tmp_file))); + tmp_file)); ACE_OS::exit (99); } |