PubSub: Correct the indendation in UA_Server_processNetworkMessage

src/pubsub/ua_pubsub.c

@@ -377,7 +377,6 @@ UA_ReaderGroupConfig_copy(const UA_ReaderGroupConfig *src,
 UA_StatusCode
 UA_Server_processNetworkMessage(UA_Server *server, UA_NetworkMessage *pMsg,
                                           UA_PubSubConnection *pConnection) {
-    UA_StatusCode retval = UA_STATUSCODE_BADNOTIMPLEMENTED;
     if((pMsg == NULL) || (pConnection == NULL)) {
         return UA_STATUSCODE_BADINVALIDARGUMENT;
     }
@@ -397,87 +396,87 @@ UA_Server_processNetworkMessage(UA_Server *server, UA_NetworkMessage *pMsg,
     }
 
     UA_DataSetReader* dataSetReaderErg = NULL;
-        if(pConnection->readerGroupsSize == 1) {
-            if(LIST_FIRST(&pConnection->readerGroups)->readersCount == 1) {
+    if(pConnection->readerGroupsSize == 1) {
+        if(LIST_FIRST(&pConnection->readerGroups)->readersCount == 1) {
             UA_LOG_INFO(&server->config.logger, UA_LOGCATEGORY_SERVER, "only 1 DataSetReader available. This one will be used.");
             dataSetReaderErg = LIST_FIRST(&LIST_FIRST(&pConnection->readerGroups)->readers);
-            }
-        } else {
-            if(publisherIdAvailable) {
-                UA_ReaderGroup* readerGroup;
-                LIST_FOREACH(readerGroup, &pConnection->readerGroups, listEntry) {
-                    UA_DataSetReader *tmpReader;
-                    LIST_FOREACH(tmpReader, &readerGroup->readers, listEntry) {
-                        if(publisherIdAvailable && (tmpReader->config.publisherId.type != NULL)) {
-                            switch (pMsg->publisherIdType) {
-                                case UA_PUBLISHERDATATYPE_BYTE:
-                                    if(tmpReader->config.publisherId.type == &UA_TYPES[UA_TYPES_BYTE] &&
-                                       pMsg->publisherIdType == UA_PUBLISHERDATATYPE_BYTE &&
-                                       pMsg->publisherId.publisherIdByte == *(UA_Byte*)tmpReader->config.publisherId.data) {
-                                        dataSetReaderErg = tmpReader;
-                                        goto process;
-                                    }
-                                    break;
-                                case UA_PUBLISHERDATATYPE_UINT16:
-                                    if(tmpReader->config.publisherId.type == &UA_TYPES[UA_TYPES_UINT16] &&
-                                       pMsg->publisherIdType == UA_PUBLISHERDATATYPE_UINT16 &&
-                                       pMsg->publisherId.publisherIdUInt16 == *(UA_UInt16*)tmpReader->config.publisherId.data) {
-                                         dataSetReaderErg = tmpReader;
-                                         goto process;
-                                    }
-                                    break;
-                                case UA_PUBLISHERDATATYPE_UINT32:
-                                    if(tmpReader->config.publisherId.type == &UA_TYPES[UA_TYPES_UINT32] &&
-                                       pMsg->publisherIdType == UA_PUBLISHERDATATYPE_UINT32 &&
-                                       pMsg->publisherId.publisherIdUInt32 == *(UA_UInt32*)tmpReader->config.publisherId.data) {
-                                        dataSetReaderErg = tmpReader;
-                                        goto process;
-                                    }
-                                    break;
-                                case UA_PUBLISHERDATATYPE_UINT64:
-                                    if(tmpReader->config.publisherId.type == &UA_TYPES[UA_TYPES_UINT64] &&
-                                       pMsg->publisherIdType == UA_PUBLISHERDATATYPE_UINT64 &&
-                                       pMsg->publisherId.publisherIdUInt64 == *(UA_UInt64*)tmpReader->config.publisherId.data) {
-                                        dataSetReaderErg = tmpReader;
-                                        goto process;
-                                    }
-                                    break;
-                                case UA_PUBLISHERDATATYPE_STRING:
-                                    if(tmpReader->config.publisherId.type == &UA_TYPES[UA_TYPES_STRING] &&
-                                       pMsg->publisherIdType == UA_PUBLISHERDATATYPE_STRING &&
-                                       UA_String_equal(&pMsg->publisherId.publisherIdString, (UA_String*)tmpReader->config.publisherId.data)) {
-                                        dataSetReaderErg = tmpReader;
-                                        goto process;
-                                    }
-                                    break;
-                            default:
-                                return UA_STATUSCODE_BADINTERNALERROR;
+        }
+    } else {
+        if(publisherIdAvailable) {
+            UA_ReaderGroup* readerGroup;
+            LIST_FOREACH(readerGroup, &pConnection->readerGroups, listEntry) {
+                UA_DataSetReader *tmpReader;
+                LIST_FOREACH(tmpReader, &readerGroup->readers, listEntry) {
+                    if(publisherIdAvailable && (tmpReader->config.publisherId.type != NULL)) {
+                        switch (pMsg->publisherIdType) {
+                        case UA_PUBLISHERDATATYPE_BYTE:
+                            if(tmpReader->config.publisherId.type == &UA_TYPES[UA_TYPES_BYTE] &&
+                               pMsg->publisherIdType == UA_PUBLISHERDATATYPE_BYTE &&
+                               pMsg->publisherId.publisherIdByte == *(UA_Byte*)tmpReader->config.publisherId.data) {
+                                dataSetReaderErg = tmpReader;
+                                goto process;
+                            }
+                            break;
+                        case UA_PUBLISHERDATATYPE_UINT16:
+                            if(tmpReader->config.publisherId.type == &UA_TYPES[UA_TYPES_UINT16] &&
+                               pMsg->publisherIdType == UA_PUBLISHERDATATYPE_UINT16 &&
+                               pMsg->publisherId.publisherIdUInt16 == *(UA_UInt16*)tmpReader->config.publisherId.data) {
+                                dataSetReaderErg = tmpReader;
+                                goto process;
                             }
-                         }
-                     }
-                 }
-             }
-         }
-
-        /* No Reader with the specified id found */
-        if(!dataSetReaderErg) {
-            UA_LOG_INFO(&server->config.logger, UA_LOGCATEGORY_SERVER, "No DataSetReader found with PublisherId");
-            return UA_STATUSCODE_BADNOTFOUND; /* TODO: Check the return code */
+                            break;
+                        case UA_PUBLISHERDATATYPE_UINT32:
+                            if(tmpReader->config.publisherId.type == &UA_TYPES[UA_TYPES_UINT32] &&
+                               pMsg->publisherIdType == UA_PUBLISHERDATATYPE_UINT32 &&
+                               pMsg->publisherId.publisherIdUInt32 == *(UA_UInt32*)tmpReader->config.publisherId.data) {
+                                dataSetReaderErg = tmpReader;
+                                goto process;
+                            }
+                            break;
+                        case UA_PUBLISHERDATATYPE_UINT64:
+                            if(tmpReader->config.publisherId.type == &UA_TYPES[UA_TYPES_UINT64] &&
+                               pMsg->publisherIdType == UA_PUBLISHERDATATYPE_UINT64 &&
+                               pMsg->publisherId.publisherIdUInt64 == *(UA_UInt64*)tmpReader->config.publisherId.data) {
+                                dataSetReaderErg = tmpReader;
+                                goto process;
+                            }
+                            break;
+                        case UA_PUBLISHERDATATYPE_STRING:
+                            if(tmpReader->config.publisherId.type == &UA_TYPES[UA_TYPES_STRING] &&
+                               pMsg->publisherIdType == UA_PUBLISHERDATATYPE_STRING &&
+                               UA_String_equal(&pMsg->publisherId.publisherIdString, (UA_String*)tmpReader->config.publisherId.data)) {
+                                dataSetReaderErg = tmpReader;
+                                goto process;
+                            }
+                            break;
+                        default:
+                            return UA_STATUSCODE_BADINTERNALERROR;
+                        }
+                    }
+                }
+            }
         }
+    }
+
+    /* No Reader with the specified id found */
+    if(!dataSetReaderErg) {
+        UA_LOG_INFO(&server->config.logger, UA_LOGCATEGORY_SERVER, "No DataSetReader found with PublisherId");
+        return UA_STATUSCODE_BADNOTFOUND; /* TODO: Check the return code */
+    }
 
-        UA_LOG_DEBUG(&server->config.logger, UA_LOGCATEGORY_SERVER, "DataSetReader found with PublisherId");
+    UA_LOG_DEBUG(&server->config.logger, UA_LOGCATEGORY_SERVER, "DataSetReader found with PublisherId");
 
  process:
 
-        for(UA_Byte iterator = 0; iterator < anzDataSets; iterator++) {
-            UA_LOG_DEBUG(&server->config.logger, UA_LOGCATEGORY_SERVER, "Process Msg with DataSetReader!");
-            UA_Server_DataSetReader_process(server, dataSetReaderErg, &pMsg->payload.dataSetPayload.dataSetMessages[iterator]);
-        }
+    for(UA_Byte iterator = 0; iterator < anzDataSets; iterator++) {
+        UA_LOG_DEBUG(&server->config.logger, UA_LOGCATEGORY_SERVER, "Process Msg with DataSetReader!");
+        UA_Server_DataSetReader_process(server, dataSetReaderErg, &pMsg->payload.dataSetPayload.dataSetMessages[iterator]);
+    }
 
-        /* To Do the condition with dataSetWriterId and WriterGroupId
-         * else condition for dataSetWriterIdAvailable and writerGroupIdAvailable) */
+    /* To Do the condition with dataSetWriterId and WriterGroupId
+     * else condition for dataSetWriterIdAvailable and writerGroupIdAvailable) */
 
-    return retval;
+    return UA_STATUSCODE_GOOD;
 }
 
 /**