diff options
| author | schmidt <douglascraigschmidt@users.noreply.github.com> | 2000-05-05 15:51:28 +0000 |
|---|---|---|
| committer | schmidt <douglascraigschmidt@users.noreply.github.com> | 2000-05-05 15:51:28 +0000 |
| commit | b8d47c07b53f2bb499c8b6076d4f887067276402 (patch) | |
| tree | 6c107df1f3a3c0bbfe287f2a34d0855e6a9afc11 | |
| parent | 2fb73488f5b90e6e58383271027dba284e8eadbc (diff) | |
| download | ATCD-b8d47c07b53f2bb499c8b6076d4f887067276402.tar.gz | |
ChangeLogTag:Thu May 4 14:53:45 2000 Darrell Brunsch <brunsch@uci.edu>
| -rw-r--r-- | apps/drwho/CM_Client.cpp | 12 | ||||
| -rw-r--r-- | apps/drwho/CM_Server.cpp | 14 | ||||
| -rw-r--r-- | apps/drwho/ChangeLog | 5 |
3 files changed, 18 insertions, 13 deletions
diff --git a/apps/drwho/CM_Client.cpp b/apps/drwho/CM_Client.cpp index e223b404fbd..48fb336469b 100644 --- a/apps/drwho/CM_Client.cpp +++ b/apps/drwho/CM_Client.cpp @@ -47,12 +47,12 @@ CM_Client::receive (int timeout) else { int sin_len = sizeof this->sin_; - ssize_t n = ACE_OS::recvfrom (Comm_Manager::sokfd_, - this->recv_packet_, - UDP_PACKET_SIZE, - 0, - (sockaddr *) &this->sin_, - &sin_len); + int n = ACE_OS::recvfrom (Comm_Manager::sokfd_, + this->recv_packet_, + UDP_PACKET_SIZE, + 0, + (sockaddr *) &this->sin_, + &sin_len); if (n < 0) return -1; else diff --git a/apps/drwho/CM_Server.cpp b/apps/drwho/CM_Server.cpp index 97e21e5f855..c87ede968a4 100644 --- a/apps/drwho/CM_Server.cpp +++ b/apps/drwho/CM_Server.cpp @@ -41,17 +41,17 @@ CM_Server::open (short port_number) int CM_Server::receive (int) { - size_t sin_len = sizeof this->sin_; + int sin_len = sizeof this->sin_; if (Options::get_opt (Options::DEBUG) != 0) ACE_DEBUG ((LM_DEBUG, "waiting for client to send...\n")); - ssize_t n = recvfrom (this->sokfd_, - this->recv_packet_, - UDP_PACKET_SIZE, - 0, - (sockaddr *) &this->sin_, - &sin_len); + int n = recvfrom (this->sokfd_, + this->recv_packet_, + UDP_PACKET_SIZE, + 0, + (sockaddr *) &this->sin_, + &sin_len); if (n == -1) return -1; diff --git a/apps/drwho/ChangeLog b/apps/drwho/ChangeLog index 47080d74f53..33d45ac63c0 100644 --- a/apps/drwho/ChangeLog +++ b/apps/drwho/ChangeLog @@ -1,3 +1,8 @@ +Fri May 5 10:40:46 2000 Douglas C. Schmidt <schmidt@tango.cs.wustl.edu> + + * Fixed a coule of errors due to mismatches between int and size_t. + Thanks to David Levine and Darrell Brunsch for reporting these. + Thu Apr 20 09:20:28 2000 Carlos O'Ryan <coryan@uci.edu> * Drwho_Node.cpp: |