summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorschmidt <douglascraigschmidt@users.noreply.github.com>1998-06-21 15:16:56 +0000
committerschmidt <douglascraigschmidt@users.noreply.github.com>1998-06-21 15:16:56 +0000
commitc7226b1e57afd02dba871b759dd0cbfdc1d63525 (patch)
tree9c047c8c0d5022e50937d8c80b382659fc375ebf
parentfc4cfec6403605ff629082764d10a04a31d92efa (diff)
downloadATCD-c7226b1e57afd02dba871b759dd0cbfdc1d63525.tar.gz
*** empty log message ***
-rw-r--r--ChangeLog-98b6
-rw-r--r--examples/IPC_SAP/SOCK_SAP/CPP-unserver.cpp23
2 files changed, 23 insertions, 6 deletions
diff --git a/ChangeLog-98b b/ChangeLog-98b
index 8efde5d9866..155d92db178 100644
--- a/ChangeLog-98b
+++ b/ChangeLog-98b
@@ -1,3 +1,9 @@
+Sun Jun 21 10:14:32 1998 Douglas C. Schmidt <schmidt@tango.cs.wustl.edu>
+
+ * examples/IPC_SAP/SOCK_SAP/CPP-unserver.cpp (server): Fixed
+ another ambiguity caused by the recent SOCK_IO changes. Thanks
+ to David for pointing this out.
+
Sun Jun 21 00:16:56 1998 Nanbor Wang <nanbor@cs.wustl.edu>
* ace/OS.i (dlerror): Have to treat UNICODE differently because
diff --git a/examples/IPC_SAP/SOCK_SAP/CPP-unserver.cpp b/examples/IPC_SAP/SOCK_SAP/CPP-unserver.cpp
index 8bddff02a2e..10c67bd92d2 100644
--- a/examples/IPC_SAP/SOCK_SAP/CPP-unserver.cpp
+++ b/examples/IPC_SAP/SOCK_SAP/CPP-unserver.cpp
@@ -45,12 +45,15 @@ server (void *arg)
{
char buf[BUFSIZ];
- ssize_t r_bytes = new_stream.recv (buf, sizeof buf, 0);
+ ssize_t r_bytes = new_stream.recv (buf, sizeof buf);
if (r_bytes == -1)
{
- ACE_ERROR ((LM_ERROR, "%p\n", "recv"));
+ ACE_ERROR ((LM_ERROR,
+ "%p\n",
+ "recv"));
break;
+
}
else if (r_bytes == 0)
{
@@ -59,14 +62,20 @@ server (void *arg)
break;
}
else if (verbose && ACE::write_n (ACE_STDOUT, buf, r_bytes) != r_bytes)
- ACE_ERROR ((LM_ERROR, "%p\n", "ACE::write_n"));
+ ACE_ERROR ((LM_ERROR,
+ "%p\n",
+ "ACE::write_n"));
else if (new_stream.send_n (buf, r_bytes) != r_bytes)
- ACE_ERROR ((LM_ERROR, "%p\n", "send_n"));
+ ACE_ERROR ((LM_ERROR,
+ "%p\n",
+ "send_n"));
}
// Close new endpoint (listening endpoint stays open).
if (new_stream.close () == -1)
- ACE_ERROR ((LM_ERROR, "%p\n", "close"));
+ ACE_ERROR ((LM_ERROR,
+ "%p\n",
+ "close"));
return 0;
}
@@ -110,7 +119,9 @@ run_event_loop (const char rendezvous[])
if (peer_acceptor.accept (new_stream, 0, &timeout) == -1)
{
- ACE_ERROR ((LM_ERROR, "%p\n", "accept"));
+ ACE_ERROR ((LM_ERROR,
+ "%p\n",
+ "accept"));
continue;
}