ソースを参照

Removes side effects from if

Signed-off-by: Martin Melik-Merkumians <melik-merkumians@acin.tuwien.ac.at>
Martin Melik-Merkumians 7 年 前
コミット
faa6be6338
1 ファイル変更6 行追加3 行削除
  1. 6 3
      source/src/cip/cipassembly.c

+ 6 - 3
source/src/cip/cipassembly.c

@@ -80,9 +80,12 @@ void ShutdownAssemblies(void) {
 CipInstance *CreateAssemblyObject(const EipUint32 instance_id,
                                   EipByte *const data,
                                   const EipUint16 data_length) {
-  CipClass *assembly_class = NULL;
-  if( NULL == (assembly_class = GetCipClass(kCipAssemblyClassCode) ) &&
-      NULL == (assembly_class = CreateAssemblyClass() ) ) {
+  CipClass *assembly_class = GetCipClass(kCipAssemblyClassCode);
+  if(NULL == assembly_class) {
+    assembly_class = CreateAssemblyClass();
+  }
+
+  if(NULL == assembly_class) {
     return NULL;
   }