Refactor: libcib: Use done label in cib__perform_op_ro()

Signed-off-by: Reid Wahl <nrwahl@protonmail.com>

Author: nrwahl2

lib/cib/cib_utils.c

@@ -268,26 +268,34 @@ cib__perform_op_ro(cib__op_fn_t fn, xmlNode *req, xmlNode **current_cib,
                      && (cib == xmlDocGetRootElement(cib->doc)));
     }
 
-    if (*output == NULL) {
-        // Do nothing
+    if (cib_filtered == *output) {
+        // Let the caller have this copy
+        return rc;
+    }
 
-    } else if (cib_filtered == *output) {
-        // Let them have this copy
-        cib_filtered = NULL;
+    if (*output == NULL) {
+        goto done;
+    }
 
-    } else if (*output == *current_cib) {
-        // They already know not to free it
+    if (*output == *current_cib) {
+        // Trust the caller to check this and not free *output
+        goto done;
+    }
 
-    } else if ((cib_filtered != NULL)
-               && ((*output)->doc == cib_filtered->doc)) {
-        // We're about to free the document of which *output is a part
+    if ((*output)->doc == (*current_cib)->doc) {
+        // Give the caller a copy that it can free
         *output = pcmk__xml_copy(NULL, *output);
+        goto done;
+    }
 
-    } else if ((*output)->doc == (*current_cib)->doc) {
-        // Give them a copy they can free
-        *output = pcmk__xml_copy(NULL, *output);
+    if ((cib_filtered == NULL) || ((*output)->doc != cib_filtered->doc)) {
+        goto done;
     }
 
+    // We're about to free the document of which *output is a part
+    *output = pcmk__xml_copy(NULL, *output);
+
+done:
     pcmk__xml_free(cib_filtered);
     return rc;
 }