pvecm: pass correct nodename to finish_join

[pve-cluster.git] / data / src / dfsm.c

diff --git a/data/src/dfsm.c b/data/src/dfsm.c
index cdf473e8226ab9706d693a457ae70c0809afa0fa..529c7f99792a59decbb9125d86528950895e38cb 100644 (file)
--- a/data/src/dfsm.c
+++ b/data/src/dfsm.c
@@ -650,7 +650,7 @@ dfsm_cpg_deliver_callback(
        dfsm_t *dfsm = NULL;
        result = cpg_context_get(handle, (gpointer *)&dfsm);
        if (result != CS_OK || !dfsm || dfsm->cpg_callbacks != &cpg_callbacks) {
-               cfs_critical("cpg_context_get error: %d (%p)", result, dfsm);
+               cfs_critical("cpg_context_get error: %d (%p)", result, (void *) dfsm);
                return; /* we have no valid dfsm pointer, so we can just ignore this */
        }
        dfsm_mode_t mode = dfsm_get_mode(dfsm);
@@ -706,7 +706,7 @@ dfsm_cpg_deliver_callback(
                        int msg_res = -1;
                        int res = dfsm->dfsm_callbacks->dfsm_deliver_fn(
                                dfsm, dfsm->data, &msg_res, nodeid, pid, base_header->subtype, 
-                               base_header->time, msg + sizeof(dfsm_message_normal_header_t), 
+                               base_header->time, (uint8_t *)msg + sizeof(dfsm_message_normal_header_t),
                                msg_len - sizeof(dfsm_message_normal_header_t));
 
                        if (nodeid == dfsm->nodeid && pid == dfsm->pid)
@@ -739,7 +739,7 @@ dfsm_cpg_deliver_callback(
                return;
        }
 
-       msg += sizeof(dfsm_message_state_header_t);
+       msg = (uint8_t *) msg + sizeof(dfsm_message_state_header_t);
        msg_len -= sizeof(dfsm_message_state_header_t);
 
        if (mode == DFSM_MODE_SYNCED) {
@@ -761,7 +761,7 @@ dfsm_cpg_deliver_callback(
                        }
 
                        uint64_t csum_id = *((uint64_t *)msg);
-                       msg += 8; msg_len -= 8;
+                       msg = (uint8_t *) msg + 8; msg_len -= 8;
 
                        cfs_dom_debug(dfsm->log_domain, "got verify request from node %d %016" PRIX64, nodeid, csum_id);
 
@@ -795,7 +795,7 @@ dfsm_cpg_deliver_callback(
                                }
 
                                uint64_t csum_id = *((uint64_t *)msg);
-                               msg += 8; msg_len -= 8;
+                               msg = (uint8_t *) msg + 8; msg_len -= 8;
                                
                                if (dfsm->csum_id == csum_id &&
                                    (memcmp(&dfsm->csum_epoch, &header->epoch, sizeof(dfsm_sync_epoch_t)) == 0)) {
@@ -1108,7 +1108,7 @@ dfsm_cpg_confchg_callback(
        dfsm_t *dfsm = NULL;
        result = cpg_context_get(handle, (gpointer *)&dfsm);
        if (result != CS_OK || !dfsm || dfsm->cpg_callbacks != &cpg_callbacks) {
-               cfs_critical("cpg_context_get error: %d (%p)", result, dfsm);
+               cfs_critical("cpg_context_get error: %d (%p)", result, (void *) dfsm);
                return; /* we have no valid dfsm pointer, so we can just ignore this */
        }
 
@@ -1137,10 +1137,10 @@ dfsm_cpg_confchg_callback(
        }
 
        int lowest_nodeid = 0;
-       GString *str = g_string_new("members: ");
+       GString *member_ids = g_string_new(NULL);
        for (int i = 0; i < member_list_entries; i++) {
 
-               g_string_append_printf(str, i ? ", %d/%d" : "%d/%d",
+               g_string_append_printf(member_ids, i ? ", %d/%d" : "%d/%d",
                                       member_list[i].nodeid, member_list[i].pid);
 
                if (lowest_nodeid == 0 || lowest_nodeid > member_list[i].nodeid)
@@ -1153,9 +1153,9 @@ dfsm_cpg_confchg_callback(
 
 
        if ((dfsm->we_are_member || mode != DFSM_MODE_START))
-               cfs_dom_message(dfsm->log_domain, str->str);
+               cfs_dom_message(dfsm->log_domain, "members: %s",  member_ids->str);
 
-       g_string_free(str, 1);
+       g_string_free(member_ids, 1);
 
        dfsm->lowest_nodeid = lowest_nodeid;