From 939c3cb5d78e3a2236209b296aa8aba8bdce32d3 Mon Sep 17 00:00:00 2001 From: Gerald Carter Date: Fri, 30 Sep 2005 17:13:37 +0000 Subject: r10656: BIG merge from trunk. Features not copied over * \PIPE\unixinfo * winbindd's {group,alias}membership new functions * winbindd's lookupsids() functionality * swat (trunk changes to be reverted as per discussion with Deryck) --- source/lib/tallocmsg.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'source/lib/tallocmsg.c') diff --git a/source/lib/tallocmsg.c b/source/lib/tallocmsg.c index 8ee3c257f6b..8f03fd66ff1 100644 --- a/source/lib/tallocmsg.c +++ b/source/lib/tallocmsg.c @@ -30,7 +30,7 @@ * Respond to a POOL_USAGE message by sending back string form of memory * usage stats. **/ -void msg_pool_usage(int msg_type, pid_t src_pid, +void msg_pool_usage(int msg_type, struct process_id src_pid, void *UNUSED(buf), size_t UNUSED(len)) { off_t reply; @@ -41,7 +41,7 @@ void msg_pool_usage(int msg_type, pid_t src_pid, DEBUG(2,("Got POOL_USAGE\n")); reply = talloc_total_size(NULL); - fstr_sprintf(reply_str, "%lld", reply); + fstr_sprintf(reply_str, "%ld", (long)reply); message_send_pid(src_pid, MSG_POOL_USAGE, reply_str, strlen(reply_str)+1, True); -- cgit