summaryrefslogtreecommitdiff
path: root/source3/utils
diff options
context:
space:
mode:
authorVolker Lendecke <vlendec@samba.org>2006-08-17 11:54:23 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 11:38:41 -0500
commit0691ed55cade8093213db38555edb536ee0c557d (patch)
treed4c196a01a7d5851f365940c77a8d3813e9db811 /source3/utils
parentaa2138ed5badedc5754978b61db1042617857690 (diff)
downloadsamba-0691ed55cade8093213db38555edb536ee0c557d.tar.gz
samba-0691ed55cade8093213db38555edb536ee0c557d.tar.bz2
samba-0691ed55cade8093213db38555edb536ee0c557d.zip
r17584: Some C++ Warnings
(This used to be commit f6194cf4b263454bbdf180a7d014ffc3498df497)
Diffstat (limited to 'source3/utils')
-rw-r--r--source3/utils/log2pcaphex.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/source3/utils/log2pcaphex.c b/source3/utils/log2pcaphex.c
index 24412cbe85..aa68cf09c9 100644
--- a/source3/utils/log2pcaphex.c
+++ b/source3/utils/log2pcaphex.c
@@ -142,7 +142,7 @@ void print_netbios_packet(FILE *out, unsigned char *data, long length, long actu
long newlen;
newlen = length+sizeof(HDR_IP)+sizeof(HDR_TCP);
- newdata = malloc(newlen);
+ newdata = (unsigned char *)malloc(newlen);
HDR_IP.packet_length = htons(newlen);
HDR_TCP.window = htons(0x2000);
@@ -165,7 +165,7 @@ void read_log_msg(FILE *in, unsigned char **_buffer, long *buffersize, long *dat
int tmp; long i;
assert(fscanf(in, " size=%ld\n", buffersize));
*buffersize+=4; /* for netbios */
- buffer = malloc(*buffersize);
+ buffer = (unsigned char *)malloc(*buffersize);
memset(buffer, 0, *buffersize);
/* NetBIOS */
buffer[0] = 0x00;