Refactor: various: Use correct pcmk__assert_alloc() arg order

This should make absolutely no difference but uses the correct
semantics.

Signed-off-by: Reid Wahl <[email protected]>

Author: nrwahl2

daemons/fenced/fenced_commands.c

@@ -925,7 +925,7 @@ build_port_aliases(const char *hostmap, GList ** targets)
             case ':':
                 if (i > last) {
                     free(name);
-                    name = pcmk__assert_alloc(1, 1 + i - last);
+                    name = pcmk__assert_alloc(1 + i - last, sizeof(char));
                     memcpy(name, hostmap + last, i - last);
                 }
                 last = i + 1;
@@ -939,7 +939,8 @@ build_port_aliases(const char *hostmap, GList ** targets)
             case '\t':
                 if (name) {
                     int k = 0;
-                    char *value = pcmk__assert_alloc(1, 1 + i - last);
+                    char *value = pcmk__assert_alloc(1 + i - last,
+                                                     sizeof(char));
 
                     memcpy(value, hostmap + last, i - last);
 

lib/cluster/cpg.c

@@ -466,7 +466,7 @@ pcmk__cpg_message_data(cpg_handle_t handle, uint32_t sender_id, uint32_t pid,
     if (msg->is_compressed && (msg->size > 0)) {
         int rc = BZ_OK;
         unsigned int new_size = msg->size + 1;
-        char *uncompressed = pcmk__assert_alloc(1, new_size);
+        char *uncompressed = pcmk__assert_alloc(new_size, sizeof(char));
 
         rc = BZ2_bzBuffToBuffDecompress(uncompressed, &new_size, msg->data,
                                         msg->compressed_size, 1, 0);

lib/common/actions.c

@@ -403,7 +403,7 @@ decode_transition_magic(const char *magic, char **uuid, int *transition_id, int
     res = sscanf(magic, "%d:%d;%ms", &local_op_status, &local_op_rc, &key);
 #else
     // magic must have >=4 other characters
-    key = pcmk__assert_alloc(1, strlen(magic) - 3);
+    key = pcmk__assert_alloc(strlen(magic) - 3, sizeof(char));
     res = sscanf(magic, "%d:%d;%s", &local_op_status, &local_op_rc, key);
 #endif
     if (res == EOF) {

lib/common/fuzzers/iso8601_fuzzer.c

@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 the Pacemaker project contributors
+ * Copyright 2024-2025 the Pacemaker project contributors
  *
  * The version control history for this file may have further details.
  *
@@ -27,7 +27,7 @@ LLVMFuzzerTestOneInput(const uint8_t *data, size_t size)
     if (size < 10) {
         return -1; // Do not add input to testing corpus
     }
-    ns = pcmk__assert_alloc(1, size + 1);
+    ns = pcmk__assert_alloc(size + 1, sizeof(char));
     memcpy(ns, data, size);
 
     period = crm_time_parse_period(ns);

lib/common/fuzzers/scores_fuzzer.c

@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 the Pacemaker project contributors
+ * Copyright 2024-2025 the Pacemaker project contributors
  *
  * The version control history for this file may have further details.
  *
@@ -21,7 +21,7 @@ LLVMFuzzerTestOneInput(const uint8_t *data, size_t size)
     guint result = 0U;
 
     if (size > 0) {
-        ns = pcmk__assert_alloc(1, size + 1);
+        ns = pcmk__assert_alloc(size + 1, sizeof(char));
         memcpy(ns, data, size);
         ns[size] = '\0';
     }

lib/common/fuzzers/strings_fuzzer.c

@@ -28,7 +28,7 @@ LLVMFuzzerTestOneInput(const uint8_t *data, size_t size)
     if (size < 10) {
         return -1; // Do not add input to testing corpus
     }
-    ns = pcmk__assert_alloc(1, size + 1);
+    ns = pcmk__assert_alloc(size + 1, sizeof(char));
     memcpy(ns, data, size);
     ns[size] = '\0';
 

lib/common/output_text.c

@@ -481,7 +481,7 @@ pcmk__text_prompt(const char *prompt, bool echo, char **dest)
 #if HAVE_SSCANF_M
         rc = scanf("%ms", dest);
 #else
-        *dest = pcmk__assert_alloc(1, 1024);
+        *dest = pcmk__assert_alloc(1024, sizeof(char));
         rc = scanf("%1023s", *dest);
 #endif
         fprintf(stderr, "\n");

lib/common/procfs.c

@@ -398,7 +398,7 @@ pcmk__throttle_cib_load(const char *server, float *load)
     }
 
     if (fgets(buffer, sizeof(buffer), stream) != NULL) {
-        char *comm = pcmk__assert_alloc(1, 256);
+        char *comm = pcmk__assert_alloc(256, sizeof(char));
         char state = 0;
         int rc = 0, pid = 0, ppid = 0, pgrp = 0, session = 0, tty_nr = 0, tpgid = 0;
         unsigned long flags = 0, minflt = 0, cminflt = 0, majflt = 0, cmajflt = 0, utime = 0, stime = 0;

lib/common/remote.c

@@ -293,7 +293,7 @@ pcmk__remote_message_xml(pcmk__remote_t *remote)
         int rc = 0;
         unsigned int size_u = 1 + header->payload_uncompressed;
         char *uncompressed =
-            pcmk__assert_alloc(1, header->payload_offset + size_u);
+            pcmk__assert_alloc(header->payload_offset + size_u, sizeof(char));
 
         crm_trace("Decompressing message data %d bytes into %d bytes",
                  header->payload_compressed, size_u);

lib/pacemaker/pcmk_injections.c

@@ -581,8 +581,8 @@ inject_action(pcmk__output_t *out, const char *spec, cib_t *cib,
 
     out->message(out, "inject-spec", spec);
 
-    key = pcmk__assert_alloc(1, strlen(spec) + 1);
-    node = pcmk__assert_alloc(1, strlen(spec) + 1);
+    key = pcmk__assert_alloc(strlen(spec) + 1, sizeof(char));
+    node = pcmk__assert_alloc(strlen(spec) + 1, sizeof(char));
     rc = sscanf(spec, "%[^@]@%[^=]=%d", key, node, &outcome);
     if (rc != 3) {
         out->err(out, "Invalid operation spec: %s.  Only found %d fields",