summaryrefslogtreecommitdiff
path: root/TAO/TAO_IDL/be
diff options
context:
space:
mode:
Diffstat (limited to 'TAO/TAO_IDL/be')
-rw-r--r--TAO/TAO_IDL/be/be_codegen.cpp2
-rw-r--r--TAO/TAO_IDL/be/be_global.cpp63
-rw-r--r--TAO/TAO_IDL/be/be_init.cpp5
-rw-r--r--TAO/TAO_IDL/be/be_produce.cpp2
4 files changed, 38 insertions, 34 deletions
diff --git a/TAO/TAO_IDL/be/be_codegen.cpp b/TAO/TAO_IDL/be/be_codegen.cpp
index e125936f6f2..08c100117a2 100644
--- a/TAO/TAO_IDL/be/be_codegen.cpp
+++ b/TAO/TAO_IDL/be/be_codegen.cpp
@@ -327,7 +327,7 @@ TAO_CodeGen::start_client_header (const char *fname)
else
{
ACE_ERROR_RETURN ((LM_ERROR,
- ACE_TEXT ("\nERROR, invalid file '%C' included"),
+ ACE_TEXT ("\nERROR, invalid file '%s' included"),
idl_name),
-1);
}
diff --git a/TAO/TAO_IDL/be/be_global.cpp b/TAO/TAO_IDL/be/be_global.cpp
index 24f3e133e89..4bd56a2d91c 100644
--- a/TAO/TAO_IDL/be/be_global.cpp
+++ b/TAO/TAO_IDL/be/be_global.cpp
@@ -1674,7 +1674,7 @@ BE_GlobalData::parse_args (long &i, char **av)
// I expect 'c' or 's' or 'I' or 'T' after this.
ACE_ERROR ((
LM_ERROR,
- ACE_TEXT ("IDL: I don't understand the '%C' option\n"),
+ ACE_TEXT ("IDL: I don't understand the '%s' option\n"),
av[i]
));
}
@@ -1690,7 +1690,7 @@ BE_GlobalData::parse_args (long &i, char **av)
ACE_ERROR ((
LM_ERROR,
ACE_TEXT ("IDL: I don't understand")
- ACE_TEXT (" the '%C' option\n"),
+ ACE_TEXT (" the '%s' option\n"),
av[i]
));
}
@@ -1719,7 +1719,7 @@ BE_GlobalData::parse_args (long &i, char **av)
// I expect 's' or 'i' after 'c'.
ACE_ERROR ((
LM_ERROR,
- ACE_TEXT ("IDL: I don't understand the '%C' option\n"),
+ ACE_TEXT ("IDL: I don't understand the '%s' option\n"),
av[i]
));
}
@@ -1765,7 +1765,7 @@ BE_GlobalData::parse_args (long &i, char **av)
// I expect 's' or 'T' or 'i' or 't' after 's'.
ACE_ERROR ((
LM_ERROR,
- ACE_TEXT ("IDL: I don't understand the '%C' option\n"),
+ ACE_TEXT ("IDL: I don't understand the '%s' option\n"),
av[i]
));
}
@@ -1809,7 +1809,7 @@ BE_GlobalData::parse_args (long &i, char **av)
else
{
ACE_ERROR ((LM_ERROR,
- ACE_TEXT ("%C: unknown operation lookup <%C>\n"),
+ ACE_TEXT ("%s: unknown operation lookup <%s>\n"),
av[0],
av[i + 1]));
}
@@ -1831,7 +1831,7 @@ BE_GlobalData::parse_args (long &i, char **av)
{
ACE_ERROR ((
LM_ERROR,
- ACE_TEXT ("IDL: I don't understand the '%C' option\n"),
+ ACE_TEXT ("IDL: I don't understand the '%s' option\n"),
av[i]
));
}
@@ -1859,7 +1859,7 @@ BE_GlobalData::parse_args (long &i, char **av)
ACE_ERROR ((
LM_ERROR,
ACE_TEXT ("IDL: I don't understand")
- ACE_TEXT (" the '%C' option\n"),
+ ACE_TEXT (" the '%s' option\n"),
av[i]
));
}
@@ -1884,7 +1884,7 @@ BE_GlobalData::parse_args (long &i, char **av)
{
ACE_ERROR ((
LM_ERROR,
- ACE_TEXT ("IDL: unable to create directory %C")
+ ACE_TEXT ("IDL: unable to create directory %s")
ACE_TEXT (" specified by -o option\n"),
av[i + 1]
));
@@ -1912,7 +1912,7 @@ BE_GlobalData::parse_args (long &i, char **av)
{
ACE_ERROR ((
LM_ERROR,
- ACE_TEXT ("IDL: unable to create directory %C")
+ ACE_TEXT ("IDL: unable to create directory %s")
ACE_TEXT (" specified by -oA option\n"),
av[i + 1]
));
@@ -1928,7 +1928,7 @@ BE_GlobalData::parse_args (long &i, char **av)
ACE_ERROR ((
LM_ERROR,
ACE_TEXT ("IDL: I don't understand")
- ACE_TEXT (" the '%C' option\n"),
+ ACE_TEXT (" the '%s' option\n"),
av[i]
));
}
@@ -1950,7 +1950,7 @@ BE_GlobalData::parse_args (long &i, char **av)
{
ACE_ERROR ((
LM_ERROR,
- ACE_TEXT ("IDL: unable to create directory %C")
+ ACE_TEXT ("IDL: unable to create directory %s")
ACE_TEXT (" specified by -oS option\n"),
av[i + 1]
));
@@ -1966,7 +1966,7 @@ BE_GlobalData::parse_args (long &i, char **av)
ACE_ERROR ((
LM_ERROR,
ACE_TEXT ("IDL: I don't understand")
- ACE_TEXT (" the '%C' option\n"),
+ ACE_TEXT (" the '%s' option\n"),
av[i]
));
}
@@ -1976,7 +1976,7 @@ BE_GlobalData::parse_args (long &i, char **av)
ACE_ERROR ((
LM_ERROR,
ACE_TEXT ("IDL: I don't understand")
- ACE_TEXT (" the '%C' option\n"),
+ ACE_TEXT (" the '%s' option\n"),
av[i]
));
}
@@ -2027,7 +2027,7 @@ BE_GlobalData::parse_args (long &i, char **av)
ACE_ERROR ((
LM_ERROR,
ACE_TEXT ("IDL: I don't understand ")
- ACE_TEXT ("the '%C' option\n"),
+ ACE_TEXT ("the '%s' option\n"),
av[i]
));
}
@@ -2046,7 +2046,7 @@ BE_GlobalData::parse_args (long &i, char **av)
ACE_ERROR ((
LM_ERROR,
ACE_TEXT ("IDL: I don't understand ")
- ACE_TEXT ("the '%C' option\n"),
+ ACE_TEXT ("the '%s' option\n"),
av[i]
));
}
@@ -2065,7 +2065,7 @@ BE_GlobalData::parse_args (long &i, char **av)
ACE_ERROR ((
LM_ERROR,
ACE_TEXT ("IDL: I don't understand ")
- ACE_TEXT ("the '%C' option\n"),
+ ACE_TEXT ("the '%s' option\n"),
av[i]
));
}
@@ -2083,7 +2083,7 @@ BE_GlobalData::parse_args (long &i, char **av)
ACE_ERROR ((
LM_ERROR,
ACE_TEXT ("IDL: I don't understand ")
- ACE_TEXT ("the '%C' option\n"),
+ ACE_TEXT ("the '%s' option\n"),
av[i]
));
}
@@ -2122,7 +2122,7 @@ BE_GlobalData::parse_args (long &i, char **av)
ACE_ERROR ((
LM_ERROR,
ACE_TEXT ("IDL: I don't understand ")
- ACE_TEXT ("the '%C' option\n"),
+ ACE_TEXT ("the '%s' option\n"),
av[i]
));
}
@@ -2132,7 +2132,7 @@ BE_GlobalData::parse_args (long &i, char **av)
ACE_ERROR ((
LM_ERROR,
ACE_TEXT ("IDL: I don't understand ")
- ACE_TEXT ("the '%C' option\n"),
+ ACE_TEXT ("the '%s' option\n"),
av[i]
));
}
@@ -2147,7 +2147,7 @@ BE_GlobalData::parse_args (long &i, char **av)
ACE_ERROR ((
LM_ERROR,
ACE_TEXT ("IDL: I don't understand ")
- ACE_TEXT ("the '%C' option\n"),
+ ACE_TEXT ("the '%s' option\n"),
av[i]
));
}
@@ -2164,7 +2164,7 @@ BE_GlobalData::parse_args (long &i, char **av)
ACE_ERROR ((
LM_ERROR,
ACE_TEXT ("IDL: I don't understand ")
- ACE_TEXT ("the '%C' option\n"),
+ ACE_TEXT ("the '%s' option\n"),
av[i]
));
}
@@ -2220,7 +2220,7 @@ BE_GlobalData::parse_args (long &i, char **av)
ACE_ERROR ((
LM_ERROR,
ACE_TEXT ("IDL: I don't understand")
- ACE_TEXT (" the '%C' option\n"),
+ ACE_TEXT (" the '%s' option\n"),
av[i]
));
@@ -2235,7 +2235,7 @@ BE_GlobalData::parse_args (long &i, char **av)
{
ACE_ERROR ((
LM_ERROR,
- ACE_TEXT ("IDL: I don't understand the '%C' option\n"),
+ ACE_TEXT ("IDL: I don't understand the '%s' option\n"),
av[i]
));
}
@@ -2293,7 +2293,7 @@ BE_GlobalData::parse_args (long &i, char **av)
{
ACE_ERROR ((
LM_ERROR,
- ACE_TEXT ("IDL: I don't understand the '%C' option\n"),
+ ACE_TEXT ("IDL: I don't understand the '%s' option\n"),
av[i]
));
}
@@ -2314,7 +2314,7 @@ BE_GlobalData::parse_args (long &i, char **av)
{
ACE_ERROR ((
LM_ERROR,
- ACE_TEXT ("IDL: I don't understand the '%C' option\n"),
+ ACE_TEXT ("IDL: I don't understand the '%s' option\n"),
av[i]
));
}
@@ -2335,7 +2335,7 @@ BE_GlobalData::parse_args (long &i, char **av)
{
ACE_ERROR ((
LM_ERROR,
- ACE_TEXT ("IDL: I don't understand the '%C' option\n"),
+ ACE_TEXT ("IDL: I don't understand the '%s' option\n"),
av[i]
));
}
@@ -2350,7 +2350,7 @@ BE_GlobalData::parse_args (long &i, char **av)
{
ACE_ERROR ((
LM_ERROR,
- ACE_TEXT ("IDL: I don't understand the '%C' option\n"),
+ ACE_TEXT ("IDL: I don't understand the '%s' option\n"),
av[i]
));
}
@@ -2359,7 +2359,7 @@ BE_GlobalData::parse_args (long &i, char **av)
default:
ACE_ERROR ((
LM_ERROR,
- ACE_TEXT ("IDL: I don't understand the '%C' option\n"),
+ ACE_TEXT ("IDL: I don't understand the '%s' option\n"),
av[i]
));
@@ -2486,8 +2486,11 @@ BE_GlobalData::prep_be_arg (char *s)
else
{
ACE_ERROR ((LM_ERROR,
- ACE_TEXT ("%C: invalid or unknown argument <%C> to back end\n"),
- idl_global->prog_name (), arg));
+ ACE_TEXT ("%s%s%s%s"),
+ idl_global->prog_name (),
+ ACE_TEXT (": invalid or unknown argument <"),
+ arg,
+ ACE_TEXT ("> to back end\n")));
}
}
}
diff --git a/TAO/TAO_IDL/be/be_init.cpp b/TAO/TAO_IDL/be/be_init.cpp
index c1bd5233162..21f2bf20c0a 100644
--- a/TAO/TAO_IDL/be/be_init.cpp
+++ b/TAO/TAO_IDL/be/be_init.cpp
@@ -8,8 +8,9 @@ TAO_IDL_BE_Export void
BE_version (void)
{
ACE_DEBUG ((LM_DEBUG,
- ACE_TEXT ("TAO_IDL_BE, version ") ACE_TEXT (TAO_VERSION)
- ACE_TEXT ("\n")));
+ "%s %s\n",
+ ACE_TEXT ("TAO_IDL_BE, version"),
+ ACE_TEXT (TAO_VERSION)));
}
TAO_IDL_BE_Export int
diff --git a/TAO/TAO_IDL/be/be_produce.cpp b/TAO/TAO_IDL/be/be_produce.cpp
index 5c35df61a56..2ae24299e3c 100644
--- a/TAO/TAO_IDL/be/be_produce.cpp
+++ b/TAO/TAO_IDL/be/be_produce.cpp
@@ -105,7 +105,7 @@ BE_visit_root (be_visitor_decl &root_visitor, const char *which_pass)
if (-1 == root->accept (&root_visitor))
{
ACE_ERROR ((LM_ERROR,
- "BE_visit_root - %C for Root failed\n",
+ "BE_visit_root - %s for Root failed\n",
which_pass));
BE_abort ();
}