build: fix format errors

lge · lge · commit fc87717a91fa · 2016-03-02T14:28:54.000+01:00
mostly trivial:

for s?size_t -&gt; use z modifier
for long/int/time_t/pid_t: add explicit cast, or use different specifier
for char*/void*: use explicit cast

for too many/too few arguments, use git log and context to either
  add format specifier or drop argument, resp.
  drop format specifier or add suitable argument.

ipc.c:497: error: format '%d' expects type 'int', but argument 10 has type 'ssize_t'
ipc.c:500: error: format '%d' expects type 'int', but argument 10 has type 'ssize_t'
ipc.c:500: error: format '%.120s' expects type 'char *', but argument 11 has type 'void *'
ipc.c:512: error: format '%d' expects type 'int', but argument 12 has type 'ssize_t'
ipc.c:661: error: format '%d' expects type 'int', but argument 8 has type 'ssize_t'
ipc.c:831: error: too few arguments for format
utils.c:2075: error: format '%lu' expects type 'long unsigned int', but argument 10 has type 'unsigned int'
utils.c:2075: error: format '%lu' expects type 'long unsigned int', but argument 11 has type 'unsigned int'
utils.c:2075: error: format '%lu' expects type 'long unsigned int', but argument 12 has type 'unsigned int'
utils.c:2075: error: format '%lu' expects type 'long unsigned int', but argument 13 has type 'unsigned int'
xml.c:910: error: too many arguments for format
xml.c:2429: error: '0' flag ignored with precision and '%x' gnu_printf format
xml.c:4163: error: '0' flag ignored with precision and '%x' gnu_printf format
iso8601.c:982: error: too few arguments for format
remote.c:237: error: format '%d' expects type 'int', but argument 7 has type 'size_t'
remote.c:250: error: format '%d' expects type 'int', but argument 8 has type 'size_t'
remote.c:276: error: format '%d' expects type 'int', but argument 8 has type 'size_t'
remote.c:291: error: format '%d' expects type 'int', but argument 8 has type 'size_t'
remote.c:521: error: format '%u' expects type 'unsigned int', but argument 7 has type 'size_t'
remote.c:562: error: format '%u' expects type 'unsigned int', but argument 8 has type 'size_t'
remote.c:568: error: format '%u' expects type 'unsigned int', but argument 7 has type 'size_t'
remote.c:572: error: format '%u' expects type 'unsigned int', but argument 7 has type 'size_t'
remote.c:580: error: format '%u' expects type 'unsigned int', but argument 7 has type 'size_t'
remote.c:583: error: format '%u' expects type 'unsigned int', but argument 7 has type 'size_t'
remote.c:693: error: too few arguments for format
mainloop.c:659: error: format '%d' expects type 'int', but argument 9 has type 'long int'
mainloop.c:659: error: too many arguments for format
unpack.c:2884: error: too many arguments for format
utils.c:234: error: too many arguments for format
services_linux.c:92: error: too many arguments for format
dbus.c:521: error: format '%ld' expects type 'long int', but argument 8 has type 'int'
lrmd_client.c:1771: error: format '%d' expects type 'int', but argument 7 has type 'size_t'
lrmd_client.c:1913: error: format '%d' expects type 'int', but argument 7 has type 'size_t'
cpg.c:169: error: format '%d' expects type 'int', but argument 7 has type 'size_t'
cpg.c:181: error: format '%d' expects type 'int', but argument 11 has type 'ssize_t'
cpg.c:203: error: format '%d' expects type 'int', but argument 8 has type 'size_t'
cpg.c:626: error: format '%d' expects type 'int', but argument 9 has type 'size_t'
cpg.c:629: error: format '%d' expects type 'int', but argument 9 has type 'size_t'
diff --git a/cib/callbacks.c b/cib/callbacks.c
@@ -1088,7 +1088,7 @@ cib_process_request(xmlNode * request, gboolean force_synchronous, gboolean priv
 
         finished = time(NULL);
         if (finished - now > 3) {
-            crm_trace("%s operation took %ds to complete", op, finished - now);
+            crm_trace("%s operation took %lds to complete", op, (long)(finished - now));
             crm_write_blackbox(0, NULL);
         }
 
diff --git a/cib/io.c b/cib/io.c
@@ -183,7 +183,9 @@ static int cib_archive_sort(const struct dirent ** a, const struct dirent **b)
         rc = -1;
     }
 
-    crm_trace("%s (%u) vs. %s (%u) : %d", a[0]->d_name, a_age, b[0]->d_name, b_age, rc);
+    crm_trace("%s (%lu) vs. %s (%lu) : %d",
+	a[0]->d_name, (unsigned long)a_age,
+	b[0]->d_name, (unsigned long)b_age, rc);
     return rc;
 }
 
diff --git a/cib/remote.c b/cib/remote.c
@@ -436,7 +436,7 @@ cib_handle_remote_msg(crm_client_t * client, xmlNode * command)
         value = crm_element_value(command, F_CIB_CALLBACK_TOKEN);
         if (value != NULL) {
             client->userdata = strdup(value);
-            crm_trace("Callback channel for %s is %s", client->id, client->userdata);
+            crm_trace("Callback channel for %s is %s", client->id, (char*)client->userdata);
 
         } else {
             client->userdata = strdup(client->id);
diff --git a/crmd/lrm.c b/crmd/lrm.c
@@ -601,7 +601,7 @@ build_parameter_list(lrmd_event_data_t *op, xmlNode *metadata, xmlNode *result,
             if(result && accept) {
                 value = g_hash_table_lookup(op->params, name);
                 if(value != NULL) {
-                    crm_trace("Adding attr to the xml result", name, target?"":"not ", criteria);
+                    crm_trace("Adding attr %s=%s to the xml result", name, value);
                     crm_xml_add(result, name, value);
                 }
             }
@@ -1928,7 +1928,7 @@ stop_recurring_action_by_rsc(gpointer key, gpointer value, gpointer user_data)
     struct recurring_op_s *op = (struct recurring_op_s *)value;
 
     if (op->interval != 0 && crm_str_eq(op->rsc_id, event->rsc->id, TRUE)) {
-        crm_debug("Cancelling op %d for %s (%s)", op->call_id, op->rsc_id, key);
+        crm_debug("Cancelling op %d for %s (%s)", op->call_id, op->rsc_id, (char*)key);
         remove = !cancel_op(event->lrm_state, event->rsc->id, key, op->call_id, FALSE);
     }
 
diff --git a/crmd/lrm_state.c b/crmd/lrm_state.c
@@ -75,7 +75,7 @@ fail_pending_op(gpointer key, gpointer value, gpointer user_data)
 
     crm_trace("Pre-emptively failing %s_%s_%d on %s (call=%s, %s)",
               op->rsc_id, op->op_type, op->interval,
-              lrm_state->node_name, key, op->user_data);
+              lrm_state->node_name, (char*)key, op->user_data);
 
     event.type = lrmd_event_exec_complete;
     event.rsc_id = op->rsc_id;
diff --git a/crmd/throttle.c b/crmd/throttle.c
@@ -215,10 +215,10 @@ static bool throttle_cib_load(float *load)
             *load = (delta_utime + delta_stime); /* Cast to a float before division */
             *load /= ticks_per_s;
             *load /= elapsed;
-            crm_debug("cib load: %f (%lu ticks in %ds)", *load, delta_utime + delta_stime, elapsed);
+            crm_debug("cib load: %f (%lu ticks in %lds)", *load, delta_utime + delta_stime, (long)elapsed);
 
         } else {
-            crm_debug("Init %lu + %lu ticks at %d (%lu tps)", utime, stime, now, ticks_per_s);
+            crm_debug("Init %lu + %lu ticks at %ld (%lu tps)", utime, stime, (long)now, ticks_per_s);
         }
 
         last_call = now;
diff --git a/lib/cluster/cpg.c b/lib/cluster/cpg.c
@@ -166,7 +166,7 @@ crm_cs_flush(gpointer data)
 
         sent++;
         last_sent++;
-        crm_trace("CPG message sent, size=%d", iov->iov_len);
+        crm_trace("CPG message sent, size=%zd", iov->iov_len);
 
         cs_message_queue = g_list_remove(cs_message_queue, iov);
         free(iov->iov_base);
@@ -178,7 +178,7 @@ crm_cs_flush(gpointer data)
         crm_info("Sent %d CPG messages  (%d remaining, last=%u): %s (%d)",
                  sent, queue_len, last_sent, ais_error2text(rc), rc);
     } else {
-        crm_trace("Sent %d CPG messages  (%d remaining, last=%u): %s (%d)",
+        crm_trace("Sent %d CPG messages  (%d remaining, last=%u): %s (%zd)",
                   sent, queue_len, last_sent, ais_error2text(rc), rc);
     }
 
@@ -200,7 +200,7 @@ send_cpg_iov(struct iovec * iov)
     static unsigned int queued = 0;
 
     queued++;
-    crm_trace("Queueing CPG message %u (%d bytes)", queued, iov->iov_len);
+    crm_trace("Queueing CPG message %u (%zd bytes)", queued, iov->iov_len);
     cs_message_queue = g_list_append(cs_message_queue, iov);
     crm_cs_flush(&pcmk_cpg_handle);
     return TRUE;
@@ -623,10 +623,10 @@ send_cluster_text(int class, const char *data,
     iov->iov_len = msg->header.size;
 
     if (msg->compressed_size) {
-        crm_trace("Queueing CPG message %u to %s (%d bytes, %d bytes compressed payload): %.200s",
+        crm_trace("Queueing CPG message %u to %s (%zd bytes, %d bytes compressed payload): %.200s",
                   msg->id, target, iov->iov_len, msg->compressed_size, data);
     } else {
-        crm_trace("Queueing CPG message %u to %s (%d bytes, %d bytes payload): %.200s",
+        crm_trace("Queueing CPG message %u to %s (%zd bytes, %d bytes payload): %.200s",
                   msg->id, target, iov->iov_len, msg->size, data);
     }
     free(target);
diff --git a/lib/common/ipc.c b/lib/common/ipc.c
@@ -494,11 +494,11 @@ crm_ipcs_flush_events(crm_client_t * c)
         sent++;
         header = event[0].iov_base;
         if (header->size_compressed) {
-            crm_trace("Event %d to %p[%d] (%d compressed bytes) sent",
+            crm_trace("Event %d to %p[%d] (%zu compressed bytes) sent",
                       header->qb.id, c->ipcs, c->pid, rc);
         } else {
-            crm_trace("Event %d to %p[%d] (%d bytes) sent: %.120s",
-                      header->qb.id, c->ipcs, c->pid, rc, event[1].iov_base);
+            crm_trace("Event %d to %p[%d] (%zu bytes) sent: %.120s",
+                      header->qb.id, c->ipcs, c->pid, rc, (char *)(event[1].iov_base));
         }
 
         c->event_queue = g_list_remove(c->event_queue, event);
@@ -509,7 +509,7 @@ crm_ipcs_flush_events(crm_client_t * c)
 
     queue_len -= sent;
     if (sent > 0 || c->event_queue) {
-        crm_trace("Sent %d events (%d remaining) for %p[%d]: %s (%d)",
+        crm_trace("Sent %d events (%d remaining) for %p[%d]: %s (%zd)",
                   sent, queue_len, c->ipcs, c->pid, pcmk_strerror(rc < 0 ? rc : 0), rc);
     }
 
@@ -658,7 +658,7 @@ crm_ipcs_sendv(crm_client_t * c, struct iovec * iov, enum crm_ipc_flags flags)
                        header->qb.id, c->ipcs, c->pid, header->qb.size, pcmk_strerror(rc), rc);
 
         } else {
-            crm_trace("Response %d sent, %d bytes to %p[%d]", header->qb.id, rc, c->ipcs, c->pid);
+            crm_trace("Response %d sent, %zd bytes to %p[%d]", header->qb.id, rc, c->ipcs, c->pid);
         }
 
         if (flags & crm_ipc_server_free) {
@@ -828,7 +828,7 @@ void
 crm_ipc_close(crm_ipc_t * client)
 {
     if (client) {
-        crm_trace("Disconnecting %s IPC connection %p (%p.%p)", client->name, client, client->ipc);
+        crm_trace("Disconnecting %s IPC connection %p (%p)", client->name, client, client->ipc);
 
         if (client->ipc) {
             qb_ipcc_connection_t *ipc = client->ipc;
diff --git a/lib/common/iso8601.c b/lib/common/iso8601.c
@@ -979,7 +979,7 @@ crm_time_parse_period(const char *period_str)
 void
 crm_time_set(crm_time_t * target, crm_time_t * source)
 {
-    crm_trace("target=%p, source=%p, offset=%d", target, source);
+    crm_trace("target=%p, source=%p", target, source);
 
     CRM_CHECK(target != NULL && source != NULL, return);
 
diff --git a/lib/common/mainloop.c b/lib/common/mainloop.c
@@ -656,7 +656,7 @@ mainloop_gio_callback(GIOChannel * gio, GIOCondition condition, gpointer data)
                 } else if (client->dispatch_fn_ipc) {
                     const char *buffer = crm_ipc_buffer(client->ipc);
 
-                    crm_trace("New message from %s[%p] = %d", client->name, client, rc, condition);
+                    crm_trace("New message from %s[%p] = %ld (I/O condition=%d)", client->name, client, rc, condition);
                     if (client->dispatch_fn_ipc(buffer, rc, client->userdata) < 0) {
                         crm_trace("Connection to %s no longer required", client->name);
                         keep = FALSE;
diff --git a/lib/common/remote.c b/lib/common/remote.c
@@ -234,7 +234,7 @@ crm_send_tls(gnutls_session_t * session, const char *buf, size_t len)
     }
 
     total_send = len;
-    crm_trace("Message size: %d", len);
+    crm_trace("Message size: %zd", len);
 
     while (TRUE) {
         rc = gnutls_record_send(*session, unsent, len);
@@ -247,7 +247,7 @@ crm_send_tls(gnutls_session_t * session, const char *buf, size_t len)
             break;
 
         } else if (rc < len) {
-            crm_debug("Sent %d of %d bytes", rc, len);
+            crm_debug("Sent %d of %zd bytes", rc, len);
             len -= rc;
             unsent += rc;
         } else {
@@ -273,7 +273,7 @@ crm_send_plaintext(int sock, const char *buf, size_t len)
     }
     total_send = len;
 
-    crm_trace("Message on socket %d: size=%d", sock, len);
+    crm_trace("Message on socket %d: size=%zd", sock, len);
   retry:
     rc = write(sock, unsent, len);
     if (rc < 0) {
@@ -288,7 +288,7 @@ crm_send_plaintext(int sock, const char *buf, size_t len)
         }
 
     } else if (rc < len) {
-        crm_trace("Only sent %d of %d remaining bytes", rc, len);
+        crm_trace("Only sent %d of %zd remaining bytes", rc, len);
         len -= rc;
         unsent += rc;
         goto retry;
@@ -518,7 +518,7 @@ crm_remote_recv_once(crm_remote_t * remote)
     /* automatically grow the buffer when needed */
     if(remote->buffer_size < read_len) {
            remote->buffer_size = 2 * read_len;
-        crm_trace("Expanding buffer to %u bytes", remote->buffer_size);
+        crm_trace("Expanding buffer to %zu bytes", remote->buffer_size);
 
         remote->buffer = realloc_safe(remote->buffer, remote->buffer_size + 1);
         CRM_ASSERT(remote->buffer != NULL);
@@ -559,28 +559,28 @@ crm_remote_recv_once(crm_remote_t * remote)
         remote->buffer_offset += rc;
         /* always null terminate buffer, the +1 to alloc always allows for this. */
         remote->buffer[remote->buffer_offset] = '\0';
-        crm_trace("Received %u more bytes, %u total", rc, remote->buffer_offset);
+        crm_trace("Received %u more bytes, %zu total", rc, remote->buffer_offset);
 
     } else if (rc == -EINTR || rc == -EAGAIN) {
         crm_trace("non-blocking, exiting read: %s (%d)", pcmk_strerror(rc), rc);
 
     } else if (rc == 0) {
-        crm_debug("EOF encoutered after %u bytes", remote->buffer_offset);
+        crm_debug("EOF encoutered after %zu bytes", remote->buffer_offset);
         return -ENOTCONN;
 
     } else {
-        crm_debug("Error receiving message after %u bytes: %s (%d)",
+        crm_debug("Error receiving message after %zu bytes: %s (%d)",
                   remote->buffer_offset, pcmk_strerror(rc), rc);
         return -ENOTCONN;
     }
 
     header = crm_remote_header(remote);
     if(header) {
         if(remote->buffer_offset < header->size_total) {
-            crm_trace("Read less than the advertised length: %u < %u bytes",
+            crm_trace("Read less than the advertised length: %zu < %u bytes",
                       remote->buffer_offset, header->size_total);
         } else {
-            crm_trace("Read full message of %u bytes", remote->buffer_offset);
+            crm_trace("Read full message of %zu bytes", remote->buffer_offset);
             return remote->buffer_offset;
         }
     }
@@ -690,7 +690,7 @@ check_connect_finished(gpointer userdata)
                 rc = -ETIMEDOUT;
             }
         }
-        crm_trace("fd %d: select failed %d connect dispatch ", rc);
+        crm_trace("fd %d: select failed %d connect dispatch ", sock, rc);
         goto dispatch_done;
     } else if (rc == 0) {
         if ((time(NULL) - cb_data->start) < (cb_data->timeout / 1000)) {
diff --git a/lib/common/utils.c b/lib/common/utils.c
@@ -2072,7 +2072,7 @@ create_operation_update(xmlNode * parent, lrmd_event_data_t * op, const char * c
 
     if (compare_version("2.1", caller_version) <= 0) {
         if (op->t_run || op->t_rcchange || op->exec_time || op->queue_time) {
-            crm_trace("Timing data (%s_%s_%d): last=%lu change=%lu exec=%lu queue=%lu",
+            crm_trace("Timing data (%s_%s_%d): last=%u change=%u exec=%u queue=%u",
                       op->rsc_id, op->op_type, op->interval,
                       op->t_run, op->t_rcchange, op->exec_time, op->queue_time);
 
diff --git a/lib/common/xml.c b/lib/common/xml.c
@@ -907,7 +907,7 @@ __xml_purge_attributes(xmlNode *xml)
     xml_private_t *p = xml->_private;
 
     if(__xml_acl_mode_test(p->flags, xpf_acl_read)) {
-        crm_trace("%s is readable", crm_element_name(xml), ID(xml));
+        crm_trace("%s[@id=%s] is readable", crm_element_name(xml), ID(xml));
         return TRUE;
     }
 
@@ -2426,7 +2426,7 @@ xml_apply_patchset(xmlNode *xml, xmlNode *patchset, bool check_version)
                 save_xml_to_file(patchset,"PatchDigest:diff", NULL);
 
             } else {
-                crm_trace("%p %0.6x", digest_cs, digest_cs ? digest_cs->targets : 0);
+                crm_trace("%p %.6x", digest_cs, digest_cs ? digest_cs->targets : 0);
             }
 
         } else {
@@ -4160,7 +4160,7 @@ apply_xml_diff(xmlNode * old, xmlNode * diff, xmlNode ** new)
             crm_info("Digest mis-match: expected %s, calculated %s", digest, new_digest);
             result = FALSE;
 
-            crm_trace("%p %0.6x", digest_cs, digest_cs ? digest_cs->targets : 0);
+            crm_trace("%p %.6x", digest_cs, digest_cs ? digest_cs->targets : 0);
             if (digest_cs && digest_cs->targets) {
                 save_xml_to_file(old, "diff:original", NULL);
                 save_xml_to_file(diff, "diff:input", NULL);
diff --git a/lib/lrmd/lrmd_client.c b/lib/lrmd/lrmd_client.c
@@ -1768,7 +1768,7 @@ lsb_get_metadata(const char *type, char **output)
     lsb_meta_helper_free_value(dflt_start);
     lsb_meta_helper_free_value(dflt_stop);
 
-    crm_trace("Created fake metadata: %d", strlen(*output));
+    crm_trace("Created fake metadata: %zd", strlen(*output));
     return pcmk_ok;
 }
 
@@ -1910,7 +1910,7 @@ static int
 heartbeat_get_metadata(const char *type, char **output)
 {
 	*output = crm_strdup_printf(hb_metadata_template, type, type, type);
-	crm_trace("Created fake metadata: %d", strlen(*output));
+	crm_trace("Created fake metadata: %zd", strlen(*output));
 	return pcmk_ok;
 }
 #endif
diff --git a/lib/pengine/unpack.c b/lib/pengine/unpack.c
@@ -2881,7 +2881,7 @@ static bool check_operation_expiry(resource_t *rsc, node_t *node, int rc, xmlNod
         digest_data = rsc_action_digest_cmp(rsc, xml_op, node, data_set);
 
         if (digest_data->rc == RSC_DIGEST_UNKNOWN) {
-            crm_trace("rsc op %s on node %s does not have a op digest to compare against", rsc->id,
+            crm_trace("rsc op %s/%s on node %s does not have a op digest to compare against", rsc->id,
                       key, node->details->id);
         } else if (digest_data->rc != RSC_DIGEST_MATCH) {
             clear_failcount = 1;
diff --git a/lib/services/dbus.c b/lib/services/dbus.c
@@ -518,7 +518,7 @@ static dbus_bool_t
 pcmk_dbus_timeout_add(DBusTimeout *timeout, void *data){
     guint id = g_timeout_add(dbus_timeout_get_interval(timeout), pcmk_dbus_timeout_dispatch, timeout);
 
-    crm_trace("Adding timeout %p (%ld)", timeout, dbus_timeout_get_interval(timeout));
+    crm_trace("Adding timeout %p (%d)", timeout, dbus_timeout_get_interval(timeout));
 
     if(id) {
         dbus_timeout_set_data(timeout, GUINT_TO_POINTER(id), NULL);
diff --git a/lib/services/services_linux.c b/lib/services/services_linux.c
@@ -89,7 +89,7 @@ svc_read_output(int fd, svc_action_t * op, bool is_stderr)
         crm_trace("Reading %s stdout into offset %d", op->id, len);
 
     } else {
-        crm_trace("Reading %s %s", op->id, is_stderr?"stderr":"stdout", len);
+        crm_trace("Reading %s %s into offset %d", op->id, is_stderr?"stderr":"stdout", len);
     }
 
     do {
diff --git a/lib/transition/utils.c b/lib/transition/utils.c
@@ -233,7 +233,7 @@ print_graph(unsigned int log_level, crm_graph_t * graph)
 
     do_crm_log(log_level, "Graph %d with %d actions:"
                " batch-limit=%d jobs, network-delay=%dms",
-               graph->id, graph->num_actions, graph->num_synapses,
+               graph->id, graph->num_actions,
                graph->batch_limit, graph->network_delay);
 
     for (lpc = graph->synapses; lpc != NULL; lpc = lpc->next) {
diff --git a/lrmd/lrmd.c b/lrmd/lrmd.c
@@ -1698,8 +1698,8 @@ process_lrmd_message(crm_client_t * client, uint32_t id, xmlNode * request)
         crm_log_xml_warn(request, "UnknownOp");
     }
 
-    crm_debug("Processed %s operation from %s: rc=%d, reply=%d, notify=%d, exit=%d",
-              op, client->id, rc, do_reply, do_notify, exit);
+    crm_debug("Processed %s operation from %s: rc=%d, reply=%d, notify=%d",
+              op, client->id, rc, do_reply, do_notify);
 
     if (do_reply) {
         send_reply(client, rc, id, call_id);
diff --git a/mcp/pacemaker.c b/mcp/pacemaker.c
@@ -828,7 +828,7 @@ mcp_cpg_deliver(cpg_handle_t handle,
     const char *task = crm_element_value(xml, F_CRM_TASK);
 
     crm_trace("Received CPG message (%s): %.200s",
-              (task? task : "process list"), msg);
+              (task? task : "process list"), (char*)msg);
 
     if (task == NULL) {
         if (nodeid == local_nodeid) {
diff --git a/pengine/native.c b/pengine/native.c
@@ -1263,8 +1263,7 @@ native_create_actions(resource_t * rsc, pe_working_set_t * data_set)
     /* Required steps from this role to the next */
     while (role != rsc->next_role) {
         next_role = rsc_state_matrix[role][rsc->next_role];
-        pe_rsc_trace(rsc, "Role: Executing: %s->%s = (%s)", role2text(role),
-                     role2text(rsc->next_role), role2text(next_role), rsc->id);
+        pe_rsc_trace(rsc, "Role: Executing: %s->%s = (%s)", role2text(role), role2text(next_role), rsc->id);
         if (rsc_action_matrix[role][next_role] (rsc, chosen, FALSE, data_set) == FALSE) {
             break;
         }
@@ -1825,7 +1824,7 @@ native_update_actions(action_t * first, action_t * then, node_t * node, enum pe_
     enum pe_action_flags then_flags = then->flags;
     enum pe_action_flags first_flags = first->flags;
 
-    crm_trace(   "Testing %s on %s (0x%.6x) with %s 0x%.6x %x %x",
+    crm_trace(   "Testing %s on %s (0x%.6x) with %s 0x%.6x",
                  first->uuid, first->node ? first->node->details->uname : "[none]",
                  first->flags, then->uuid, then->flags);
 
diff --git a/tools/crm_resource_runtime.c b/tools/crm_resource_runtime.c
@@ -838,7 +838,7 @@ static void dump_list(GList *items, const char *tag)
     GList *item = NULL;
 
     for (item = items; item != NULL; item = item->next) {
-        crm_trace("%s[%d]: %s", tag, lpc, item->data);
+        crm_trace("%s[%d]: %s", tag, lpc, (char*)item->data);
         lpc++;
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -1088,7 +1088,7 @@ cib_process_request(xmlNode * request, gboolean force_synchronous, gboolean priv`
`1088`	`1088`
`1089`	`1089`	`finished = time(NULL);`
`1090`	`1090`	`if (finished - now > 3) {`
`1091`		`- crm_trace("%s operation took %ds to complete", op, finished - now);`
	`1091`	`+ crm_trace("%s operation took %lds to complete", op, (long)(finished - now));`
`1092`	`1092`	`crm_write_blackbox(0, NULL);`
`1093`	`1093`	`}`
`1094`	`1094`
Original file line number	Diff line number	Diff line change
`@@ -183,7 +183,9 @@ static int cib_archive_sort(const struct dirent a, const struct dirent b)`
`183`	`183`	`rc = -1;`
`184`	`184`	`}`
`185`	`185`
`186`		`- crm_trace("%s (%u) vs. %s (%u) : %d", a[0]->d_name, a_age, b[0]->d_name, b_age, rc);`
	`186`	`+ crm_trace("%s (%lu) vs. %s (%lu) : %d",`
	`187`	`+ a[0]->d_name, (unsigned long)a_age,`
	`188`	`+ b[0]->d_name, (unsigned long)b_age, rc);`
`187`	`189`	`return rc;`
`188`	`190`	`}`
`189`	`191`
Original file line number	Diff line number	Diff line change
`@@ -601,7 +601,7 @@ build_parameter_list(lrmd_event_data_t op, xmlNode metadata, xmlNode *result,`
`601`	`601`	`if(result && accept) {`
`602`	`602`	`value = g_hash_table_lookup(op->params, name);`
`603`	`603`	`if(value != NULL) {`
`604`		`- crm_trace("Adding attr to the xml result", name, target?"":"not ", criteria);`
	`604`	`+ crm_trace("Adding attr %s=%s to the xml result", name, value);`
`605`	`605`	`crm_xml_add(result, name, value);`
`606`	`606`	`}`
`607`	`607`	`}`
`@@ -1928,7 +1928,7 @@ stop_recurring_action_by_rsc(gpointer key, gpointer value, gpointer user_data)`
`1928`	`1928`	`struct recurring_op_s op = (struct recurring_op_s )value;`
`1929`	`1929`
`1930`	`1930`	`if (op->interval != 0 && crm_str_eq(op->rsc_id, event->rsc->id, TRUE)) {`
`1931`		`- crm_debug("Cancelling op %d for %s (%s)", op->call_id, op->rsc_id, key);`
	`1931`	`+ crm_debug("Cancelling op %d for %s (%s)", op->call_id, op->rsc_id, (char*)key);`
`1932`	`1932`	`remove = !cancel_op(event->lrm_state, event->rsc->id, key, op->call_id, FALSE);`
`1933`	`1933`	`}`
`1934`	`1934`
Original file line number	Diff line number	Diff line change
`@@ -979,7 +979,7 @@ crm_time_parse_period(const char *period_str)`
`979`	`979`	`void`
`980`	`980`	`crm_time_set(crm_time_t * target, crm_time_t * source)`
`981`	`981`	`{`
`982`		`- crm_trace("target=%p, source=%p, offset=%d", target, source);`
	`982`	`+ crm_trace("target=%p, source=%p", target, source);`
`983`	`983`
`984`	`984`	`CRM_CHECK(target != NULL && source != NULL, return);`
`985`	`985`