summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAbdullah Sowayan <sowayan@users.noreply.github.com>2007-05-18 02:28:30 +0000
committerAbdullah Sowayan <sowayan@users.noreply.github.com>2007-05-18 02:28:30 +0000
commitda58646cb209445a814e138235130f72832e06b5 (patch)
treea852480a18ce01e03a62a2e361f769ac5e64f94a
parent93eb39291b8a1fb406069558e741fb90c5bfb76d (diff)
downloadATCD-da58646cb209445a814e138235130f72832e06b5.tar.gz
Fri May 18 02:12:34 UTC 2007 Abdullah Sowayan <abdullah.sowayan@lmco.com>
-rw-r--r--ACE/ChangeLog16
-rw-r--r--ACE/examples/Connection/blocking/SPIPE-acceptor.cpp45
-rw-r--r--ACE/examples/Connection/blocking/SPIPE-connector.cpp1
-rw-r--r--ACE/examples/OS/Process/process.cpp1
-rw-r--r--ACE/examples/Reactor/Misc/test_demuxing.cpp2
-rw-r--r--ACE/examples/Web_Crawler/Mem_Map_Stream.cpp1
6 files changed, 39 insertions, 27 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog
index 5db9f038594..cb47e702d53 100644
--- a/ACE/ChangeLog
+++ b/ACE/ChangeLog
@@ -1,3 +1,19 @@
+Fri May 18 02:12:34 UTC 2007 Abdullah Sowayan <abdullah.sowayan@lmco.com>
+
+ * examples/Connection/blocking/SPIPE-acceptor.cpp:
+ * examples/Connection/blocking/SPIPE-connector.cpp:
+ * examples/OS/Process/process.cpp:
+ * examples/Reactor/Misc/test_demuxing.cpp:
+ * examples/Web_Crawler/Mem_Map_Stream.cpp:
+
+ It makes no sense to have code after a return statement
+ (such as ACE_ERROR_RETURN). It causes some builds to have
+ "statement is unreachable" warning.
+
+ * examples/Connection/blocking/SPIPE-acceptor.cpp:
+
+ Replaced tabs with spaces.
+
Thu May 17 22:35:37 UTC 2007 Ossama Othman <ossama_othman at symantec dot com>
* ace/CDR_Stream.inl (skip_char, skip_boolean, skip_short):
diff --git a/ACE/examples/Connection/blocking/SPIPE-acceptor.cpp b/ACE/examples/Connection/blocking/SPIPE-acceptor.cpp
index c25f9508ce5..10b1e8310f2 100644
--- a/ACE/examples/Connection/blocking/SPIPE-acceptor.cpp
+++ b/ACE/examples/Connection/blocking/SPIPE-acceptor.cpp
@@ -31,7 +31,7 @@ Svc_Handler::open (void *)
{
ACE_DEBUG ((LM_DEBUG,
ACE_TEXT ("client connected on handle %d\n"),
- this->peer ().get_handle ()));
+ this->peer ().get_handle ()));
if (this->ar_.open (*this,
this->peer ().get_handle ()) == -1)
return -1;
@@ -128,28 +128,27 @@ IPC_Server::parse_args (int argc, ACE_TCHAR *argv[])
for (int c; (c = get_opt ()) != -1; )
{
switch (c)
- {
- case 'r':
- ACE_OS::strncpy (rendezvous_,
- get_opt.opt_arg (),
- sizeof (rendezvous_) / sizeof (ACE_TCHAR));
- break;
- case 't':
- n_threads_ = ACE_OS::atoi (get_opt.opt_arg ());
- ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("%s == %d.\n"),
- get_opt.opt_arg (),
- n_threads_));
- ACE_Proactor::instance (2 * n_threads_);
- // This is a lame way to tell the proactor how many threads
- // we'll be using.
- break;
- case 'u':
- default:
- ACE_ERROR_RETURN ((LM_ERROR,
- ACE_TEXT ("usage: %n -t <threads>\n")
- ACE_TEXT (" -r <rendezvous>\n")), -1);
- break;
- }
+ {
+ case 'r':
+ ACE_OS::strncpy (rendezvous_,
+ get_opt.opt_arg (),
+ sizeof (rendezvous_) / sizeof (ACE_TCHAR));
+ break;
+ case 't':
+ n_threads_ = ACE_OS::atoi (get_opt.opt_arg ());
+ ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("%s == %d.\n"),
+ get_opt.opt_arg (),
+ n_threads_));
+ ACE_Proactor::instance (2 * n_threads_);
+ // This is a lame way to tell the proactor how many threads
+ // we'll be using.
+ break;
+ case 'u':
+ default:
+ ACE_ERROR_RETURN ((LM_ERROR,
+ ACE_TEXT ("usage: %n -t <threads>\n")
+ ACE_TEXT (" -r <rendezvous>\n")), -1);
+ }
}
return 0;
diff --git a/ACE/examples/Connection/blocking/SPIPE-connector.cpp b/ACE/examples/Connection/blocking/SPIPE-connector.cpp
index 6618b64f0cb..7ffbffb408e 100644
--- a/ACE/examples/Connection/blocking/SPIPE-connector.cpp
+++ b/ACE/examples/Connection/blocking/SPIPE-connector.cpp
@@ -207,7 +207,6 @@ IPC_Client::parse_args (int argc, ACE_TCHAR *argv[])
ACE_TEXT ("usage: %n -i <iterations>\n")
ACE_TEXT ("-r <rendezvous>\n")),
-1);
- break;
}
}
diff --git a/ACE/examples/OS/Process/process.cpp b/ACE/examples/OS/Process/process.cpp
index de0f2db0d57..f404ec56dc4 100644
--- a/ACE/examples/OS/Process/process.cpp
+++ b/ACE/examples/OS/Process/process.cpp
@@ -109,7 +109,6 @@ parse_args (int argc, ACE_TCHAR **argv)
ACE_TEXT ("-w test wait functions\n")
ACE_TEXT ("-a run all (d,l,e \"running\")\n")),
-1);
- break;
}
}
diff --git a/ACE/examples/Reactor/Misc/test_demuxing.cpp b/ACE/examples/Reactor/Misc/test_demuxing.cpp
index 6badd849757..d5acb1f3395 100644
--- a/ACE/examples/Reactor/Misc/test_demuxing.cpp
+++ b/ACE/examples/Reactor/Misc/test_demuxing.cpp
@@ -152,9 +152,9 @@ Sig_Handler::handle_signal (int signum, siginfo_t *, ucontext_t *)
break;
default:
ACE_ERROR_RETURN ((LM_ERROR, "invalid signal"), -1);
- break;
/* NOTREACHED */
}
+
return 0;
}
diff --git a/ACE/examples/Web_Crawler/Mem_Map_Stream.cpp b/ACE/examples/Web_Crawler/Mem_Map_Stream.cpp
index f12700f3180..2b148d9ac7c 100644
--- a/ACE/examples/Web_Crawler/Mem_Map_Stream.cpp
+++ b/ACE/examples/Web_Crawler/Mem_Map_Stream.cpp
@@ -114,7 +114,6 @@ Mem_Map_Stream::seek (ACE_OFF_T offset, int whence)
this->end_of_mapping_plus1_ + offset;
// @@ Not sure how to implement this (yet).
ACE_NOTSUP_RETURN (-1);
- break;
}
// Make sure that the backing store will cover this.