Not all systems have "sa_family_t"; use "u_int8_t" instead.

[tcpdump] / print-zephyr.c

diff --git a/print-zephyr.c b/print-zephyr.c
index f526f07ceaac8b528e8e3d59403d5175de9fd24c..4a13f18a9a1920f9a00475c7a971a4aa75c4580b 100644 (file)
--- a/print-zephyr.c
+++ b/print-zephyr.c
@@ -19,19 +19,19 @@
  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-zephyr.c,v 1.3 2002-03-05 11:33:25 guy Exp $";
+static const char rcsid[] _U_ =
+    "@(#) $Header: /tcpdump/master/tcpdump/print-zephyr.c,v 1.6.2.2 2003-11-16 08:51:56 guy Exp $";

 #endif
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
 #endif
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 

+#include <tcpdump-stdinc.h>
+

 #include <stdio.h>
 #include <stdio.h>

-#include <ctype.h>

 #include <string.h>
 #include <stdlib.h>
 #include <string.h>
 #include <stdlib.h>

-#include <sys/types.h>

 
 #include "interface.h"
 
 
 #include "interface.h"
 


@@ -48,7 +48,7 @@ struct z_packet {
     char *inst;
     char *opcode;
     char *sender;
     char *inst;
     char *opcode;
     char *sender;

-    char *recipient;
+    const char *recipient;

     char *format;
     int cksum;
     int multi;
     char *format;
     int cksum;
     int multi;


@@ -105,7 +105,7 @@ parse_field(char **pptr, int *len)
 }
 
 static const char *
 }
 
 static const char *

-z_triple(char *class, char *inst, char *recipient)
+z_triple(char *class, char *inst, const char *recipient)

 {
     if (!*recipient)
        recipient = "*";
 {
     if (!*recipient)
        recipient = "*";


@@ -122,7 +122,7 @@ str_to_lower(char *string)
 
     string = z_buf;
     while (*string) {
 
     string = z_buf;
     while (*string) {

-       *string = tolower(*string);
+       *string = tolower((unsigned char)(*string));

        string++;
     }
 
        string++;
     }