diff options
| author | Volker Lendecke <vlendec@samba.org> | 2006-10-06 12:18:59 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 12:15:14 -0500 |
| commit | 43141d64ca7a0477cac2d5316ac53ec162a54e7b (patch) | |
| tree | 8247dc895f31651a0a40bfa6374cd98a626bfd62 /source3/lib/socket_wrapper | |
| parent | 803d33a3266497f89edd9bfae92875a9afdd0df2 (diff) | |
| download | samba-43141d64ca7a0477cac2d5316ac53ec162a54e7b.tar.gz samba-43141d64ca7a0477cac2d5316ac53ec162a54e7b.tar.bz2 samba-43141d64ca7a0477cac2d5316ac53ec162a54e7b.zip | |
r19126: Fix some uninitialized variable warnings
(This used to be commit 90bfa3461038f5d179525dec0cf5b3f137e927e0)
Diffstat (limited to 'source3/lib/socket_wrapper')
| -rw-r--r-- | source3/lib/socket_wrapper/socket_wrapper.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/source3/lib/socket_wrapper/socket_wrapper.c b/source3/lib/socket_wrapper/socket_wrapper.c index 006aba1e9d..9915789f0b 100644 --- a/source3/lib/socket_wrapper/socket_wrapper.c +++ b/source3/lib/socket_wrapper/socket_wrapper.c @@ -587,11 +587,11 @@ static struct swrap_packet *swrap_packet_init(struct timeval *tval, size_t packet_len; size_t alloc_len; size_t nonwire_len = sizeof(packet->frame); - size_t wire_hdr_len; - size_t wire_len; + size_t wire_hdr_len = 0; + size_t wire_len = 0; size_t icmp_hdr_len = 0; size_t icmp_truncate_len = 0; - unsigned char protocol, icmp_protocol; + unsigned char protocol = 0, icmp_protocol = 0; unsigned short src_port = src_addr->sin_port; unsigned short dest_port = dest_addr->sin_port; @@ -983,11 +983,14 @@ static void swrap_dump_packet(struct socket_info *si, const struct sockaddr *add tcp_ctl = 0x10; /* ACK */ break; + default: + return; } swrapGetTimeOfDay(&tv); - packet = swrap_packet_init(&tv, src_addr, dest_addr, si->type, buf, len, + packet = swrap_packet_init(&tv, src_addr, dest_addr, si->type, + (const unsigned char *)buf, len, tcp_seq, tcp_ack, tcp_ctl, unreachable, &packet_len); if (!packet) { |