Merge pull request #1488 from jwillemsen/jwi-avnullwarning

Corrected null check, only when it is non null

19 files changed, 39 insertions, 95 deletions

diff --git a/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.h b/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.h
index fe9a15c330c..c9005430917 100644
--- a/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.h
+++ b/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.h
@@ -1088,17 +1088,17 @@ class TAO_AV_Export TAO_FlowConsumer :
 {
 public:
   /// default constructor.
-  TAO_FlowConsumer (void);
+  TAO_FlowConsumer ();
 
   TAO_FlowConsumer (const char *flowname,
                     AVStreams::protocolSpec protocols,
                     const char *format);
 
   /// stop this flow, to be overridden by the application.
-  virtual void stop (void);
+  virtual void stop ();
 
   /// start this flow, to be overridden by the application.
-  virtual void start (void);
+  virtual void start ();
 
   virtual char * go_to_listen (AVStreams::QoS & the_qos,
                                CORBA::Boolean is_mcast,
@@ -1119,30 +1119,22 @@ public:
 class TAO_AV_Export TAO_MediaControl
   :public virtual POA_AVStreams::MediaControl
 {
-
 public:
   /// default constructor
-  TAO_MediaControl (void);
+  TAO_MediaControl ();
 
   virtual AVStreams::Position get_media_position (AVStreams::PositionOrigin an_origin,
-                                                  AVStreams::PositionKey a_key)
-    =0;
-
-  virtual void set_media_position (const AVStreams::Position & a_position)
-    =0;
+                                                  AVStreams::PositionKey a_key) = 0;
 
-  virtual void start (const AVStreams::Position & a_position)
-    =0;
+  virtual void set_media_position (const AVStreams::Position & a_position) = 0;
 
-  virtual void pause (const AVStreams::Position & a_position)
-    =0;
+  virtual void start (const AVStreams::Position & a_position) = 0;
 
-  virtual void resume (const AVStreams::Position & a_position)
-    =0;
+  virtual void pause (const AVStreams::Position & a_position) = 0;
 
-  virtual void stop (const AVStreams::Position & a_position)
-    =0;
+  virtual void resume (const AVStreams::Position & a_position) = 0;
 
+  virtual void stop (const AVStreams::Position & a_position) = 0;
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy.h b/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy.h
index e765fe15517..77caf7696f1 100644
--- a/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy.h
+++ b/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy.h
@@ -37,7 +37,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
  */
 class TAO_AV_Export TAO_AV_Endpoint_Strategy
 {
-
 public:
   /// Constructor
   TAO_AV_Endpoint_Strategy (void);
@@ -62,7 +61,6 @@ protected:
 
   /// The vdev
   AVStreams::VDev_var vdev_;
-
 };
 
 // ----------------------------------------------------------------------
@@ -74,7 +72,6 @@ protected:
 class TAO_AV_Export TAO_AV_Endpoint_Process_Strategy
   : public TAO_AV_Endpoint_Strategy
 {
-
 public:
   /// Constructor. The process_options contain the name and arguments
   /// for the process to be created
@@ -125,7 +122,6 @@ protected:
 class TAO_AV_Export TAO_AV_Endpoint_Process_Strategy_A
   : public TAO_AV_Endpoint_Process_Strategy
 {
-
 public:
   /// Constructor
   TAO_AV_Endpoint_Process_Strategy_A (ACE_Process_Options *process_options);
@@ -140,7 +136,6 @@ protected:
 
   /// Gets the "A" type stream endpoint from the child process
   virtual int get_stream_endpoint (void);
-
 };
 
 // ----------------------------------------------------------------------
@@ -152,7 +147,6 @@ protected:
 class TAO_AV_Export TAO_AV_Endpoint_Process_Strategy_B
   : public TAO_AV_Endpoint_Process_Strategy
 {
-
 public:
   /// Constructor
   TAO_AV_Endpoint_Process_Strategy_B (ACE_Process_Options *process_options);
@@ -167,8 +161,7 @@ protected:
 
 
   /// Gets the object reference of the "B" type streamendpoint.
-  virtual int get_stream_endpoint (void);
-
+  virtual int get_stream_endpoint ();
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.h b/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.h
index 084bfa38d99..a16bcc74b66 100644
--- a/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.h
+++ b/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.h
@@ -25,15 +25,14 @@ template <class T_StreamEndpoint, class T_VDev , class T_MediaCtrl>
 class TAO_AV_Endpoint_Reactive_Strategy
 : public TAO_AV_Endpoint_Strategy
 {
-
 protected:
   // Constructor
 
   /// Constructor
-  TAO_AV_Endpoint_Reactive_Strategy (void);
+  TAO_AV_Endpoint_Reactive_Strategy ();
 
   /// Destructor.
-  virtual ~TAO_AV_Endpoint_Reactive_Strategy (void);
+  virtual ~TAO_AV_Endpoint_Reactive_Strategy ();
 
   /// creates and activates the streamendpoint, vdev, and mediacontrol
   virtual int activate (void);
@@ -86,9 +85,7 @@ template <class T_StreamEndpoint, class T_VDev , class T_MediaCtrl>
 class TAO_AV_Endpoint_Reactive_Strategy_A
   : public TAO_AV_Endpoint_Reactive_Strategy<T_StreamEndpoint, T_VDev , T_MediaCtrl>
 {
-
 public:
-
   TAO_AV_Endpoint_Reactive_Strategy_A (void);
 
   /// Constructor
@@ -104,7 +101,6 @@ public:
   /// Called by the MMDevice, when it needs to create an A type endpoint
   virtual int create_A (AVStreams::StreamEndPoint_A_ptr &stream_endpoint,
                         AVStreams::VDev_ptr &vdev);
-
 };
 
 // ----------------------------------------------------------------------
@@ -116,20 +112,18 @@ template <class T_StreamEndpoint, class T_Vdev , class T_MediaCtrl>
 class TAO_AV_Endpoint_Reactive_Strategy_B
   : public TAO_AV_Endpoint_Reactive_Strategy <T_StreamEndpoint, T_Vdev, T_MediaCtrl>
 {
-
 public:
-
   /// Constructor
-  TAO_AV_Endpoint_Reactive_Strategy_B (void);
+  TAO_AV_Endpoint_Reactive_Strategy_B ();
 
   /// Destructor.
-  virtual ~TAO_AV_Endpoint_Reactive_Strategy_B (void);
+  virtual ~TAO_AV_Endpoint_Reactive_Strategy_B ();
 
   int init (CORBA::ORB_ptr orb, PortableServer::POA_ptr poa);
 
   /// Overrides the base class stream_endpoint activator, to activate
   /// a "B" type endpoint
-  virtual int activate_stream_endpoint (void);
+  virtual int activate_stream_endpoint ();
 
   /// Called by the MMDevice, when it needs to create a B type endpoint
   virtual int create_B (AVStreams::StreamEndPoint_B_ptr &stream_endpoint,
@@ -147,7 +141,6 @@ public:
 template <class T_StreamEndpoint, class T_VDev , class T_MediaCtrl>
 class TAO_AV_Child_Process
 {
-
 public:
   /// Constructor
   TAO_AV_Child_Process ();
@@ -246,7 +239,6 @@ template <class T_StreamEndpoint, class T_VDev , class T_MediaCtrl>
 class TAO_AV_Child_Process_A
   : public TAO_AV_Child_Process <T_StreamEndpoint, T_VDev, T_MediaCtrl>
 {
-
 public:
   /// Constructor.
   TAO_AV_Child_Process_A (void);
@@ -265,7 +257,6 @@ template <class T_StreamEndpoint, class T_VDev , class T_MediaCtrl>
 class TAO_AV_Child_Process_B
   : public TAO_AV_Child_Process <T_StreamEndpoint, T_VDev, T_MediaCtrl>
 {
-
 public:
   /// Constructor.
   TAO_AV_Child_Process_B (void);
diff --git a/TAO/orbsvcs/orbsvcs/AV/Fill_ACE_QoS.h b/TAO/orbsvcs/orbsvcs/AV/Fill_ACE_QoS.h
index 1e9366f542f..6e4165f5b43 100644
--- a/TAO/orbsvcs/orbsvcs/AV/Fill_ACE_QoS.h
+++ b/TAO/orbsvcs/orbsvcs/AV/Fill_ACE_QoS.h
@@ -35,7 +35,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
  */
 class Fill_ACE_QoS
 {
-
 public:
   typedef ACE_Hash_Map_Manager <ACE_CString, ACE_Flow_Spec *, ACE_Null_Mutex> FLOW_SPEC_HASH_MAP;
 
@@ -66,7 +65,6 @@ public:
   FLOW_SPEC_HASH_MAP& map (void);
 
 private:
-
   // The Service Provider is currently set to NULL for all ACE_QoS.
   static const iovec iov_;
 
diff --git a/TAO/orbsvcs/orbsvcs/AV/FlowSpec_Entry.h b/TAO/orbsvcs/orbsvcs/AV/FlowSpec_Entry.h
index 4f39bd240ef..d0ff485c6f4 100644
--- a/TAO/orbsvcs/orbsvcs/AV/FlowSpec_Entry.h
+++ b/TAO/orbsvcs/orbsvcs/AV/FlowSpec_Entry.h
@@ -18,7 +18,6 @@
 #include "ace/Containers.h"
 #include "ace/SString.h"
 
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 /**
@@ -32,16 +31,16 @@ public:
   TAO_Tokenizer (const char *string,char delimiter);
 
   /// destructor.
-  ~TAO_Tokenizer (void);
+  ~TAO_Tokenizer ();
 
   /// parses the string and tokenizes it.
   int parse (const char *string,char delimiter);
 
   /// Returns the next token.
-  char *token (void);
+  char *token ();
 
   /// Number of tokens.
-  int num_tokens (void);
+  int num_tokens ();
 
   const char *operator [] (size_t index) const;
 
@@ -65,7 +64,6 @@ class TAO_AV_Protocol_Object;
 class TAO_AV_Export TAO_FlowSpec_Entry
 {
 public:
-
   enum Direction
   {
     TAO_AV_INVALID   = -1,
@@ -189,7 +187,6 @@ public:
   int is_multicast (void);
 
 protected:
-
   /// parses the flow protocol string with tokens separated by :
   int parse_flow_protocol_string (const char *flow_options_string);
 
@@ -256,7 +253,6 @@ protected:
   Role role_;
 };
 
-
 /**
  * @class TAO_Forward_FlowSpec_Entry
  */
diff --git a/TAO/orbsvcs/orbsvcs/AV/Flows_T.h b/TAO/orbsvcs/orbsvcs/AV/Flows_T.h
index f4790cd354e..f2a0fc87f9c 100644
--- a/TAO/orbsvcs/orbsvcs/AV/Flows_T.h
+++ b/TAO/orbsvcs/orbsvcs/AV/Flows_T.h
@@ -30,17 +30,17 @@ class TAO_FDev :
 {
 public:
   /// default constructor
-  TAO_FDev (void);
+  TAO_FDev ();
 
   /// constructor taking a flowname.
   TAO_FDev (const char *flowname);
 
   /// Destructor..
-  ~TAO_FDev (void);
+  ~TAO_FDev ();
 
   /// set/get the flowname.
   /// create a flow producer object.
-  const char *flowname (void);
+  const char *flowname ();
   void flowname (const char *flowname);
   AVStreams::FlowProducer_ptr create_producer (AVStreams::FlowConnection_ptr the_requester,
                                                        AVStreams::QoS & the_qos,
diff --git a/TAO/orbsvcs/orbsvcs/AV/MCast.h b/TAO/orbsvcs/orbsvcs/AV/MCast.h
index a42b01c815a..0639f3cb4cb 100644
--- a/TAO/orbsvcs/orbsvcs/AV/MCast.h
+++ b/TAO/orbsvcs/orbsvcs/AV/MCast.h
@@ -90,8 +90,6 @@ class TAO_AV_UDP_MCast_Flow_Handler
    public virtual ACE_Event_Handler
 {
 public:
-  /// Ctor
-  /// Dtor
   TAO_AV_UDP_MCast_Flow_Handler (void);
   virtual ~TAO_AV_UDP_MCast_Flow_Handler (void);
   virtual ACE_HANDLE get_handle () const;
diff --git a/TAO/orbsvcs/orbsvcs/AV/Policy.h b/TAO/orbsvcs/orbsvcs/AV/Policy.h
index b30054557ce..f1b1793347a 100644
--- a/TAO/orbsvcs/orbsvcs/AV/Policy.h
+++ b/TAO/orbsvcs/orbsvcs/AV/Policy.h
@@ -21,7 +21,6 @@
 #include "ace/Time_Value.h"
 #include "orbsvcs/AV/AV_export.h"
 
-
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 class ACE_Message_Block;
 ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/AV/RTCP.h b/TAO/orbsvcs/orbsvcs/AV/RTCP.h
index 7d092b33a5d..24d3b48a509 100644
--- a/TAO/orbsvcs/orbsvcs/AV/RTCP.h
+++ b/TAO/orbsvcs/orbsvcs/AV/RTCP.h
@@ -42,7 +42,6 @@
  */
 //=============================================================================
 
-
 #ifndef TAO_AV_RTCP_H
 #define TAO_AV_RTCP_H
 #include /**/ "ace/pre.h"
@@ -107,8 +106,6 @@ public:
                                int initial);
 };
 
-
-
 /**
  * @class TAO_AV_RTCP_Flow_Factory
  * @brief
@@ -129,7 +126,6 @@ public:
 
 class TAO_AV_Callback;
 
-
 /**
  * @class TAO_AV_RTCP_Callback
  * @brief TAO_AV_Callback for RTCP protocol
@@ -189,7 +185,6 @@ protected:
 
 class RTP_Packet;
 
-
 /**
  * @class TAO_AV_RTCP_Object
  * @brief TAO_AV_Protocol_Object for RTCP protocol
@@ -238,7 +233,6 @@ public:
 
   void ts_offset (ACE_UINT32 ts_offset);
 
-
 private:
   TAO_AV_Callback *client_cb_;
   TAO_AV_RTCP_Callback rtcp_cb_;
diff --git a/TAO/orbsvcs/orbsvcs/AV/RTCP_Channel.h b/TAO/orbsvcs/orbsvcs/AV/RTCP_Channel.h
index a60df3084ed..c19c7fe86cd 100644
--- a/TAO/orbsvcs/orbsvcs/AV/RTCP_Channel.h
+++ b/TAO/orbsvcs/orbsvcs/AV/RTCP_Channel.h
@@ -31,7 +31,7 @@ public:
                   const ACE_Addr *addr);
 
   /// Destructor
-  ~RTCP_Channel_In(void);
+  ~RTCP_Channel_In();
 
   /// This operation takes the incoming ACE_Message_Block, converts it to an
   /// RTP_Packet and calls updateStatistics.  It also uses compares the peer_addr
diff --git a/TAO/orbsvcs/orbsvcs/AV/RTP.h b/TAO/orbsvcs/orbsvcs/AV/RTP.h
index f6535ee46ef..ea8d3821ac7 100644
--- a/TAO/orbsvcs/orbsvcs/AV/RTP.h
+++ b/TAO/orbsvcs/orbsvcs/AV/RTP.h
@@ -43,7 +43,6 @@
  */
 //=============================================================================
 
-
 #ifndef TAO_AV_RTP_H
 #define TAO_AV_RTP_H
 #include /**/ "ace/pre.h"
diff --git a/TAO/orbsvcs/orbsvcs/AV/TCP.h b/TAO/orbsvcs/orbsvcs/AV/TCP.h
index f66b0f32e9b..1f9481a8b07 100644
--- a/TAO/orbsvcs/orbsvcs/AV/TCP.h
+++ b/TAO/orbsvcs/orbsvcs/AV/TCP.h
@@ -47,21 +47,20 @@ class TAO_AV_TCP_Flow_Handler;
 class TAO_AV_TCP_Transport
   : public TAO_AV_Transport
 {
-
 public:
-  TAO_AV_TCP_Transport (void);
+  TAO_AV_TCP_Transport ();
 
   TAO_AV_TCP_Transport (TAO_AV_TCP_Flow_Handler *handler);
 
-  virtual ~TAO_AV_TCP_Transport (void);
+  virtual ~TAO_AV_TCP_Transport ();
 
   virtual int open (ACE_Addr *address);
 
-  virtual int close (void);
+  virtual int close ();
 
-  virtual int mtu (void);
+  virtual int mtu ();
 
-  virtual ACE_Addr *get_peer_addr (void);
+  virtual ACE_Addr *get_peer_addr ();
 
   /// Write the complete Message_Block chain to the connection.
   virtual ssize_t send (const ACE_Message_Block *mblk,
diff --git a/TAO/orbsvcs/orbsvcs/AV/Transport.cpp b/TAO/orbsvcs/orbsvcs/AV/Transport.cpp
index 5e5a7dd19cc..6f17d1db0f0 100644
--- a/TAO/orbsvcs/orbsvcs/AV/Transport.cpp
+++ b/TAO/orbsvcs/orbsvcs/AV/Transport.cpp
@@ -168,8 +168,8 @@ TAO_AV_Connector_Registry::close (TAO_AV_Connector *connector)
 {
   this->connectors_.remove (connector);
 
-  if (connector != 0)
-    delete connector;
+  delete connector;
+
   return 0;
 }
 
@@ -181,11 +181,11 @@ TAO_AV_Connector_Registry::close_all ()
        ++i)
     {
       if (*i != 0)
-        continue;
-
-      (*i)->close ();
+        {
+          (*i)->close ();
 
-      this->close (*i);
+          this->close (*i);
+        }
     }
 
   this->connectors_.reset ();
diff --git a/TAO/orbsvcs/orbsvcs/AV/Transport.h b/TAO/orbsvcs/orbsvcs/AV/Transport.h
index d6099da4dfd..c414a81dbb6 100644
--- a/TAO/orbsvcs/orbsvcs/AV/Transport.h
+++ b/TAO/orbsvcs/orbsvcs/AV/Transport.h
@@ -27,7 +27,6 @@
 #include "ace/Addr.h"
 #include "ace/SOCK_Dgram.h"
 
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 // Forward declarations.
@@ -66,9 +65,6 @@ private:
   TAO_AV_Transport_Factory *factory_;
 };
 
-
-
-
 class TAO_AV_Flow_Protocol_Factory;
 
 /**
@@ -100,7 +96,6 @@ private:
   TAO_AV_Flow_Protocol_Factory *factory_;
 };
 
-
 /**
  * @class TAO_AV_Flow_Handler
  * @brief
@@ -200,7 +195,6 @@ public:
   virtual ssize_t recv (iovec *iov,
                         int iovcnt,
                         ACE_Time_Value *s = 0) = 0;
-
 };
 
 class TAO_Base_StreamEndPoint;
@@ -260,7 +254,6 @@ protected:
   ACE_CString flowname_;
 };
 
-
 typedef ACE_Unbounded_Set<TAO_AV_Connector*> TAO_AV_ConnectorSet;
 typedef ACE_Unbounded_Set_Iterator<TAO_AV_Connector*> TAO_AV_ConnectorSetItor;
 
diff --git a/TAO/orbsvcs/orbsvcs/AV/UDP.cpp b/TAO/orbsvcs/orbsvcs/AV/UDP.cpp
index edfa055b2a1..e2e805fb8eb 100644
--- a/TAO/orbsvcs/orbsvcs/AV/UDP.cpp
+++ b/TAO/orbsvcs/orbsvcs/AV/UDP.cpp
@@ -66,7 +66,6 @@ TAO_AV_UDP_Flow_Handler::set_remote_address (ACE_Addr *address)
   return transport->set_remote_address (*inet_addr);
 }
 
-
 ACE_HANDLE
 TAO_AV_UDP_Flow_Handler::get_handle () const
 {
diff --git a/TAO/orbsvcs/orbsvcs/AV/UDP.h b/TAO/orbsvcs/orbsvcs/AV/UDP.h
index 19a16f4903b..79f981d4071 100644
--- a/TAO/orbsvcs/orbsvcs/AV/UDP.h
+++ b/TAO/orbsvcs/orbsvcs/AV/UDP.h
@@ -161,7 +161,6 @@ public:
   virtual int close (void);
   virtual int activate_svc_handler (TAO_AV_Flow_Handler *handler);
 
-
 protected:
   ACE_INET_Addr *address_;
   ACE_INET_Addr *control_inet_address_;
@@ -169,8 +168,6 @@ protected:
   TAO_FlowSpec_Entry *entry_;
   TAO_AV_Flow_Protocol_Factory *flow_protocol_factory_;
   TAO_AV_Core::Flow_Component flow_component_;
-
-
 };
 
 /**
diff --git a/TAO/orbsvcs/orbsvcs/AV/default_resource.h b/TAO/orbsvcs/orbsvcs/AV/default_resource.h
index c143722a3f8..c743dbdad52 100644
--- a/TAO/orbsvcs/orbsvcs/AV/default_resource.h
+++ b/TAO/orbsvcs/orbsvcs/AV/default_resource.h
@@ -37,12 +37,11 @@ class TAO_AV_Export TAO_AV_Default_Resource_Factory
   : public TAO_AV_Resource_Factory
 {
 public:
-
   /// Constructor.
-  TAO_AV_Default_Resource_Factory (void);
+  TAO_AV_Default_Resource_Factory ();
 
   /// Destructor.
-  virtual ~TAO_AV_Default_Resource_Factory (void);
+  virtual ~TAO_AV_Default_Resource_Factory ();
 
   /**
    * @name Service Configurator Hooks
@@ -50,7 +49,6 @@ public:
   //@{
   /// Dynamic linking hook
   virtual int init (int argc, ACE_TCHAR *argv[]);
-
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/AV/media_timer.h b/TAO/orbsvcs/orbsvcs/AV/media_timer.h
index 60eeb6ad7e2..cae91df3cd8 100644
--- a/TAO/orbsvcs/orbsvcs/AV/media_timer.h
+++ b/TAO/orbsvcs/orbsvcs/AV/media_timer.h
@@ -42,8 +42,6 @@
 #include "tao/orbconf.h"
 #include "tao/Versioned_Namespace.h"
 
-//long random (void);
-
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 class MediaTimer
diff --git a/TAO/orbsvcs/orbsvcs/AV/sfp.h b/TAO/orbsvcs/orbsvcs/AV/sfp.h
index a61fc453641..c3023b5f101 100644
--- a/TAO/orbsvcs/orbsvcs/AV/sfp.h
+++ b/TAO/orbsvcs/orbsvcs/AV/sfp.h
@@ -77,10 +77,10 @@ typedef ACE_Hash_Map_Manager<CORBA::ULong,TAO_SFP_Fragment_Table*,ACE_Null_Mutex
 class TAO_AV_Export TAO_SFP_Frame_State
 {
 public:
-  TAO_SFP_Frame_State (void);
-  CORBA::Boolean is_complete (void);
+  TAO_SFP_Frame_State ();
+  CORBA::Boolean is_complete ();
 
-  int reset (void);
+  int reset ();
 
   TAO_InputCDR cdr;
   // This is the InputCDR that will be used to decode the message.