From: Tero Kivinen <kivinen@iki.fi>
Date: Sat, 17 Nov 2018 22:34:33 +0000 (+0200)
Subject: Fixed some warnings, added print-zep.c to CMakeLists
X-Git-Tag: tcpdump-4.99-bp~886^2^2~1
X-Git-Url: https://git.tcpdump.org/tcpdump/commitdiff_plain/8030a66cdcbf81c88cbb7c38ef7a334e9f1941cd?ds=sidebyside

Fixed some warnings, added print-zep.c to CMakeLists
---

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 79930841..3154229b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1054,6 +1054,7 @@ set(NETDISSECT_SOURCE_LIST_C
     print-vxlan.c
     print-vxlan-gpe.c
     print-wb.c
+    print-zep.c
     print-zephyr.c
     print-zeromq.c
     ${LOCALSRC}
diff --git a/print-802_15_4.c b/print-802_15_4.c
index 3e1bc8a8..46a8f22c 100644
--- a/print-802_15_4.c
+++ b/print-802_15_4.c
@@ -423,7 +423,7 @@ static const char *mac_c_names[] = {
  */
 static uint16_t
 ieee802_15_4_crc16(const u_char *p,
-		   uint16_t data_len)
+		   u_int data_len)
 {
 	uint16_t crc;
 	u_char x, y;
@@ -473,7 +473,7 @@ ieee802_15_4_reverse32(uint32_t x)
  */
 static uint32_t
 ieee802_15_4_crc32(const u_char *p,
-		   uint16_t data_len)
+		   u_int data_len)
 {
 	uint32_t crc, byte;
 	u_char x;
@@ -578,7 +578,7 @@ ieee802_15_4_print_superframe_specification(netdissect_options *ndo,
 static int
 ieee802_15_4_print_gts_info(netdissect_options *ndo,
 			    const u_char *p,
-			    uint16_t data_len)
+			    u_int data_len)
 {
 	uint8_t gts_spec, gts_cnt;
 	int len, i;
@@ -625,7 +625,7 @@ ieee802_15_4_print_gts_info(netdissect_options *ndo,
 static int16_t
 ieee802_15_4_print_pending_addresses(netdissect_options *ndo,
 				     const u_char *p,
-				     uint16_t data_len)
+				     u_int data_len)
 {
 	uint8_t pas, s_cnt, e_cnt, len, i;
 	
@@ -921,7 +921,7 @@ ieee802_15_4_print_header_ie(netdissect_options *ndo,
 static int
 ieee802_15_4_print_header_ie_list(netdissect_options *ndo,
 				  const u_char *p,
-				  uint16_t caplen,
+				  u_int caplen,
 				  int *payload_ie_present)
 {
 	int len, ie, element_id, i;
@@ -996,7 +996,8 @@ ieee802_15_4_print_mlme_ie(netdissect_options *ndo,
 			   uint16_t sub_ie_len,
 			   int sub_id)
 {
-	int i, j, len;
+	int i, j;
+	uint16_t len;
 	
 	/* Note, as there is no overlap with the long and short
 	   MLME sub IDs, we can just use one switch here. */
@@ -1408,7 +1409,7 @@ ieee802_15_4_print_mpx_ie(netdissect_options *ndo,
 static int
 ieee802_15_4_print_payload_ie_list(netdissect_options *ndo,
 				   const u_char *p,
-				   uint16_t caplen)
+				   u_int caplen)
 {
 	int len, ie, group_id, i;
 	uint16_t ie_len;
@@ -1507,7 +1508,7 @@ ieee802_15_4_print_payload_ie_list(netdissect_options *ndo,
 static int
 ieee802_15_4_print_aux_sec_header(netdissect_options *ndo,
 				  const u_char *p,
-				  uint16_t caplen,
+				  u_int caplen,
 				  int *security_level)
 {
 	int sc, key_id_mode, len;
@@ -2369,7 +2370,8 @@ ieee802_15_4_mp_frame(netdissect_options *ndo,
 		if (security_level >= 4) {
 			ND_PRINT("Payload IEs present, but encrypted, cannot print ");
 		} else {
-			len = ieee802_15_4_print_payload_ie_list(ndo, p, caplen);
+			len = ieee802_15_4_print_payload_ie_list(ndo, p,
+								 caplen);
 			if (len < 0) {
 				return 0;
 			}