------------------------------------------------------------ revno: 210 revision-id: [EMAIL PROTECTED] parent: [EMAIL PROTECTED] committer: Andrew Tridgell <[EMAIL PROTECTED]> branch nick: tridge timestamp: Sat 2007-04-28 11:35:49 +0200 message: fixed some warnings modified: common/ctdb_client.c ctdb_client.c-20070411010216-3kd8v37k61steeya-1 common/ctdb_daemon.c ctdb_daemon.c-20070409200331-3el1kqgdb9m4ib0g-1 tcp/tcp_io.c tcp_io.c-20061128004937-x70q1cu5xzg5g2tm-3 tests/ctdb_messaging.c ctdb_messaging.c-20070411034205-6d6vne56pbih2x1p-1 === modified file 'common/ctdb_client.c' --- a/common/ctdb_client.c 2007-04-28 08:50:32 +0000 +++ b/common/ctdb_client.c 2007-04-28 09:35:49 +0000 @@ -119,8 +119,8 @@ goto done; } if (cnt != hdr->length) { - ctdb_set_error(ctdb, "Bad header length %d expected %d in client\n", - hdr->length, cnt); + ctdb_set_error(ctdb, "Bad header length %u expected %u in client\n", + (unsigned)hdr->length, (unsigned)cnt); goto done; }
=== modified file 'common/ctdb_daemon.c' --- a/common/ctdb_daemon.c 2007-04-28 08:50:32 +0000 +++ b/common/ctdb_daemon.c 2007-04-28 09:35:49 +0000 @@ -498,13 +498,14 @@ client->ctdb->status.client_packets_recv++; if (cnt < sizeof(*hdr)) { - ctdb_set_error(client->ctdb, "Bad packet length %u in daemon\n", cnt); + ctdb_set_error(client->ctdb, "Bad packet length %u in daemon\n", + (unsigned)cnt); return; } hdr = (struct ctdb_req_header *)data; if (cnt != hdr->length) { ctdb_set_error(client->ctdb, "Bad header length %u expected %u\n in daemon", - hdr->length, cnt); + (unsigned)hdr->length, (unsigned)cnt); return; } === modified file 'tcp/tcp_io.c' --- a/tcp/tcp_io.c 2007-04-11 18:12:15 +0000 +++ b/tcp/tcp_io.c 2007-04-28 09:35:49 +0000 @@ -43,13 +43,13 @@ } if (cnt < sizeof(*hdr)) { - ctdb_set_error(in->ctdb, "Bad packet length %d\n", cnt); + ctdb_set_error(in->ctdb, "Bad packet length %u\n", (unsigned)cnt); return; } hdr = (struct ctdb_req_header *)data; if (cnt != hdr->length) { - ctdb_set_error(in->ctdb, "Bad header length %d expected %d\n", - hdr->length, cnt); + ctdb_set_error(in->ctdb, "Bad header length %u expected %u\n", + (unsigned)hdr->length, (unsigned)cnt); return; } === modified file 'tests/ctdb_messaging.c' --- a/tests/ctdb_messaging.c 2007-04-27 14:31:45 +0000 +++ b/tests/ctdb_messaging.c 2007-04-28 09:35:49 +0000 @@ -36,7 +36,8 @@ static void message_handler(struct ctdb_context *ctdb, uint64_t srvid, TDB_DATA data, void *private_data) { - printf("client vnn:%d received a message to srvid:%lld [%s]\n",ctdb_get_vnn(ctdb),srvid,data.dptr); + printf("client vnn:%d received a message to srvid:%llu [%s]\n", + ctdb_get_vnn(ctdb), (unsigned long long)srvid, data.dptr); fflush(stdout); }