[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha7-2043-g53f0071

[Volker Lendecke]

The branch, master has been updated
       via  53f007193fab325c2b27567db01679f87baf4f9a (commit)
       via  c8d63d47cd3837e603540580ec4ab6f4d5d3bb0e (commit)
      from  fcc7372975757d19e9e4366a26396bf210bdf86a (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 53f007193fab325c2b27567db01679f87baf4f9a
Author: Volker Lendecke <vl at samba.org>
Date:   Fri Jun 5 10:11:35 2009 +0200

    Fix a couple of warnings in log2pcaphex.c

commit c8d63d47cd3837e603540580ec4ab6f4d5d3bb0e
Author: Volker Lendecke <vl at samba.org>
Date:   Fri Jun 5 10:07:17 2009 +0200

    Fix bug 6392: Exit log2pcaphex if a requested output file can't be opened
    
    Thanks to Slava Semushin <php-coder at altlinux.org> for reporting!

-----------------------------------------------------------------------

Summary of changes:
 source3/utils/log2pcaphex.c |   21 +++++++++++++--------
 1 files changed, 13 insertions(+), 8 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/utils/log2pcaphex.c b/source3/utils/log2pcaphex.c
index b1a8a27..5b94691 100644
--- a/source3/utils/log2pcaphex.c
+++ b/source3/utils/log2pcaphex.c
@@ -118,7 +118,7 @@ typedef struct {
 
 static hdr_tcp_t HDR_TCP = {139, 139, 0, 0, 0x50, 0, 0, 0, 0};
 
-void print_pcap_header(FILE *out)
+static void print_pcap_header(FILE *out)
 {
 	struct tcpdump_file_header h;
 	h.magic = TCPDUMP_MAGIC;
@@ -131,7 +131,8 @@ void print_pcap_header(FILE *out)
 	fwrite(&h, sizeof(struct tcpdump_file_header), 1, out);
 }
 
-void print_pcap_packet(FILE *out, unsigned char *data, long length, long caplen)
+static void print_pcap_packet(FILE *out, unsigned char *data, long length,
+			      long caplen)
 {
 	static int i = 0;
 	struct tcpdump_packet p;
@@ -144,7 +145,7 @@ void print_pcap_packet(FILE *out, unsigned char *data, long length, long caplen)
 	fwrite(data, sizeof(unsigned char), caplen, out);
 }
 
-void print_hex_packet(FILE *out, unsigned char *data, long length)
+static void print_hex_packet(FILE *out, unsigned char *data, long length)
 {
 	long i,cur = 0;
 	while(cur < length) {
@@ -158,13 +159,14 @@ void print_hex_packet(FILE *out, unsigned char *data, long length)
 	}
 }
 
-void print_netbios_packet(FILE *out, unsigned char *data, long length, long actual_length)
+static void print_netbios_packet(FILE *out, unsigned char *data, long length,
+				 long actual_length)
 {	
 	unsigned char *newdata; long offset = 0;
 	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);
@@ -206,12 +208,14 @@ long line_num = 0;
  *   smb_vwv[ 2]=    1 (0x1)
  *   smb_bcc=87
  */
-void read_log_msg(FILE *in, unsigned char **_buffer, unsigned short *buffersize, long *data_offset, long *data_length)
+static void read_log_msg(FILE *in, unsigned char **_buffer,
+			 unsigned short *buffersize, long *data_offset,
+			 long *data_length)
 {
 	unsigned char *buffer;
 	int tmp; long i;
 	assert(fscanf(in, " size=%hu\n", buffersize)); line_num++;
-	buffer = malloc(*buffersize+4); /* +4 for NBSS Header */
+	buffer = (unsigned char *)malloc(*buffersize+4); /* +4 for NBSS Header */
 	memset(buffer, 0, *buffersize+4);
 	/* NetBIOS Session Service */
 	buffer[0] = 0x00;
@@ -256,7 +260,7 @@ void read_log_msg(FILE *in, unsigned char **_buffer, unsigned short *buffersize,
  *   [040] 00 34 00 2E 00 30 00 00  00 49 00 53 00 49 00 4C  .4...0.. .I.S.I.L
  *   [050] 00 4F 00 4E 00 00 00                              .O.N...
  */
-long read_log_data(FILE *in, unsigned char *buffer, long data_length)
+static long read_log_data(FILE *in, unsigned char *buffer, long data_length)
 {
 	long i, addr; char real[2][16]; int ret;
 	unsigned int tmp;
@@ -337,6 +341,7 @@ int main (int argc, char **argv)
 		if(!out) { 
 			perror("fopen"); 
 			fprintf(stderr, "Can't find %s, using stdout...\n", outfile);
+			return 1;
 		}
 	}
 


-- 
Samba Shared Repository