From 03d301ead5f702872b8cb948b8cd01b0fa0db5f7 Mon Sep 17 00:00:00 2001 From: Tim Potter Date: Wed, 30 Nov 2005 02:08:15 +0000 Subject: r11967: Fix more 64-bit warnings. (This used to be commit 9c4436a124f874ae240feaf590141d48c33a635f) --- source4/wrepl_server/wrepl_apply_records.c | 3 ++- source4/wrepl_server/wrepl_in_call.c | 11 ++++++++--- source4/wrepl_server/wrepl_in_connection.c | 4 ++-- 3 files changed, 12 insertions(+), 6 deletions(-) (limited to 'source4/wrepl_server') diff --git a/source4/wrepl_server/wrepl_apply_records.c b/source4/wrepl_server/wrepl_apply_records.c index 536119f520..4b7eb24cab 100644 --- a/source4/wrepl_server/wrepl_apply_records.c +++ b/source4/wrepl_server/wrepl_apply_records.c @@ -996,7 +996,8 @@ NTSTATUS wreplsrv_apply_records(struct wreplsrv_partner *partner, struct wreplsr DEBUG(4,("apply records count[%u]:owner[%s]:min[%llu]:max[%llu]:partner[%s]\n", names_io->out.num_names, names_io->in.owner.address, - names_io->in.owner.min_version, names_io->in.owner.max_version, + (long long)names_io->in.owner.min_version, + (long long)names_io->in.owner.max_version, partner->address)); for (i=0; i < names_io->out.num_names; i++) { diff --git a/source4/wrepl_server/wrepl_in_call.c b/source4/wrepl_server/wrepl_in_call.c index 6b1bc4500e..0dd8095dd2 100644 --- a/source4/wrepl_server/wrepl_in_call.c +++ b/source4/wrepl_server/wrepl_in_call.c @@ -246,14 +246,17 @@ static NTSTATUS wreplsrv_in_send_request(struct wreplsrv_in_call *call) "(versionID>=%llu)(versionID<=%llu))", owner->owner.address, WREPL_STATE_ACTIVE, WREPL_STATE_TOMBSTONE, - owner_in->min_version, owner_in->max_version); + (long long)owner_in->min_version, + (long long)owner_in->max_version); NT_STATUS_HAVE_NO_MEMORY(filter); ret = ldb_search(service->wins_db, NULL, LDB_SCOPE_SUBTREE, filter, NULL, &res); if (ret != LDB_SUCCESS) return NT_STATUS_INTERNAL_DB_CORRUPTION; talloc_steal(call, res); if (res->count == 0) { DEBUG(2,("WINSREPL:reply [%u] records owner[%s] min[%llu] max[%llu] to partner[%s]\n", - res->count, owner_in->address, owner_in->min_version, owner_in->max_version, + res->count, owner_in->address, + (long long)owner_in->min_version, + (long long)owner_in->max_version, call->wreplconn->partner->address)); return NT_STATUS_OK; } @@ -275,7 +278,9 @@ static NTSTATUS wreplsrv_in_send_request(struct wreplsrv_in_call *call) qsort(names, res->count, sizeof(struct wrepl_wins_name), (comparison_fn_t)wreplsrv_in_sort_wins_name); DEBUG(2,("WINSREPL:reply [%u] records owner[%s] min[%llu] max[%llu] to partner[%s]\n", - res->count, owner_in->address, owner_in->min_version, owner_in->max_version, + res->count, owner_in->address, + (long long)owner_in->min_version, + (long long)owner_in->max_version, call->wreplconn->partner->address)); reply_out->num_names = res->count; diff --git a/source4/wrepl_server/wrepl_in_connection.c b/source4/wrepl_server/wrepl_in_connection.c index 5ba36a5051..e06e69103e 100644 --- a/source4/wrepl_server/wrepl_in_connection.c +++ b/source4/wrepl_server/wrepl_in_connection.c @@ -155,7 +155,7 @@ static void wreplsrv_recv(struct stream_connection *conn, uint16_t flags) if (!NT_STATUS_IS_OK(status)) { DEBUG(2,("Failed to parse incoming WINS-Replication packet - %s\n", nt_errstr(status))); - DEBUG(10,("packet length %u\n", wreplconn->partial.length)); + DEBUG(10,("packet length %lu\n", (long)wreplconn->partial.length)); NDR_PRINT_DEBUG(wrepl_packet, &call->req_packet); goto failed; } @@ -168,7 +168,7 @@ static void wreplsrv_recv(struct stream_connection *conn, uint16_t flags) wreplconn->partial_read = 0; if (DEBUGLVL(10)) { - DEBUG(10,("Received WINS-Replication packet of length %u\n", wreplconn->partial.length)); + DEBUG(10,("Received WINS-Replication packet of length %lu\n", (long)wreplconn->partial.length)); NDR_PRINT_DEBUG(wrepl_packet, &call->req_packet); } -- cgit