From: Francois-Xavier Le Bail <fx.lebail@yahoo.com>
Date: Wed, 19 Aug 2015 14:44:52 +0000 (+0200)
Subject: Fix warnings as "comma at end of enumerator list"
X-Git-Tag: tcpdump-4.8.0~191
X-Git-Url: https://git.tcpdump.org/tcpdump/commitdiff_plain/c6637a835d605241ad5a92fafb7c56a5c1936bb7?ds=inline

Fix warnings as "comma at end of enumerator list"

The warnings were:
comma at end of enumerator list [-Wpedantic]
---

diff --git a/print-forces.c b/print-forces.c
index 111e83d5..d3ffb1e5 100644
--- a/print-forces.c
+++ b/print-forces.c
@@ -222,7 +222,7 @@ enum {
 	B_OP_REPORT = 1 << (F_OP_REPORT - 1),
 	B_OP_COMMIT = 1 << (F_OP_COMMIT - 1),
 	B_OP_RCOMMIT = 1 << (F_OP_RCOMMIT - 1),
-	B_OP_RTRCOMP = 1 << (F_OP_RTRCOMP - 1),
+	B_OP_RTRCOMP = 1 << (F_OP_RTRCOMP - 1)
 };
 
 struct optlv_h {
diff --git a/print-isakmp.c b/print-isakmp.c
index b1abcc6d..5b7ecd66 100644
--- a/print-isakmp.c
+++ b/print-isakmp.c
@@ -354,7 +354,7 @@ enum ikev2_t_type {
 	IV2_T_PRF  = 2,
 	IV2_T_INTEG= 3,
 	IV2_T_DH   = 4,
-	IV2_T_ESN  = 5,
+	IV2_T_ESN  = 5
 };
 
 /* 3.4.  Key Exchange Payload */
@@ -374,7 +374,7 @@ enum ikev2_id_type {
 	ID_IPV6_ADDR=5,
 	ID_DER_ASN1_DN=9,
 	ID_DER_ASN1_GN=10,
-	ID_KEY_ID=11,
+	ID_KEY_ID=11
 };
 struct ikev2_id {
 	struct isakmp_gen h;
@@ -438,7 +438,7 @@ struct ikev2_auth {
 enum ikev2_auth_type {
 	IV2_RSA_SIG = 1,
 	IV2_SHARED  = 2,
-	IV2_DSS_SIG = 3,
+	IV2_DSS_SIG = 3
 };
 
 /* refer to RFC 2409 */
diff --git a/rpl.h b/rpl.h
index fd20eae1..5ad074b4 100644
--- a/rpl.h
+++ b/rpl.h
@@ -22,7 +22,7 @@ enum ND_RPL_CODE {
     ND_RPL_SEC_DAG_IO = 0x81,
     ND_RPL_SEC_DAG    = 0x82,
     ND_RPL_SEC_DAG_ACK= 0x83,
-    ND_RPL_SEC_CONSIST= 0x8A,
+    ND_RPL_SEC_CONSIST= 0x8A
 };
 
 enum ND_RPL_DIO_FLAGS {
@@ -31,7 +31,7 @@ enum ND_RPL_DIO_FLAGS {
         ND_RPL_DIO_DASUPPORT= 0x20,
         ND_RPL_DIO_RES4     = 0x10,
         ND_RPL_DIO_RES3     = 0x08,
-        ND_RPL_DIO_PRF_MASK = 0x07,  /* 3-bit preference */
+        ND_RPL_DIO_PRF_MASK = 0x07  /* 3-bit preference */
 };
 
 #define DAGID_LEN 16
@@ -81,7 +81,7 @@ enum RPL_DIO_MOP {
     RPL_DIO_NONSTORING= 0x0,
     RPL_DIO_STORING   = 0x1,
     RPL_DIO_NONSTORING_MULTICAST = 0x2,
-    RPL_DIO_STORING_MULTICAST    = 0x3,
+    RPL_DIO_STORING_MULTICAST    = 0x3
 };
 
 enum RPL_SUBOPT {
@@ -93,7 +93,7 @@ enum RPL_SUBOPT {
         RPL_DAO_RPLTARGET   = 5,
         RPL_DAO_TRANSITINFO = 6,
         RPL_DIO_DESTPREFIX  = 8,
-        RPL_DAO_RPLTARGET_DESC=9,
+        RPL_DAO_RPLTARGET_DESC=9
 };
 
 struct rpl_dio_genoption {