do not use gcc-ism for macro, instead abuse C-syntax

[tcpdump] / print-isakmp.c

diff --git a/print-isakmp.c b/print-isakmp.c
index 17c047417bc049a32a4d6a7a35ee455a22bf609d..e6f8f82d4db5667fe556aa9eab0ac324ae9314dd 100644 (file)
--- a/print-isakmp.c
+++ b/print-isakmp.c
@@ -30,7 +30,7 @@
 
 #ifndef lint
 static const char rcsid[] _U_ =
 
 #ifndef lint
 static const char rcsid[] _U_ =

-    "@(#) $Header: /tcpdump/master/tcpdump/print-isakmp.c,v 1.47 2004-03-24 01:32:20 guy Exp $ (LBL)";
+    "@(#) $Header: /tcpdump/master/tcpdump/print-isakmp.c,v 1.48 2004-03-25 03:31:05 mcr Exp $ (LBL)";

 #endif
 
 #ifdef HAVE_CONFIG_H
 #endif
 
 #ifdef HAVE_CONFIG_H


@@ -415,9 +415,10 @@ isakmp_attr_print(const u_char *p, const u_char *ep)
 }
 
 static const u_char *
 }
 
 static const u_char *

-isakmp_sa_print(const struct isakmp_gen *ext, u_int item_len,
-       const u_char *ep, u_int32_t phase, u_int32_t doi0 _U_,
-       u_int32_t proto0, int depth)
+isakmp_sa_print(const struct isakmp_gen *ext,
+               u_int item_len _U_,
+               const u_char *ep, u_int32_t phase, u_int32_t doi0 _U_,
+               u_int32_t proto0, int depth)

 {
        const struct isakmp_pl_sa *p;
        struct isakmp_pl_sa sa;
 {
        const struct isakmp_pl_sa *p;
        struct isakmp_pl_sa sa;


@@ -475,9 +476,9 @@ trunc:
 }
 
 static const u_char *
 }
 
 static const u_char *

-isakmp_p_print(const struct isakmp_gen *ext, u_int item_len,
-       const u_char *ep, u_int32_t phase, u_int32_t doi0,
-       u_int32_t proto0 _U_, int depth)
+isakmp_p_print(const struct isakmp_gen *ext, u_int item_len _U_,
+              const u_char *ep, u_int32_t phase, u_int32_t doi0,
+              u_int32_t proto0 _U_, int depth)

 {
        const struct isakmp_pl_p *p;
        struct isakmp_pl_p prop;
 {
        const struct isakmp_pl_p *p;
        struct isakmp_pl_p prop;


@@ -633,9 +634,9 @@ trunc:
 }
 
 static const u_char *
 }
 
 static const u_char *

-isakmp_ke_print(const struct isakmp_gen *ext, u_int item_len,
-       const u_char *ep, u_int32_t phase _U_, u_int32_t doi _U_,
-       u_int32_t proto _U_, int depth _U_)
+isakmp_ke_print(const struct isakmp_gen *ext, u_int item_len _U_,
+               const u_char *ep _U_, u_int32_t phase _U_, u_int32_t doi _U_,
+               u_int32_t proto _U_, int depth _U_)

 {
        struct isakmp_gen e;
 
 {
        struct isakmp_gen e;
 


@@ -656,9 +657,9 @@ trunc:
 }
 
 static const u_char *
 }
 
 static const u_char *

-isakmp_id_print(const struct isakmp_gen *ext, u_int item_len,
-       const u_char *ep, u_int32_t phase, u_int32_t doi _U_,
-       u_int32_t proto _U_, int depth _U_)
+isakmp_id_print(const struct isakmp_gen *ext, u_int item_len _U_,
+               const u_char *ep _U_, u_int32_t phase, u_int32_t doi _U_,
+               u_int32_t proto _U_, int depth _U_)

 {
 #define USE_IPSECDOI_IN_PHASE1 1
        const struct isakmp_pl_id *p;
 {
 #define USE_IPSECDOI_IN_PHASE1 1
        const struct isakmp_pl_id *p;


@@ -834,9 +835,10 @@ trunc:
 }
 
 static const u_char *
 }
 
 static const u_char *

-isakmp_cert_print(const struct isakmp_gen *ext, u_int item_len,
-       const u_char *ep, u_int32_t phase _U_, u_int32_t doi0 _U_,
-       u_int32_t proto0 _U_, int depth _U_)
+isakmp_cert_print(const struct isakmp_gen *ext, u_int item_len _U_,
+                 const u_char *ep _U_, u_int32_t phase _U_,
+                 u_int32_t doi0 _U_,
+                 u_int32_t proto0 _U_, int depth _U_)

 {
        const struct isakmp_pl_cert *p;
        struct isakmp_pl_cert cert;
 {
        const struct isakmp_pl_cert *p;
        struct isakmp_pl_cert cert;


@@ -865,9 +867,9 @@ trunc:
 }
 
 static const u_char *
 }
 
 static const u_char *

-isakmp_cr_print(const struct isakmp_gen *ext, u_int item_len,
-       const u_char *ep, u_int32_t phase _U_, u_int32_t doi0 _U_,
-       u_int32_t proto0 _U_, int depth _U_)
+isakmp_cr_print(const struct isakmp_gen *ext, u_int item_len _U_,
+               const u_char *ep _U_, u_int32_t phase _U_, u_int32_t doi0 _U_,
+               u_int32_t proto0 _U_, int depth _U_)

 {
        const struct isakmp_pl_cert *p;
        struct isakmp_pl_cert cert;
 {
        const struct isakmp_pl_cert *p;
        struct isakmp_pl_cert cert;


@@ -896,9 +898,9 @@ trunc:
 }
 
 static const u_char *
 }
 
 static const u_char *

-isakmp_hash_print(const struct isakmp_gen *ext, u_int item_len,
-       const u_char *ep, u_int32_t phase _U_, u_int32_t doi _U_,
-       u_int32_t proto _U_, int depth _U_)
+isakmp_hash_print(const struct isakmp_gen *ext, u_int item_len _U_,
+                 const u_char *ep _U_, u_int32_t phase _U_, u_int32_t doi _U_,
+                 u_int32_t proto _U_, int depth _U_)

 {
        struct isakmp_gen e;
 
 {
        struct isakmp_gen e;
 


@@ -919,9 +921,9 @@ trunc:
 }
 
 static const u_char *
 }
 
 static const u_char *

-isakmp_sig_print(const struct isakmp_gen *ext, u_int item_len,
-       const u_char *ep, u_int32_t phase _U_, u_int32_t doi _U_,
-       u_int32_t proto _U_, int depth _U_)
+isakmp_sig_print(const struct isakmp_gen *ext, u_int item_len _U_,
+                const u_char *ep _U_, u_int32_t phase _U_, u_int32_t doi _U_,
+                u_int32_t proto _U_, int depth _U_)

 {
        struct isakmp_gen e;
 
 {
        struct isakmp_gen e;
 


@@ -942,9 +944,11 @@ trunc:
 }
 
 static const u_char *
 }
 
 static const u_char *

-isakmp_nonce_print(const struct isakmp_gen *ext, u_int item_len,
-       const u_char *ep, u_int32_t phase _U_, u_int32_t doi _U_,
-       u_int32_t proto _U_, int depth _U_)
+isakmp_nonce_print(const struct isakmp_gen *ext,
+                  u_int item_len _U_,
+                  const u_char *ep _U_,
+                  u_int32_t phase _U_, u_int32_t doi _U_,
+                  u_int32_t proto _U_, int depth _U_)

 {
        struct isakmp_gen e;
 
 {
        struct isakmp_gen e;
 


@@ -1104,9 +1108,9 @@ trunc:
 }
 
 static const u_char *
 }
 
 static const u_char *

-isakmp_d_print(const struct isakmp_gen *ext, u_int item_len,
-       const u_char *ep, u_int32_t phase _U_, u_int32_t doi0 _U_,
-       u_int32_t proto0 _U_, int depth _U_)
+isakmp_d_print(const struct isakmp_gen *ext, u_int item_len _U_,
+              const u_char *ep _U_, u_int32_t phase _U_, u_int32_t doi0 _U_,
+              u_int32_t proto0 _U_, int depth _U_)

 {
        const struct isakmp_pl_d *p;
        struct isakmp_pl_d d;
 {
        const struct isakmp_pl_d *p;
        struct isakmp_pl_d d;


@@ -1147,9 +1151,10 @@ trunc:
 }
 
 static const u_char *
 }
 
 static const u_char *

-isakmp_vid_print(const struct isakmp_gen *ext, u_int item_len,
-       const u_char *ep, u_int32_t phase _U_, u_int32_t doi _U_,
-       u_int32_t proto _U_, int depth _U_)
+isakmp_vid_print(const struct isakmp_gen *ext,
+                u_int item_len _U_, const u_char *ep _U_,
+                u_int32_t phase _U_, u_int32_t doi _U_,
+                u_int32_t proto _U_, int depth _U_)

 {
        struct isakmp_gen e;
 
 {
        struct isakmp_gen e;