summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjtc <jtc@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2007-10-29 15:02:22 +0000
committerjtc <jtc@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2007-10-29 15:02:22 +0000
commitfc9fb5e60eb5401f0667959a10ce69ef246ecffa (patch)
treecf9197a417cf4821646b332957ad751449cbb408
parentf8a9c471406905e823ad978bc2710e8c76936306 (diff)
downloadATCD-fc9fb5e60eb5401f0667959a10ce69ef246ecffa.tar.gz
ChangeLogTag: Mon Oct 29 15:01:28 UTC 2007 J.T. Conklin <jtc@acorntoolworks.com>
-rw-r--r--ACE/ChangeLog7
-rw-r--r--ACE/ace/OS_NS_stdio.cpp10
-rw-r--r--ACE/ace/Process.cpp44
3 files changed, 34 insertions, 27 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog
index 5ae0ceed800..cd4b67495c7 100644
--- a/ACE/ChangeLog
+++ b/ACE/ChangeLog
@@ -1,3 +1,10 @@
+Mon Oct 29 15:01:28 UTC 2007 J.T. Conklin <jtc@acorntoolworks.com>
+
+ * ace/OS_NS_stdio.cpp:
+ * ace/Process.cpp:
+
+ Fixed fuzz warnings.
+
Mon Oct 29 14:44:15 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl>
* ace/config-openbsd.h:
diff --git a/ACE/ace/OS_NS_stdio.cpp b/ACE/ace/OS_NS_stdio.cpp
index 727781ae955..ab449a46820 100644
--- a/ACE/ace/OS_NS_stdio.cpp
+++ b/ACE/ace/OS_NS_stdio.cpp
@@ -293,7 +293,7 @@ ACE_OS::fprintf (FILE *fp, const wchar_t *format, ...)
int
ACE_OS::asprintf (char **bufp, const char *format, ...)
{
- // ACE_OS_TRACE ("ACE_OS::aprintf");
+ // ACE_OS_TRACE ("ACE_OS::asprintf");
int result;
va_list ap;
va_start (ap, format);
@@ -306,7 +306,7 @@ ACE_OS::asprintf (char **bufp, const char *format, ...)
int
ACE_OS::asprintf (wchar_t **bufp, const wchar_t *format, ...)
{
- // ACE_OS_TRACE ("ACE_OS::aprintf");
+ // ACE_OS_TRACE ("ACE_OS::asprintf");
int result;
va_list ap;
va_start (ap, format);
@@ -413,7 +413,7 @@ ACE_OS::vasprintf_emulation(char **bufp, const char *format, va_list argptr)
{
char *buf = reinterpret_cast<char*>(ACE_OS::malloc(size + 1));
if (!buf)
- return -1;
+ return -1;
va_list aq;
#ifdef va_copy
@@ -451,9 +451,9 @@ ACE_OS::vaswprintf_emulation(wchar_t **bufp, const wchar_t *format, va_list argp
if (size != -1)
{
wchar_t *buf = reinterpret_cast<wchar_t*>
- (ACE_OS::malloc((size + 1) * sizeof(wchar_t)));
+ (ACE_OS::malloc((size + 1) * sizeof(wchar_t)));
if (!buf)
- return -1;
+ return -1;
va_list aq;
#ifdef va_copy
diff --git a/ACE/ace/Process.cpp b/ACE/ace/Process.cpp
index 16f14a83c88..11ac859ebf2 100644
--- a/ACE/ace/Process.cpp
+++ b/ACE/ace/Process.cpp
@@ -353,16 +353,16 @@ ACE_Process::spawn (ACE_Process_Options &options)
if (options.getgroup () != ACE_INVALID_PID
&& ACE_OS::setpgid (0,
options.getgroup ()) < 0)
- {
+ {
#if !defined (ACE_HAS_THREADS)
- // We can't emit this log message because ACE_ERROR(), etc.
- // will invoke async signal unsafe functions, which results
- // in undefined behavior in threaded programs.
- ACE_ERROR ((LM_ERROR,
+ // We can't emit this log message because ACE_ERROR(), etc.
+ // will invoke async signal unsafe functions, which results
+ // in undefined behavior in threaded programs.
+ ACE_ERROR ((LM_ERROR,
ACE_TEXT ("%p.\n"),
ACE_TEXT ("ACE_Process::spawn: setpgid failed.")));
#endif
- }
+ }
# endif /* ACE_LACKS_SETPGID */
# if !defined (ACE_LACKS_SETREGID)
@@ -370,16 +370,16 @@ ACE_Process::spawn (ACE_Process_Options &options)
|| options.getegid () != (uid_t) -1)
if (ACE_OS::setregid (options.getrgid (),
options.getegid ()) == -1)
- {
+ {
#if !defined (ACE_HAS_THREADS)
- // We can't emit this log message because ACE_ERROR(), etc.
- // will invoke async signal unsafe functions, which results
- // in undefined behavior in threaded programs.
- ACE_ERROR ((LM_ERROR,
- ACE_TEXT ("%p.\n"),
- ACE_TEXT ("ACE_Process::spawn: setregid failed.")));
+ // We can't emit this log message because ACE_ERROR(), etc.
+ // will invoke async signal unsafe functions, which results
+ // in undefined behavior in threaded programs.
+ ACE_ERROR ((LM_ERROR,
+ ACE_TEXT ("%p.\n"),
+ ACE_TEXT ("ACE_Process::spawn: setregid failed.")));
#endif
- }
+ }
# endif /* ACE_LACKS_SETREGID */
# if !defined (ACE_LACKS_SETREUID)
@@ -388,16 +388,16 @@ ACE_Process::spawn (ACE_Process_Options &options)
|| options.geteuid () != (uid_t) -1)
if (ACE_OS::setreuid (options.getruid (),
options.geteuid ()) == -1)
- {
+ {
#if !defined (ACE_HAS_THREADS)
- // We can't emit this log message because ACE_ERROR(), etc.
- // will invoke async signal unsafe functions, which results
- // in undefined behavior in threaded programs.
- ACE_ERROR ((LM_ERROR,
- ACE_TEXT ("%p.\n"),
- ACE_TEXT ("ACE_Process::spawn: setreuid failed.")));
+ // We can't emit this log message because ACE_ERROR(), etc.
+ // will invoke async signal unsafe functions, which results
+ // in undefined behavior in threaded programs.
+ ACE_ERROR ((LM_ERROR,
+ ACE_TEXT ("%p.\n"),
+ ACE_TEXT ("ACE_Process::spawn: setreuid failed.")));
#endif
- }
+ }
# endif /* ACE_LACKS_SETREUID */
this->child (ACE_OS::getppid ());