summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsma <sma@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2008-06-17 09:31:55 +0000
committersma <sma@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2008-06-17 09:31:55 +0000
commit4ee51486c14b1189b7bc86af2d5b3fd345f19cd3 (patch)
treea700cfda97923a151943c0a958089cca78dbb5d9
parent98aec90fac08ec5394af576f51dc2436bf17703a (diff)
downloadATCD-4ee51486c14b1189b7bc86af2d5b3fd345f19cd3.tar.gz
ChangeLogTag: Tue Jun 17 09:30:00 UTC 2008 Simon Massey <sma at prismtech dot com>
-rw-r--r--TAO/ChangeLog7
-rw-r--r--TAO/TAO_IDL/contrib/mcpp/main.cpp3
-rw-r--r--TAO/TAO_IDL/contrib/mcpp/system.cpp9
3 files changed, 12 insertions, 7 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index ea806157c32..af125cda626 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,10 @@
+Tue Jun 17 09:30:00 UTC 2008 Simon Massey <sma at prismtech dot com>
+
+ * TAO_IDL/contrib/mcpp/main.cpp:
+ * TAO_IDL/contrib/mcpp/system.cpp:
+
+ Fuzz errors, Untabify.
+
Mon Jun 16 18:50:55 UTC 2008 William R. Otte <wotte@dre.vanderbilt.edu>
* MPC/config/tao_idl_mcpp.mpb:
diff --git a/TAO/TAO_IDL/contrib/mcpp/main.cpp b/TAO/TAO_IDL/contrib/mcpp/main.cpp
index 51ca172d0d6..57319071e26 100644
--- a/TAO/TAO_IDL/contrib/mcpp/main.cpp
+++ b/TAO/TAO_IDL/contrib/mcpp/main.cpp
@@ -435,7 +435,7 @@ fatal_error_exit:
if (fp_out != 0)
{
- ACE_OS::fclose (fp_out);
+ ACE_OS::fclose (fp_out);
}
return IO_SUCCESS; /* No errors or -E option set */
}
@@ -1128,4 +1128,3 @@ static char * esc_mbchar(
return str_end;
}
#endif /* ! MBCHAR_IS_ESCAPE_FREE */
-
diff --git a/TAO/TAO_IDL/contrib/mcpp/system.cpp b/TAO/TAO_IDL/contrib/mcpp/system.cpp
index 8cd7d0779ec..479d3ad4bfa 100644
--- a/TAO/TAO_IDL/contrib/mcpp/system.cpp
+++ b/TAO/TAO_IDL/contrib/mcpp/system.cpp
@@ -614,7 +614,7 @@ plus:
case 'F':
if (str_eq( optarg, "l")) { /* -Fl */
if (preinc_end >= &preinclude[ NPREINCLUDE]) {
- ACE_ERROR ((LM_ERROR, "Too many -Fl options\n"));
+ ACE_ERROR ((LM_ERROR, "Too many -Fl options\n"));
mcpp_fputs( "Too many -Fl options.\n", ERR);
longjmp( error_exit, -1);
}
@@ -630,13 +630,13 @@ plus:
if (str_eq( optarg, "nclude")) { /* -include */
if (preinc_end >= &preinclude[ NPREINCLUDE]) {
mcpp_fputs( "Too many -include options.\n", ERR);
- ACE_ERROR((LM_ERROR, "Too many -include options\n"));
+ ACE_ERROR((LM_ERROR, "Too many -include options\n"));
longjmp( error_exit, -1);
}
*preinc_end++ = argv[ optind++];
} else if (str_eq( optarg, "system")) { /* -isystem */
if (sysdir_end >= &sysdir[ NSYSDIR]) {
- ACE_ERROR ((LM_ERROR, "Too many -isystem options\n"));
+ ACE_ERROR ((LM_ERROR, "Too many -isystem options\n"));
mcpp_fputs( "Too many -isystem options.\n", ERR);
longjmp( error_exit, -1);
}
@@ -1344,7 +1344,7 @@ static void usage(
#endif
while (*mpp)
{
- ACE_ERROR ((LM_ERROR, "%s\n", *mpp));
+ ACE_ERROR ((LM_ERROR, "%s\n", *mpp));
mcpp_fputs( *mpp++, ERR);
}
@@ -3803,4 +3803,3 @@ void clear_filelist( void)
ACE_OS::free( (void *) *namep);
}
#endif
-