r23784: use the GPLv3 boilerplate as recommended by the FSF and the license text

[samba.git] / source3 / utils / log2pcaphex.c

diff --git a/source3/utils/log2pcaphex.c b/source3/utils/log2pcaphex.c
index aa68cf09c9606b95eb8f6dcf1956be911f6c1a9b..daebb56a88c9fcdfd5571a05f91db4f58dff50f9 100644 (file)
--- a/source3/utils/log2pcaphex.c
+++ b/source3/utils/log2pcaphex.c
@@ -15,7 +15,7 @@
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
+   the Free Software Foundation; either version 3 of the License, or
    (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
@@ -24,8 +24,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "includes.h"
@@ -96,7 +95,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;
@@ -109,7 +108,7 @@ 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;
@@ -122,7 +121,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) {
@@ -136,7 +135,7 @@ 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;
@@ -159,7 +158,7 @@ void print_netbios_packet(FILE *out, unsigned char *data, long length, long actu
 unsigned char *curpacket = NULL;
 long curpacket_len = 0;
 
-void read_log_msg(FILE *in, unsigned char **_buffer, long *buffersize, long *data_offset, long *data_length)
+static void read_log_msg(FILE *in, unsigned char **_buffer, long *buffersize, long *data_offset, long *data_length)
 {
        unsigned char *buffer;
        int tmp; long i;
@@ -197,7 +196,7 @@ void read_log_msg(FILE *in, unsigned char **_buffer, long *buffersize, long *dat
        *_buffer = buffer;
 }
 
-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;