summaryrefslogtreecommitdiffstats
path: root/source3/lib/messages.c
diff options
context:
space:
mode:
authorVolker Lendecke <vlendec@samba.org>2006-07-30 16:36:56 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 11:38:25 -0500
commite23781b3b304d1e69ad80af5ae9c0ed8d02cf996 (patch)
treed3a6eb0774d9ce907152e886c4c920d24ac2d715 /source3/lib/messages.c
parent5a5deade6e4634aad561139f39337c9a960c0b80 (diff)
downloadsamba-e23781b3b304d1e69ad80af5ae9c0ed8d02cf996.tar.gz
samba-e23781b3b304d1e69ad80af5ae9c0ed8d02cf996.tar.xz
samba-e23781b3b304d1e69ad80af5ae9c0ed8d02cf996.zip
r17316: More C++ warnings -- 456 left
(This used to be commit 1e4ee728df7eeafc1b4d533240acb032f73b4f5c)
Diffstat (limited to 'source3/lib/messages.c')
-rw-r--r--source3/lib/messages.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/source3/lib/messages.c b/source3/lib/messages.c
index 410e4af659..93e12ebe35 100644
--- a/source3/lib/messages.c
+++ b/source3/lib/messages.c
@@ -104,7 +104,7 @@ static void sig_usr1(void)
static void ping_message(int msg_type, struct process_id src,
void *buf, size_t len)
{
- const char *msg = buf ? buf : "none";
+ const char *msg = buf ? (const char *)buf : "none";
DEBUG(1,("INFO: Received PING message from PID %s [%s]\n",
procid_str_static(&src), msg));
@@ -236,7 +236,7 @@ static BOOL message_send_pid_internal(struct process_id pid, int msg_type,
kbuf = message_key_pid(pid);
- dbuf.dptr = (void *)SMB_MALLOC(len + sizeof(rec));
+ dbuf.dptr = (char *)SMB_MALLOC(len + sizeof(rec));
if (!dbuf.dptr)
return False;