From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 21671 invoked by alias); 12 May 2009 13:05:41 -0000 Received: (qmail 21658 invoked by alias); 12 May 2009 13:05:41 -0000 X-SWARE-Spam-Status: No, hits=-1.6 required=5.0 tests=AWL,BAYES_00,J_CHICKENPOX_66,SPF_HELO_PASS X-Spam-Status: No, hits=-1.6 required=5.0 tests=AWL,BAYES_00,J_CHICKENPOX_66,SPF_HELO_PASS X-Spam-Check-By: sourceware.org X-Spam-Checker-Version: SpamAssassin 3.2.5 (2008-06-10) on bastion2.fedora.phx.redhat.com Subject: cluster: STABLE3 - group: fix print formats To: cluster-cvs-relay@redhat.com X-Project: Cluster Project X-Git-Module: cluster.git X-Git-Refname: refs/heads/STABLE3 X-Git-Reftype: branch X-Git-Oldrev: a9d8465afc9cb1683ca5abd20384d23c1c0d23b4 X-Git-Newrev: ec38c7221e2900d01e88e6e816dcfeb08a422e06 From: "Fabio M. Di Nitto" Message-Id: <20090512130514.2A323120277@lists.fedorahosted.org> Date: Tue, 12 May 2009 13:05:00 -0000 X-Scanned-By: MIMEDefang 2.58 on 172.16.52.254 Mailing-List: contact cluster-cvs-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Post: List-Help: , Sender: cluster-cvs-owner@sourceware.org X-SW-Source: 2009-q2/txt/msg00291.txt.bz2 Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=ec38c7221e2900d01e88e6e816dcfeb08a422e06 Commit: ec38c7221e2900d01e88e6e816dcfeb08a422e06 Parent: a9d8465afc9cb1683ca5abd20384d23c1c0d23b4 Author: Fabio M. Di Nitto AuthorDate: Tue May 12 14:37:07 2009 +0200 Committer: Fabio M. Di Nitto CommitterDate: Tue May 12 14:37:07 2009 +0200 group: fix print formats stable3/group/daemon/cpg.c:653: warning: format ‘%d’ expects type ‘int’, but argument 5 has type ‘size_t’ stable3/group/daemon/cpg.c:653: warning: format ‘%d’ expects type ‘int’, but argument 7 has type ‘size_t’ stable3/group/daemon/cpg.c:678: warning: format ‘%d’ expects type ‘int’, but argument 3 has type ‘size_t’ stable3/group/daemon/cpg.c:678: warning: format ‘%d’ expects type ‘int’, but argument 7 has type ‘size_t’ stable3/group/daemon/cpg.c:778: warning: format ‘%d’ expects type ‘int’, but argument 3 has type ‘size_t’ stable3/group/daemon/cpg.c:778: warning: format ‘%d’ expects type ‘int’, but argument 5 has type ‘size_t’ stable3/group/daemon/cpg.c:782: warning: format ‘%d’ expects type ‘int’, but argument 3 has type ‘size_t’ stable3/group/daemon/cpg.c:782: warning: format ‘%d’ expects type ‘int’, but argument 5 has type ‘size_t’ stable3/group/daemon/cpg.c:786: warning: format ‘%d’ expects type ‘int’, but argument 3 has type ‘size_t’ stable3/group/daemon/cpg.c:786: warning: format ‘%d’ expects type ‘int’, but argument 5 has type ‘size_t’ stable3/group/dlm_controld/cpg.c:1372: warning: format ‘%d’ expects type ‘int’, but argument 3 has type ‘size_t’ stable3/group/dlm_controld/cpg.c:1372: warning: format ‘%d’ expects type ‘int’, but argument 5 has type ‘size_t’ stable3/group/dlm_controld/cpg.c:1963: warning: format ‘%d’ expects type ‘int’, but argument 3 has type ‘size_t’ stable3/group/dlm_controld/cpg.c:1963: warning: format ‘%d’ expects type ‘int’, but argument 5 has type ‘size_t’ stable3/group/gfs_controld/cpg-new.c:2547: warning: format ‘%d’ expects type ‘int’, but argument 3 has type ‘size_t’ stable3/group/gfs_controld/cpg-new.c:2547: warning: format ‘%d’ expects type ‘int’, but argument 5 has type ‘size_t’ stable3/group/gfs_controld/cpg-new.c:3153: warning: format ‘%d’ expects type ‘int’, but argument 3 has type ‘size_t’ stable3/group/gfs_controld/cpg-new.c:3153: warning: format ‘%d’ expects type ‘int’, but argument 5 has type ‘size_t’ stable3/group/gfs_controld/cpg-old.c:1126: warning: format ‘%d’ expects type ‘int’, but argument 5 has type ‘size_t’ stable3/group/gfs_controld/cpg-old.c:1126: warning: format ‘%d’ expects type ‘int’, but argument 8 has type ‘size_t’ stable3/group/gfs_controld/cpg-old.c:186: warning: format ‘%d’ expects type ‘int’, but argument 5 has type ‘size_t’ stable3/group/gfs_controld/cpg-old.c:186: warning: format ‘%d’ expects type ‘int’, but argument 8 has type ‘size_t’ stable3/group/gfs_controld/cpg-old.c:2271: warning: format ‘%d’ expects type ‘int’, but argument 4 has type ‘size_t’ stable3/group/gfs_controld/cpg-old.c:2271: warning: format ‘%d’ expects type ‘int’, but argument 7 has type ‘size_t’ stable3/group/gfs_controld/cpg-old.c:348: warning: format ‘%d’ expects type ‘int’, but argument 4 has type ‘size_t’ stable3/group/gfs_controld/cpg-old.c:348: warning: format ‘%d’ expects type ‘int’, but argument 7 has type ‘size_t’ stable3/group/gfs_controld/cpg-old.c:509: warning: format ‘%d’ expects type ‘int’, but argument 4 has type ‘size_t’ stable3/group/gfs_controld/cpg-old.c:509: warning: format ‘%d’ expects type ‘int’, but argument 7 has type ‘size_t’ stable3/group/gfs_controld/cpg-old.c:920: warning: format ‘%d’ expects type ‘int’, but argument 4 has type ‘size_t’ stable3/group/gfs_controld/cpg-old.c:920: warning: format ‘%d’ expects type ‘int’, but argument 7 has type ‘size_t’ Signed-off-by: Fabio M. Di Nitto --- group/daemon/cpg.c | 10 +++++----- group/dlm_controld/cpg.c | 4 ++-- group/gfs_controld/cpg-new.c | 4 ++-- group/gfs_controld/cpg-old.c | 12 ++++++------ 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/group/daemon/cpg.c b/group/daemon/cpg.c index caed50d..4668afd 100644 --- a/group/daemon/cpg.c +++ b/group/daemon/cpg.c @@ -650,7 +650,7 @@ static void deliver_cb(cpg_handle_t handle, g = find_group_level(name, msg->ms_level); if (!g) { if (daemon_debug_verbose > 1) { - log_print("%d:%s RECV len %d %s from %d, " + log_print("%d:%s RECV len %zd %s from %d, " "no group", msg->ms_level, name, data_len, msg_type(msg->ms_type), nodeid); @@ -675,7 +675,7 @@ static void deliver_cb(cpg_handle_t handle, } if (daemon_debug_verbose > 1) - log_group(g, "RECV len %d %s from %d", data_len, + log_group(g, "RECV len %zd %s from %d", data_len, msg_type(msg->ms_type), nodeid); save = malloc(sizeof(struct save_msg)); @@ -775,15 +775,15 @@ static void confchg_cb(cpg_handle_t handle, saved_handle = handle; if (left_list_entries > MAX_GROUP_MEMBERS) { - log_debug("left_list_entries %d", left_list_entries); + log_debug("left_list_entries %zd", left_list_entries); left_list_entries = MAX_GROUP_MEMBERS; } if (joined_list_entries > MAX_GROUP_MEMBERS) { - log_debug("joined_list_entries %d", joined_list_entries); + log_debug("joined_list_entries %zd", joined_list_entries); joined_list_entries = MAX_GROUP_MEMBERS; } if (member_list_entries > MAX_GROUP_MEMBERS) { - log_debug("member_list_entries %d", joined_list_entries); + log_debug("member_list_entries %zd", joined_list_entries); member_list_entries = MAX_GROUP_MEMBERS; } diff --git a/group/dlm_controld/cpg.c b/group/dlm_controld/cpg.c index 216b267..9e26028 100644 --- a/group/dlm_controld/cpg.c +++ b/group/dlm_controld/cpg.c @@ -1369,7 +1369,7 @@ static void deliver_cb(cpg_handle_t handle, } if (len < sizeof(*hd)) { - log_error("deliver_cb short message %d", len); + log_error("deliver_cb short message %zd", len); return; } @@ -1960,7 +1960,7 @@ static void deliver_cb_daemon(cpg_handle_t handle, struct dlm_header *hd; if (len < sizeof(*hd)) { - log_error("deliver_cb short message %d", len); + log_error("deliver_cb short message %zd", len); return; } diff --git a/group/gfs_controld/cpg-new.c b/group/gfs_controld/cpg-new.c index 7d721e8..d08ca03 100644 --- a/group/gfs_controld/cpg-new.c +++ b/group/gfs_controld/cpg-new.c @@ -2544,7 +2544,7 @@ static void deliver_cb(cpg_handle_t handle, } if (len < sizeof(*hd)) { - log_error("deliver_cb short message %d", len); + log_error("deliver_cb short message %zd", len); return; } @@ -3150,7 +3150,7 @@ static void deliver_cb_daemon(cpg_handle_t handle, struct gfs_header *hd; if (len < sizeof(*hd)) { - log_error("deliver_cb short message %d", len); + log_error("deliver_cb short message %zd", len); return; } diff --git a/group/gfs_controld/cpg-old.c b/group/gfs_controld/cpg-old.c index 552fe12..5342025 100644 --- a/group/gfs_controld/cpg-old.c +++ b/group/gfs_controld/cpg-old.c @@ -183,7 +183,7 @@ void save_message_old(struct mountgroup *mg, char *buf, size_t len, int from, sm->len = len; sm->nodeid = from; - log_group(mg, "save %s from %d len %d", msg_name(type), from, len); + log_group(mg, "save %s from %d len %zd", msg_name(type), from, len); list_add_tail(&sm->list, &mg->saved_messages); } @@ -345,7 +345,7 @@ static void _receive_recovery_status(struct mountgroup *mg, char *buf, size_t le break; } - log_group(mg, "receive_recovery_status from %d len %d " + log_group(mg, "receive_recovery_status from %d len %zd " "nodeid %d jid %d status %d found %d", from, len, nodeid, jid, status, found); } @@ -506,7 +506,7 @@ static void _receive_mount_status(struct mountgroup *mg, char *buf, size_t len, static void receive_mount_status(struct mountgroup *mg, char *buf, size_t len, int from) { - log_group(mg, "receive_mount_status from %d len %d last_cb %d", + log_group(mg, "receive_mount_status from %d len %zd last_cb %d", from, len, mg->last_callback); if (!mg->got_our_options) { @@ -917,7 +917,7 @@ static void receive_options(struct mountgroup *mg, char *buf, size_t len, int fr struct gdlm_header *hd = (struct gdlm_header *)buf; struct mg_member *memb; - log_group(mg, "receive_options from %d len %d last_cb %d", + log_group(mg, "receive_options from %d len %zd last_cb %d", from, len, mg->last_callback); if (hd->nodeid == our_nodeid) { @@ -1123,7 +1123,7 @@ static void receive_journals(struct mountgroup *mg, char *buf, size_t len, count = (len - sizeof(struct gdlm_header)) / (NUM * sizeof(int)); - log_group(mg, "receive_journals from %d to %d len %d count %d cb %d", + log_group(mg, "receive_journals from %d to %d len %zd count %d cb %d", from, hd->to_nodeid, len, count, mg->last_callback); /* just like we can receive an options msg from a newly added node @@ -2268,7 +2268,7 @@ static void do_deliver(int nodeid, char *data, size_t len) discard them since they're only relevant to the app group. */ if (!mg->last_callback) { - log_group(mg, "discard %s len %d from %d", + log_group(mg, "discard %s len %zd from %d", msg_name(hd->type), len, nodeid); return; }