diff options
| author | naga <naga@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1999-05-21 19:55:10 +0000 |
|---|---|---|
| committer | naga <naga@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1999-05-21 19:55:10 +0000 |
| commit | 3bfebe3bad4abcc48bd1d2037b5e2b8bed36a4d9 (patch) | |
| tree | 863e69b08f60be0d3610316e1751127aea81e922 | |
| parent | 84f4f53073660322cafef5bb1f22c916d63257b3 (diff) | |
| download | ATCD-3bfebe3bad4abcc48bd1d2037b5e2b8bed36a4d9.tar.gz | |
Fixed a few warnings.
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/AV/AVStreams_i.h | 2 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/AV/sfp.cpp | 5 |
2 files changed, 1 insertions, 6 deletions
diff --git a/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.h b/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.h index 69fdb05825a..baf1df83499 100644 --- a/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.h +++ b/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.h @@ -977,7 +977,7 @@ public: TAO_Tokenizer (char *string,char delimiter); // constructor. - parse (char *string,char delimiter); + int parse (char *string,char delimiter); // parses the string and tokenizes it. char *token (void); diff --git a/TAO/orbsvcs/orbsvcs/AV/sfp.cpp b/TAO/orbsvcs/orbsvcs/AV/sfp.cpp index c00014c904d..4be327a62aa 100644 --- a/TAO/orbsvcs/orbsvcs/AV/sfp.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/sfp.cpp @@ -229,7 +229,6 @@ TAO_SFP::start_stream (const char *local_addr,int Credit) } else ACE_ERROR_RETURN ((LM_ERROR,"Invalid messaged received while Start expected\n"),-1); - return 0; } // Sends the ACE_Message_Block data as a frame, fragmenting if necessary. @@ -822,8 +821,6 @@ TAO_SFP::read_simple_frame (void) return 0; int byte_order = frame_header.flags & 0x1; int message_len = frame_header.message_size; - if (frame_header.message_size < 0) - ACE_ERROR_RETURN ((LM_ERROR,"Negative message size\n"),0); ACE_Message_Block *message_block; ACE_NEW_RETURN (message_block, ACE_Message_Block (message_len), @@ -1012,8 +1009,6 @@ TAO_SFP::read_fragment (void) ACE_DEBUG ((LM_DEBUG,"frag number = %d, frag size = %d,source id = %d\n", fragment.frag_number,fragment.frag_sz,fragment.source_id)); - if (fragment.frag_sz < 0) - ACE_ERROR_RETURN ((LM_ERROR,"negative fragment size:\n"),0); ACE_Message_Block *data; ACE_NEW_RETURN (data, ACE_Message_Block(fragment.frag_sz), |