Refactor: libcib: Drop section arg of cib__perform_query/cib_perform_op

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

Author: nrwahl2

daemons/based/based_callbacks.c

@@ -517,7 +517,6 @@ cib_process_command(xmlNode *request, const cib__operation_t *operation,
     uint32_t call_options = cib_none;
 
     const char *op = pcmk__xe_get(request, PCMK__XA_CIB_OP);
-    const char *section = pcmk__xe_get(request, PCMK__XA_CIB_SECTION);
     const char *call_id = pcmk__xe_get(request, PCMK__XA_CIB_CALLID);
     const char *client_id = pcmk__xe_get(request, PCMK__XA_CIB_CLIENTID);
     const char *client_name = pcmk__xe_get(request, PCMK__XA_CIB_CLIENTNAME);
@@ -553,8 +552,7 @@ cib_process_command(xmlNode *request, const cib__operation_t *operation,
     }
 
     if (!pcmk__is_set(operation->flags, cib__op_attr_modifies)) {
-        rc = cib__perform_query(op_function, section, request, &the_cib,
-                                &output);
+        rc = cib__perform_query(op_function, request, &the_cib, &output);
         goto done;
     }
 
@@ -565,9 +563,8 @@ cib_process_command(xmlNode *request, const cib__operation_t *operation,
      * It's not important whether the client variant is cib_native or
      * cib_remote.
      */
-    rc = cib_perform_op(cib_undefined, op_function, section, request,
-                        &config_changed, &the_cib, &result_cib, &cib_diff,
-                        &output);
+    rc = cib_perform_op(cib_undefined, op_function, request, &config_changed,
+                        &the_cib, &result_cib, &cib_diff, &output);
 
     /* Always write to disk for successful ops with the flag set. This also
      * negates the need to detect ordering changes.

include/crm/cib/internal.h

@@ -181,13 +181,12 @@ cib__client_triggers_refresh(const char *name)
 
 int cib__get_notify_patchset(const xmlNode *msg, const xmlNode **patchset);
 
-int cib__perform_query(cib__op_fn_t fn, const char *section, xmlNode *req,
-                       xmlNode **current_cib, xmlNode **output);
+int cib__perform_query(cib__op_fn_t fn, xmlNode *req, xmlNode **current_cib,
+                       xmlNode **output);
 
-int cib_perform_op(enum cib_variant variant, cib__op_fn_t fn,
-                   const char *section, xmlNode *req, bool *config_changed,
-                   xmlNode **current_cib, xmlNode **result_cib, xmlNode **diff,
-                   xmlNode **output);
+int cib_perform_op(enum cib_variant variant, cib__op_fn_t fn, xmlNode *req,
+                   bool *config_changed, xmlNode **current_cib,
+                   xmlNode **result_cib, xmlNode **diff, xmlNode **output);
 
 int cib__create_op(cib_t *cib, const char *op, const char *host,
                    const char *section, xmlNode *data, int call_options,

lib/cib/cib_file.c

@@ -143,10 +143,8 @@ process_request(cib_t *cib, xmlNode *request, xmlNode **output)
     const cib__operation_t *operation = NULL;
     cib__op_fn_t op_function = NULL;
 
-    int call_id = 0;
     uint32_t call_options = cib_none;
     const char *op = pcmk__xe_get(request, PCMK__XA_CIB_OP);
-    const char *section = pcmk__xe_get(request, PCMK__XA_CIB_SECTION);
 
     bool changed = false;
     bool read_only = false;
@@ -159,7 +157,6 @@ process_request(cib_t *cib, xmlNode *request, xmlNode **output)
     cib__get_operation(op, &operation);
     op_function = get_op_function(operation);
 
-    pcmk__xe_get_int(request, PCMK__XA_CIB_CALLID, &call_id);
     rc = pcmk__xe_get_flags(request, PCMK__XA_CIB_CALLOPT, &call_options,
                             cib_none);
     if (rc != pcmk_rc_ok) {
@@ -169,10 +166,10 @@ process_request(cib_t *cib, xmlNode *request, xmlNode **output)
     read_only = !pcmk__is_set(operation->flags, cib__op_attr_modifies);
 
     if (read_only) {
-        rc = cib__perform_query(op_function, section, request,
-                                &private->cib_xml, output);
+        rc = cib__perform_query(op_function, request, &private->cib_xml,
+                                output);
     } else {
-        rc = cib_perform_op(cib_file, op_function, section, request, &changed,
+        rc = cib_perform_op(cib_file, op_function, request, &changed,
                             &private->cib_xml, &result_cib, &cib_diff, output);
     }
 

lib/cib/cib_utils.c

@@ -187,11 +187,12 @@ get_op_input(const xmlNode *request)
 }
 
 int
-cib__perform_query(cib__op_fn_t fn, const char *section, xmlNode *req,
-                   xmlNode **current_cib, xmlNode **output)
+cib__perform_query(cib__op_fn_t fn, xmlNode *req, xmlNode **current_cib,
+                   xmlNode **output)
 {
     int rc = pcmk_rc_ok;
     const char *op = NULL;
+    const char *section = NULL;
     const char *user = NULL;
     uint32_t call_options = cib_none;
     xmlNode *input = NULL;
@@ -204,6 +205,7 @@ cib__perform_query(cib__op_fn_t fn, const char *section, xmlNode *req,
                  && (output != NULL) && (*output == NULL));
 
     op = pcmk__xe_get(req, PCMK__XA_CIB_OP);
+    section = pcmk__xe_get(req, PCMK__XA_CIB_SECTION);
     user = pcmk__xe_get(req, PCMK__XA_CIB_USER);
     pcmk__xe_get_flags(req, PCMK__XA_CIB_CALLOPT, &call_options, cib_none);
 
@@ -462,13 +464,14 @@ set_update_origin(xmlNode *new_cib, const xmlNode *request)
 }
 
 int
-cib_perform_op(enum cib_variant variant, cib__op_fn_t fn, const char *section,
-               xmlNode *req, bool *config_changed, xmlNode **current_cib,
+cib_perform_op(enum cib_variant variant, cib__op_fn_t fn, xmlNode *req,
+               bool *config_changed, xmlNode **current_cib,
                xmlNode **result_cib, xmlNode **diff, xmlNode **output)
 {
     int rc = pcmk_rc_ok;
 
     const char *op = NULL;
+    const char *section = NULL;
     const char *user = NULL;
     uint32_t call_options = cib_none;
     xmlNode *input = NULL;
@@ -492,6 +495,7 @@ cib_perform_op(enum cib_variant variant, cib__op_fn_t fn, const char *section,
                  && (output != NULL) && (*output == NULL));
 
     op = pcmk__xe_get(req, PCMK__XA_CIB_OP);
+    section = pcmk__xe_get(req, PCMK__XA_CIB_SECTION);
     user = pcmk__xe_get(req, PCMK__XA_CIB_USER);
     pcmk__xe_get_flags(req, PCMK__XA_CIB_CALLOPT, &call_options, cib_none);