diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2007-11-05 20:01:15 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2007-11-05 20:01:15 +0000 |
| commit | 4ec8c68d3f36f071f8ff9da770895567b02fcddd (patch) | |
| tree | 8046126ecef1b538bf412ad9e1e92801dbce0aca /ACE/apps/Gateway | |
| parent | 05b841f1df0a0266a8a51849838ed0475f54c9e4 (diff) | |
| download | ATCD-4ec8c68d3f36f071f8ff9da770895567b02fcddd.tar.gz | |
Mon Nov 5 20:00:15 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl>
Diffstat (limited to 'ACE/apps/Gateway')
| -rw-r--r-- | ACE/apps/Gateway/Gateway/Concrete_Connection_Handlers.cpp | 7 | ||||
| -rw-r--r-- | ACE/apps/Gateway/Peer/Peer.cpp | 3 |
2 files changed, 4 insertions, 6 deletions
diff --git a/ACE/apps/Gateway/Gateway/Concrete_Connection_Handlers.cpp b/ACE/apps/Gateway/Gateway/Concrete_Connection_Handlers.cpp index e6ac36ba1fe..5204bd4338c 100644 --- a/ACE/apps/Gateway/Gateway/Concrete_Connection_Handlers.cpp +++ b/ACE/apps/Gateway/Gateway/Concrete_Connection_Handlers.cpp @@ -80,7 +80,7 @@ Consumer_Handler::nonblk_put (ACE_Message_Block *event) this->handle_close (); return -1; } - else if (errno == EWOULDBLOCK) + else if (errno == EWOULDBLOCK) { // We didn't manage to send everything, so we need to queue // things up. @@ -107,7 +107,7 @@ Consumer_Handler::nonblk_put (ACE_Message_Block *event) -1); return 0; } - else + else return n; } @@ -416,8 +416,7 @@ Supplier_Handler::recv (ACE_Message_Block *&forward_addr) if (errno == EWOULDBLOCK) // This might happen if only the header came through. return -1; - else - /* FALLTHROUGH */; + /* FALLTHROUGH */; case 0: // Premature EOF. if (data_bytes_left_to_read) diff --git a/ACE/apps/Gateway/Peer/Peer.cpp b/ACE/apps/Gateway/Peer/Peer.cpp index 437d39f1611..d8da4010489 100644 --- a/ACE/apps/Gateway/Peer/Peer.cpp +++ b/ACE/apps/Gateway/Peer/Peer.cpp @@ -423,8 +423,7 @@ Peer_Handler::recv (ACE_Message_Block *&mb) if (errno == EWOULDBLOCK) // This might happen if only the header came through. return -1; - else - /* FALLTHROUGH */; + /* FALLTHROUGH */; case 0: // Premature EOF. if (data_bytes_left_to_read) |