Parcourir la source

Removes comments and test code

Signed-off-by: CapXilinx <melik-merkumians@acin.tuwien.ac.at>
CapXilinx il y a 8 ans
Parent
commit
c51df2731c
2 fichiers modifiés avec 0 ajouts et 20 suppressions
  1. 0 4
      source/src/cip/appcontype.c
  2. 0 16
      source/src/cip/cipioconnection.c

+ 0 - 4
source/src/cip/appcontype.c

@@ -144,7 +144,6 @@ CipConnectionObject *GetIoConnectionForConnectionData(
                                                   extended_error);
                                                   extended_error);
           if ( (NULL == io_connection) && (0 == *extended_error) ) {
           if ( (NULL == io_connection) && (0 == *extended_error) ) {
             /* no application connection type was found that suits the given data */
             /* no application connection type was found that suits the given data */
-            /* TODO check error code VS */
             *extended_error =
             *extended_error =
               kConnectionManagerExtendedStatusCodeInconsistentApplicationPathCombo;
               kConnectionManagerExtendedStatusCodeInconsistentApplicationPathCombo;
           } else {
           } else {
@@ -152,7 +151,6 @@ CipConnectionObject *GetIoConnectionForConnectionData(
                                             kConnectionObjectInstanceTypeIOListenOnly);
                                             kConnectionObjectInstanceTypeIOListenOnly);
             OPENER_TRACE_INFO("IO Listen only connection requested\n");
             OPENER_TRACE_INFO("IO Listen only connection requested\n");
             //Is listen only connection
             //Is listen only connection
-            //connection_object->instance_type = kConnectionTypeIoListenOnly;
           }
           }
         }
         }
       } else {
       } else {
@@ -167,13 +165,11 @@ CipConnectionObject *GetIoConnectionForConnectionData(
                                     kConnectionObjectInstanceTypeIOExclusiveOwner);
                                     kConnectionObjectInstanceTypeIOExclusiveOwner);
     OPENER_TRACE_INFO("IO Exclusive Owner connection requested\n");
     OPENER_TRACE_INFO("IO Exclusive Owner connection requested\n");
     //Is exclusive owner connection
     //Is exclusive owner connection
-    //connection_object->instance_type = kConnectionTypeIoExclusiveOwner;
   }
   }
 
 
   if (NULL != io_connection) {
   if (NULL != io_connection) {
     ConnectionObjectDeepCopy(io_connection, connection_object);
     ConnectionObjectDeepCopy(io_connection, connection_object);
   }
   }
-//  OPENER_ASSERT(ConnectionObjectGetInstanceType(io_connection) == ConnectionObjectGetInstanceType(connection_object));
 
 
   return io_connection;
   return io_connection;
 }
 }

+ 0 - 16
source/src/cip/cipioconnection.c

@@ -657,18 +657,6 @@ EipUint16 HandleConfigData(CipConnectionObject *connection_object) {
   return connection_manager_status;
   return connection_manager_status;
 }
 }
 
 
-bool CheckForDeadConnectionsInActiveConnectionList() {
-  DoublyLinkedListNode *node = connection_list.first;
-  while(NULL != node) {
-    if( ( (CipConnectionObject *)node->data )->connection_close_function ==
-        NULL ) {
-      return true;
-    }
-    node = node->next;
-  }
-  return false;
-}
-
 void CloseIoConnection(CipConnectionObject *connection_object) {
 void CloseIoConnection(CipConnectionObject *connection_object) {
 
 
   CheckIoConnectionEvent(connection_object->consumed_path.instance_id,
   CheckIoConnectionEvent(connection_object->consumed_path.instance_id,
@@ -718,10 +706,6 @@ void CloseIoConnection(CipConnectionObject *connection_object) {
 
 
   CloseCommunicationChannelsAndRemoveFromActiveConnectionsList(
   CloseCommunicationChannelsAndRemoveFromActiveConnectionsList(
     connection_object);
     connection_object);
-
-  if(CheckForDeadConnectionsInActiveConnectionList() ) {
-    OPENER_ASSERT(false);
-  }
 }
 }
 
 
 void HandleIoConnectionTimeOut(CipConnectionObject *connection_object) {
 void HandleIoConnectionTimeOut(CipConnectionObject *connection_object) {