summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--TAO/TAO_IDL/driver/drv_args.cpp2
-rw-r--r--TAO/TAO_IDL/driver/drv_init.cpp8
-rw-r--r--TAO/TAO_IDL/driver/drv_preproc.cpp4
-rw-r--r--TAO/TAO_IDL/tao_idl.cpp2
4 files changed, 10 insertions, 6 deletions
diff --git a/TAO/TAO_IDL/driver/drv_args.cpp b/TAO/TAO_IDL/driver/drv_args.cpp
index dfe527f53dc..0fb92d85894 100644
--- a/TAO/TAO_IDL/driver/drv_args.cpp
+++ b/TAO/TAO_IDL/driver/drv_args.cpp
@@ -413,7 +413,7 @@ DRV_usage (void)
));
ACE_DEBUG ((
LM_DEBUG,
- ACE_TEXT (" -v\t\t\ttraces compilation stages\n")
+ ACE_TEXT (" -v\t\t\ttraces compilation stages\n")
));
ACE_DEBUG ((
LM_DEBUG,
diff --git a/TAO/TAO_IDL/driver/drv_init.cpp b/TAO/TAO_IDL/driver/drv_init.cpp
index c3fb13d9423..47decd3d200 100644
--- a/TAO/TAO_IDL/driver/drv_init.cpp
+++ b/TAO/TAO_IDL/driver/drv_init.cpp
@@ -73,6 +73,8 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
ACE_RCSID(driver, drv_init, "$Id$")
+const size_t LOCAL_ESCAPES_BUFFER_SIZE = 1024;
+
void
DRV_init (void)
{
@@ -105,8 +107,10 @@ DRV_init (void)
idl_global->set_cpp_location ("cc");
#endif /* TAO_IDL_PREPROCESSOR */
- char local_escapes[1024];
- ACE_OS::memset (&local_escapes, 0, 1024);
+ char local_escapes[LOCAL_ESCAPES_BUFFER_SIZE];
+ ACE_OS::memset (&local_escapes,
+ 0,
+ LOCAL_ESCAPES_BUFFER_SIZE);
idl_global->set_local_escapes (local_escapes);
idl_global->set_be ("");
diff --git a/TAO/TAO_IDL/driver/drv_preproc.cpp b/TAO/TAO_IDL/driver/drv_preproc.cpp
index a1a2b647879..9af03d1a6ab 100644
--- a/TAO/TAO_IDL/driver/drv_preproc.cpp
+++ b/TAO/TAO_IDL/driver/drv_preproc.cpp
@@ -497,7 +497,7 @@ DRV_pre_proc (const char *myfile)
cpp_options.set_handles (ACE_INVALID_HANDLE, fd);
- if (process.spawn (cpp_options) == -1)
+ if (process.spawn (cpp_options) == ACE_INVALID_PID)
{
ACE_ERROR ((LM_ERROR,
ACE_TEXT (idl_global->prog_name ()),
@@ -525,7 +525,7 @@ DRV_pre_proc (const char *myfile)
argcount -= 2;
ACE_exitcode status = 0;
- if (process.wait (&status) == -1)
+ if (process.wait (&status) == ACE_INVALID_PID)
{
ACE_ERROR ((LM_ERROR,
ACE_TEXT (idl_global->prog_name ()),
diff --git a/TAO/TAO_IDL/tao_idl.cpp b/TAO/TAO_IDL/tao_idl.cpp
index 3789c57ccd4..efe43996be6 100644
--- a/TAO/TAO_IDL/tao_idl.cpp
+++ b/TAO/TAO_IDL/tao_idl.cpp
@@ -139,7 +139,7 @@ DRV_fork (void)
ACE_OS::exit (0);
}
- if (child_pid == -1)
+ if (child_pid == ACE_INVALID_PID)
{
ACE_ERROR ((LM_ERROR,
ACE_TEXT ("IDL: spawn failed\n")));