Allow use of variadic macros

Remove variadic macros restriction (c99, c++11 feature) from
README.developer. GCC, Clang, MSVC 2005 all support it.

Enable -Wno-variadic-macros in configure.ac and CMakeLists.txt when
-Wpedantic is enabled (which would enable -Wvariadic-macros).

For all files matching 'define\s*\w+[0-9]\(', replace "FOO[0-9]" by
"FOO" and adjust the macro definition accordingly. The nbap dissector
was regenerated after adjusting its template and .cnf file. The
generated code is the same since all files disabled the debug macros.

Discussed at:
https://www.wireshark.org/lists/wireshark-dev/201209/msg00142.html
https://www.wireshark.org/lists/wireshark-dev/201510/msg00012.html

Change-Id: I3b2e22487db817cbbaac774a592669a4f44314b2
Reviewed-on: https://code.wireshark.org/review/10781
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Guy Harris <guy@alum.mit.edu>

3 files changed, 71 insertions, 87 deletions

diff --git a/epan/dissectors/packet-icep.c b/epan/dissectors/packet-icep.c
index e89353bdc2..22c35b5141 100644
--- a/epan/dissectors/packet-icep.c
+++ b/epan/dissectors/packet-icep.c
@@ -47,19 +47,17 @@ void proto_register_icep(void);
 void proto_reg_handoff_icep(void);
 
 #if 0
-#define DBG(str, args...)       do {\
+#define DBG(...)       do {\
                                         fprintf(stdout, \
                                         "[%s][%s][%d]: ",\
                                         __FILE__, \
                                         __FUNCTION__, \
                                         __LINE__); \
                                         fflush(stdout); \
-                                        fprintf(stdout, str, ## args); \
+                                        fprintf(stdout, __VA_ARGS__); \
                                 } while (0)
 #else
-#define DBG0(format)
-#define DBG1(format, arg1)
-#define DBG2(format, arg1, arg2)
+#define DBG(...)
 #endif /* 0/1 */
 
 /* fixed values taken from the standard */
@@ -219,7 +217,7 @@ static void dissect_ice_string(packet_info *pinfo, proto_tree *tree, proto_item
         (*consumed) += 4;
     }
 
-    DBG1("string.Size --> %d\n", Size);
+    DBG("string.Size --> %d\n", Size);
 
     /* check if the string exists */
     if ( !tvb_bytes_exist(tvb, offset, Size) ) {
@@ -390,7 +388,7 @@ static void dissect_ice_context(packet_info *pinfo, proto_tree *tree, proto_item
         (*consumed) += 4;
     }
 
-    DBG1("context.Size --> %d\n", Size);
+    DBG("context.Size --> %d\n", Size);
 
     if ( Size > icep_max_ice_context_pairs ) {
 
@@ -421,7 +419,7 @@ static void dissect_ice_context(packet_info *pinfo, proto_tree *tree, proto_item
         proto_item *ti;
         proto_tree *context_tree;
 
-        DBG1("looping through context dictionary, loop #%d\n", i);
+        DBG("looping through context dictionary, loop #%d\n", i);
         context_tree = proto_tree_add_subtree(tree, tvb, offset, -1, ett_icep_invocation_context, &ti, "Invocation Context");
 
         dissect_ice_string(pinfo, context_tree, ti, hf_icep_invocation_key, tvb, offset, &consumed_key, &str_key);
@@ -485,7 +483,7 @@ static void dissect_ice_params(packet_info *pinfo, proto_tree *tree, proto_item
     /* get the size */
     size = tvb_get_letohl(tvb, offset);
 
-    DBG1("params.size --> %d\n", size);
+    DBG("params.size --> %d\n", size);
 
     if ( size < ICEP_MIN_PARAMS_SIZE ) {
 
@@ -585,7 +583,7 @@ static void dissect_icep_request_common(tvbuff_t *tvb, guint32 offset,
     if ( consumed == -1 )
         goto error;
 
-    offset += consumed; DBG1("consumed --> %d\n", consumed);
+    offset += consumed; DBG("consumed --> %d\n", consumed);
     (*total_consumed) += consumed;
 
 
@@ -594,7 +592,7 @@ static void dissect_icep_request_common(tvbuff_t *tvb, guint32 offset,
     if ( consumed == -1 )
         goto error;
 
-    offset += consumed; DBG1("consumed --> %d\n", consumed);
+    offset += consumed; DBG("consumed --> %d\n", consumed);
     (*total_consumed) += consumed;
 
 
@@ -608,7 +606,7 @@ static void dissect_icep_request_common(tvbuff_t *tvb, guint32 offset,
     if ( consumed == -1 )
         goto error;
 
-    offset += consumed; DBG1("consumed --> %d\n", consumed);
+    offset += consumed; DBG("consumed --> %d\n", consumed);
     (*total_consumed) += consumed;
 
     /*  "operation" is an ice_string
@@ -620,11 +618,11 @@ static void dissect_icep_request_common(tvbuff_t *tvb, guint32 offset,
     if ( consumed == -1 )
         goto error;
     else {
-        offset += consumed; DBG1("consumed --> %d\n", consumed);
+        offset += consumed; DBG("consumed --> %d\n", consumed);
         (*total_consumed) += consumed;
 
         if ( opstr && namestr ) {
-            DBG2("operation --> %s.%s()\n", namestr, opstr);
+            DBG("operation --> %s.%s()\n", namestr, opstr);
             col_append_fstr(pinfo->cinfo, COL_INFO, " %s.%s()",
                         namestr, opstr);
             opstr = NULL;
@@ -643,7 +641,7 @@ static void dissect_icep_request_common(tvbuff_t *tvb, guint32 offset,
 
     proto_tree_add_item(icep_sub_tree, hf_icep_mode, tvb, offset, 1, ENC_LITTLE_ENDIAN);
 
-    offset++; DBG0("consumed --> 1\n");
+    offset++; DBG("consumed --> 1\n");
     (*total_consumed)++;
 
 
@@ -656,7 +654,7 @@ static void dissect_icep_request_common(tvbuff_t *tvb, guint32 offset,
     if ( consumed == -1 )
         goto error;
 
-    offset += consumed; DBG1("consumed --> %d\n", consumed);
+    offset += consumed; DBG("consumed --> %d\n", consumed);
     (*total_consumed) += consumed;
 
     /*  "params" is a Encapsulation
@@ -669,7 +667,7 @@ static void dissect_icep_request_common(tvbuff_t *tvb, guint32 offset,
         goto error;
 
     /*offset += consumed;*/
-     DBG1("consumed --> %d\n", consumed);
+     DBG("consumed --> %d\n", consumed);
     (*total_consumed) += consumed;
 
     return;
@@ -700,7 +698,7 @@ static void dissect_icep_request(tvbuff_t *tvb, guint32 offset,
     gint32 consumed = 0;
     guint32 reqid = 0;
 
-    DBG0("dissect request\n");
+    DBG("dissect request\n");
 
     /* check for req id */
     if ( !tvb_bytes_exist(tvb, offset, 4) ) {
@@ -727,7 +725,7 @@ static void dissect_icep_request(tvbuff_t *tvb, guint32 offset,
 
 
     offset += 4;
-    DBG0("consumed --> 4\n");
+    DBG("consumed --> 4\n");
 
     dissect_icep_request_common(tvb, offset, pinfo, icep_sub_tree, ti, &consumed);
 
@@ -735,7 +733,7 @@ static void dissect_icep_request(tvbuff_t *tvb, guint32 offset,
         return;
 
     /*offset += consumed;*/
-    DBG1("consumed --> %d\n", consumed);
+    DBG("consumed --> %d\n", consumed);
 }
 
 
@@ -768,7 +766,7 @@ static void dissect_icep_batch_request(tvbuff_t *tvb, guint32 offset,
     guint32 i = 0;
     gint32 consumed = 0;
 
-    DBG0("dissect batch request\n");
+    DBG("dissect batch request\n");
 
     /* check for first 4 byte */
     if ( !tvb_bytes_exist(tvb, offset, 4) ) {
@@ -781,7 +779,7 @@ static void dissect_icep_batch_request(tvbuff_t *tvb, guint32 offset,
     num_reqs = tvb_get_letohl(tvb, offset);
     offset += 4;
 
-    DBG1("batch_requests.count --> %d\n", num_reqs);
+    DBG("batch_requests.count --> %d\n", num_reqs);
 
     if ( num_reqs > icep_max_batch_requests ) {
 
@@ -808,7 +806,7 @@ static void dissect_icep_batch_request(tvbuff_t *tvb, guint32 offset,
 
     for ( i = 0; i < num_reqs; i++ ) {
 
-        DBG1("looping through sequence of batch requests, loop #%d\n", i);
+        DBG("looping through sequence of batch requests, loop #%d\n", i);
 
         /* create display subtree for this message type */
 
@@ -828,7 +826,7 @@ static void dissect_icep_batch_request(tvbuff_t *tvb, guint32 offset,
             proto_item_set_len(ti, consumed);
 
         offset += consumed;
-        DBG1("consumed --> %d\n", consumed);
+        DBG("consumed --> %d\n", consumed);
     }
 }
 
@@ -850,7 +848,7 @@ static void dissect_icep_reply(tvbuff_t *tvb, guint32 offset,
     proto_item *ti = NULL;
     proto_tree *icep_sub_tree = NULL;
 
-    DBG0("dissect reply\n");
+    DBG("dissect reply\n");
 
     /* get at least a full reply message header */
 
@@ -884,7 +882,7 @@ static void dissect_icep_reply(tvbuff_t *tvb, guint32 offset,
 
     offset++;
 
-    DBG1("consumed --> %d\n", 5);
+    DBG("consumed --> %d\n", 5);
 
     /* check if I got all reply data */
     tvb_data_remained = tvb_reported_length_remaining(tvb, offset);
@@ -901,7 +899,7 @@ static void dissect_icep_reply(tvbuff_t *tvb, guint32 offset,
                     reported_reply_data - tvb_data_remained);
 
         /*offset += tvb_data_remained;*/
-        DBG1("consumed --> %d\n", tvb_data_remained);
+        DBG("consumed --> %d\n", tvb_data_remained);
         return;
     }
 
@@ -910,7 +908,7 @@ static void dissect_icep_reply(tvbuff_t *tvb, guint32 offset,
     proto_tree_add_item(icep_sub_tree, hf_icep_reply_data, tvb, offset, reported_reply_data, ENC_NA);
 
     /*offset += reported_reply_data;*/
-    DBG1("consumed --> %d\n", reported_reply_data);
+    DBG("consumed --> %d\n", reported_reply_data);
 }
 
 static guint get_icep_pdu_len(packet_info *pinfo _U_, tvbuff_t *tvb,
@@ -948,7 +946,7 @@ static int dissect_icep_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
                     icep_msgtype_vals,
                     "Unknown Message Type: 0x%02x"));
 
-    DBG0("got an icep msg, start analysis\n");
+    DBG("got an icep msg, start analysis\n");
 
     /* create display subtree for the protocol */
 
@@ -996,17 +994,17 @@ static int dissect_icep_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
 
     switch(tvb_get_guint8(tvb, 8)) {
     case 0x0:
-        DBG1("request message body: parsing %d bytes\n",
+        DBG("request message body: parsing %d bytes\n",
             tvb_captured_length_remaining(tvb, offset));
         dissect_icep_request(tvb, offset, pinfo, icep_tree, ti);
         break;
     case 0x1:
-        DBG1("batch request message body: parsing %d bytes\n",
+        DBG("batch request message body: parsing %d bytes\n",
             tvb_captured_length_remaining(tvb, offset));
         dissect_icep_batch_request(tvb, offset, pinfo, icep_tree, ti);
         break;
     case 0x2:
-        DBG1("reply message body: parsing %d bytes\n",
+        DBG("reply message body: parsing %d bytes\n",
             tvb_captured_length_remaining(tvb, offset));
         dissect_icep_reply(tvb, offset, pinfo, icep_tree, ti);
         break;
@@ -1024,7 +1022,7 @@ static int dissect_icep_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
 /* entry point */
 static gboolean dissect_icep_tcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data)
 {
-    DBG0("triggered\n");
+    DBG("triggered\n");
 
     if ( tvb_memeql(tvb, 0, icep_magic, 4) == -1 ) {
         /* Not a ICEP packet. */
@@ -1041,7 +1039,7 @@ static gboolean dissect_icep_tcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *
 
 static gboolean dissect_icep_udp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data)
 {
-    DBG0("triggered\n");
+    DBG("triggered\n");
 
     if ( tvb_memeql(tvb, 0, icep_magic, 4) == -1 ) {
         /* Not a ICEP packet. */
diff --git a/epan/dissectors/packet-nbap.c b/epan/dissectors/packet-nbap.c
index 0b9e78039d..5055a53b5d 100644
--- a/epan/dissectors/packet-nbap.c
+++ b/epan/dissectors/packet-nbap.c
@@ -63,17 +63,9 @@
 
 /* Debug */
 #if 0
-#define nbap_debug0(str) g_warning(str)
-#define nbap_debug1(str,p1) g_warning(str,p1)
-#define nbap_debug2(str,p1,p2) g_warning(str,p1,p2)
-#define nbap_debug3(str,p1,p2,p3) g_warning(str,p1,p2,p3)
-#define nbap_debug4(str,p1,p2,p3,p4) g_warning(str,p1,p2,p3,p4)
+#define nbap_debug(...) g_warning(__VA_ARGS__)
 #else
-#define nbap_debug0(str)
-#define nbap_debug1(str,p1)
-#define nbap_debug2(str,p1,p2)
-#define nbap_debug3(str,p1,p2,p3)
-#define nbap_debug4(str,p1,p2,p3,p4)
+#define nbap_debug(...)
 #endif
 
 void proto_register_nbap(void);
@@ -1544,7 +1536,7 @@ typedef enum _ProtocolIE_ID_enum {
 } ProtocolIE_ID_enum;
 
 /*--- End of included file: packet-nbap-val.h ---*/
-#line 82 "../../asn1/nbap/packet-nbap-template.c"
+#line 74 "../../asn1/nbap/packet-nbap-template.c"
 
 /* Initialize the protocol and registered fields */
 static int proto_nbap = -1;
@@ -4848,7 +4840,7 @@ static int hf_nbap_RACH_SubChannelNumbers_subCh1 = -1;
 static int hf_nbap_RACH_SubChannelNumbers_subCh0 = -1;
 
 /*--- End of included file: packet-nbap-hf.c ---*/
-#line 90 "../../asn1/nbap/packet-nbap-template.c"
+#line 82 "../../asn1/nbap/packet-nbap-template.c"
 
 /* Initialize the subtree pointers */
 static int ett_nbap = -1;
@@ -6487,7 +6479,7 @@ static gint ett_nbap_UnsuccessfulOutcome = -1;
 static gint ett_nbap_Outcome = -1;
 
 /*--- End of included file: packet-nbap-ett.c ---*/
-#line 98 "../../asn1/nbap/packet-nbap-template.c"
+#line 90 "../../asn1/nbap/packet-nbap-template.c"
 
 static expert_field ei_nbap_no_find_comm_context_id = EI_INIT;
 static expert_field ei_nbap_no_find_port_info = EI_INIT;
@@ -18494,7 +18486,7 @@ num_items = 1;
         return offset;
     }
 
-    nbap_debug1("Frame %u E-DCH-MACdFlow-Specific-InfoItem-to-Modify",
+    nbap_debug("Frame %u E-DCH-MACdFlow-Specific-InfoItem-to-Modify",
         actx->pinfo->fd->num);
 
     /****** Look up old port and ip information since this is not included in this message ******/
@@ -18515,12 +18507,12 @@ num_items = 1;
         expert_add_info(actx->pinfo, NULL, &ei_nbap_no_find_port_info);
         return offset;
     }
-    nbap_debug1("    Found com_context_id %u", com_context_id);
+    nbap_debug("    Found com_context_id %u", com_context_id);
 
     /*Set the appropriate port, cheat and use same variable.*/
     BindingID_port = old_info->crnc_port[e_dch_macdflow_id];
 
-    nbap_debug2(" Port %u loaded from old_info->crnc_port[e_dch_macdflow_id %u]",
+    nbap_debug(" Port %u loaded from old_info->crnc_port[e_dch_macdflow_id %u]",
         BindingID_port,
         e_dch_macdflow_id);
 
@@ -18649,12 +18641,12 @@ BindingID_port = 0;
             0, NO_ADDR_B|NO_PORT_B);
 
         if(old_conversation){
-            nbap_debug3("Frame %u E-DCH-FDD-Information-to-Modify: found old conv on IP %s Port %u",
+            nbap_debug("Frame %u E-DCH-FDD-Information-to-Modify: found old conv on IP %s Port %u",
                 actx->pinfo->fd->num,
                 address_to_str(wmem_packet_scope(), &dst_addr),
                 BindingID_port);
         }else{
-            nbap_debug3("Frame %u E-DCH-FDD-Information-to-Modify: Did not find old conv on IP %s Port %u",
+            nbap_debug("Frame %u E-DCH-FDD-Information-to-Modify: Did not find old conv on IP %s Port %u",
                 actx->pinfo->fd->num,
                 address_to_str(wmem_packet_scope(), &dst_addr),
                 BindingID_port);
@@ -23793,7 +23785,7 @@ dissect_nbap_HSDSCH_FDD_Information(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_
     SET_ADDRESS(&null_addr, AT_NONE, 0, NULL);
     for (i = 0; i < maxNrOfMACdFlows; i++) {
         if (nbap_hsdsch_channel_info[i].crnc_port != 0){
-            nbap_debug4("Frame %u HSDSCH-MACdFlows-Information:hsdsch_macdflow_id %u Look for conv on IP %s Port %u",
+            nbap_debug("Frame %u HSDSCH-MACdFlows-Information:hsdsch_macdflow_id %u Look for conv on IP %s Port %u",
                         actx->pinfo->fd->num,
                         i,
                         address_to_str (wmem_packet_scope(), &(nbap_hsdsch_channel_info[i].crnc_address)),
@@ -23805,7 +23797,7 @@ dissect_nbap_HSDSCH_FDD_Information(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_
 
             if (conversation == NULL) {
                 /* It's not part of any conversation - create a new one. */
-                nbap_debug2("Frame %u HSDSCH-MACdFlows-Information: Set up conv on Port %u", actx->pinfo->fd->num, nbap_hsdsch_channel_info[i].crnc_port);
+                nbap_debug("Frame %u HSDSCH-MACdFlows-Information: Set up conv on Port %u", actx->pinfo->fd->num, nbap_hsdsch_channel_info[i].crnc_port);
                 conversation = conversation_new(actx->pinfo->fd->num, &(nbap_hsdsch_channel_info[i].crnc_address),
                     &null_addr, PT_UDP, nbap_hsdsch_channel_info[i].crnc_port,
                     0, NO_ADDR2|NO_PORT2);
@@ -24126,12 +24118,12 @@ dissect_nbap_HSDSCH_Information_to_Modify(tvbuff_t *tvb _U_, int offset _U_, asn
     /* Set port to zero use that as an indication of whether we have data or not */
     SET_ADDRESS(&null_addr, AT_NONE, 0, NULL);
 
-    nbap_debug1("Frame %u HSDSCH-MACdFlows-Information Start",
+    nbap_debug("Frame %u HSDSCH-MACdFlows-Information Start",
         actx->pinfo->fd->num);
 
     for (i = 0; i < maxNrOfMACdFlows; i++) {
         if (nbap_hsdsch_channel_info[i].crnc_port != 0){
-            nbap_debug3("    hsdsch_macdflow_id %u Look for conv on IP %s Port %u",
+            nbap_debug("    hsdsch_macdflow_id %u Look for conv on IP %s Port %u",
                         i,
                         address_to_str (wmem_packet_scope(), &(nbap_hsdsch_channel_info[i].crnc_address)),
                         nbap_hsdsch_channel_info[i].crnc_port);
@@ -24142,7 +24134,7 @@ dissect_nbap_HSDSCH_Information_to_Modify(tvbuff_t *tvb _U_, int offset _U_, asn
 
             if (conversation == NULL) {
                 /* It's not part of any conversation - create a new one. */
-                nbap_debug1("    Set up conv on Port %u", nbap_hsdsch_channel_info[i].crnc_port);
+                nbap_debug("    Set up conv on Port %u", nbap_hsdsch_channel_info[i].crnc_port);
 
                 conversation = conversation_new(actx->pinfo->fd->num, &(nbap_hsdsch_channel_info[i].crnc_address),
                     &null_addr, PT_UDP, nbap_hsdsch_channel_info[i].crnc_port,
@@ -24194,7 +24186,7 @@ dissect_nbap_HSDSCH_Information_to_Modify(tvbuff_t *tvb _U_, int offset _U_, asn
                 }
             }
         }
-        nbap_debug1("Frame %u HSDSCH-MACdFlows-Information End",
+        nbap_debug("Frame %u HSDSCH-MACdFlows-Information End",
             actx->pinfo->fd->num);
 
     }
@@ -28746,9 +28738,9 @@ dch_id = 0xFFFFFFFF;
                 set_umts_fp_conv_data(conversation, umts_fp_conversation_info);
             }
 
-            nbap_debug1("Frame %u RL-Specific-DCH-Info-Item Start", actx->pinfo->fd->num);
-            nbap_debug1("    Total no of ch in flow will be: %d", umts_fp_conversation_info->num_dch_in_flow);
-            nbap_debug1("Frame %u RL-Specific-DCH-Info-Item End", actx->pinfo->fd->num);
+            nbap_debug("Frame %u RL-Specific-DCH-Info-Item Start", actx->pinfo->fd->num);
+            nbap_debug("    Total no of ch in flow will be: %d", umts_fp_conversation_info->num_dch_in_flow);
+            nbap_debug("Frame %u RL-Specific-DCH-Info-Item End", actx->pinfo->fd->num);
 
         }
 
@@ -28863,10 +28855,10 @@ BindingID_port = 0;
                     /*Ip address might be useful as well*/
                     nbap_edch_port_info->crnc_address = transportLayerAddress_ipv4;
 
-                    nbap_debug1("Frame %u RL-Specific-E-DCH-Information-Item Start",
+                    nbap_debug("Frame %u RL-Specific-E-DCH-Information-Item Start",
                         actx->pinfo->fd->num);
 
-                    nbap_debug4("    g_tree_insert(edch_flow_port_map) com_context_id %u e_dch_macdflow_id %u IP %s Port %u",
+                    nbap_debug("    g_tree_insert(edch_flow_port_map) com_context_id %u e_dch_macdflow_id %u IP %s Port %u",
                         umts_fp_conversation_info->com_context_id,
                         e_dch_macdflow_id,
                         address_to_str(wmem_packet_scope(), &dst_addr),
@@ -28875,7 +28867,7 @@ BindingID_port = 0;
                     g_tree_insert(edch_flow_port_map, GINT_TO_POINTER((gint)umts_fp_conversation_info->com_context_id), nbap_edch_port_info);
                 }else{
 
-                    nbap_debug4("    Insert in existing edch_flow_port_map com_context_id %u e_dch_macdflow_id %u IP %s Port %u",
+                    nbap_debug("    Insert in existing edch_flow_port_map com_context_id %u e_dch_macdflow_id %u IP %s Port %u",
                         umts_fp_conversation_info->com_context_id,
                         e_dch_macdflow_id,
                         address_to_str(wmem_packet_scope(), &dst_addr),
@@ -28891,7 +28883,7 @@ BindingID_port = 0;
 
                 set_umts_fp_conv_data(conversation, umts_fp_conversation_info);
 
-                nbap_debug1("Frame %u RL-Specific-E-DCH-Information-Item End", actx->pinfo->fd->num);
+                nbap_debug("Frame %u RL-Specific-E-DCH-Information-Item End", actx->pinfo->fd->num);
             }
     }
 
@@ -32568,14 +32560,14 @@ num_items = 1;
                 /* Set data for First or single channel */
                 umts_fp_conversation_info->fp_dch_channel_info[0].num_ul_chans = num_tf = nbap_dch_chnl_info[commontransportchannelid].num_ul_chans;
 
-                nbap_debug2("Frame %u PCH-ParametersItem-CTCH-SetupRqstFDD Start: num_tf %u",
+                nbap_debug("Frame %u PCH-ParametersItem-CTCH-SetupRqstFDD Start: num_tf %u",
                         actx->pinfo->fd->num,
                         num_tf);
 
                 for (j = 0; j < num_tf; j++) {
                     umts_fp_conversation_info->fp_dch_channel_info[0].ul_chan_tf_size[j] = nbap_dch_chnl_info[commontransportchannelid].ul_chan_tf_size[j];
                     umts_fp_conversation_info->fp_dch_channel_info[0].ul_chan_num_tbs[j] = nbap_dch_chnl_info[commontransportchannelid].ul_chan_num_tbs[j];
-                    nbap_debug2("    UL tf %u ul_chan_tf_size %u",j, nbap_dch_chnl_info[commontransportchannelid].ul_chan_tf_size[j]);
+                    nbap_debug("    UL tf %u ul_chan_tf_size %u",j, nbap_dch_chnl_info[commontransportchannelid].ul_chan_tf_size[j]);
                 }
 
                 /* Traffic flows per DCH(DL) */
@@ -32583,13 +32575,13 @@ num_items = 1;
                 for (j = 0; j < num_tf; j++) {
                     umts_fp_conversation_info->fp_dch_channel_info[0].dl_chan_tf_size[j] = nbap_dch_chnl_info[commontransportchannelid].dl_chan_tf_size[j];
                     umts_fp_conversation_info->fp_dch_channel_info[0].dl_chan_num_tbs[j] = nbap_dch_chnl_info[commontransportchannelid].dl_chan_num_tbs[j];
-                    nbap_debug2("    DL tf %u ul_chan_tf_size %u",j, nbap_dch_chnl_info[commontransportchannelid].dl_chan_tf_size[j]);
+                    nbap_debug("    DL tf %u ul_chan_tf_size %u",j, nbap_dch_chnl_info[commontransportchannelid].dl_chan_tf_size[j]);
                 }
 
                 /* Set data for associated DCH's if we have any */
                 i = commontransportchannelid;
 
-                nbap_debug2("    commontransportchannelid %u next ch %u",commontransportchannelid, nbap_dch_chnl_info[i].next_dch);
+                nbap_debug("    commontransportchannelid %u next ch %u",commontransportchannelid, nbap_dch_chnl_info[i].next_dch);
 
                 umts_fp_conversation_info->dchs_in_flow_list[0] = commontransportchannelid;
                 while(nbap_dch_chnl_info[i].next_dch != 0){
@@ -32612,12 +32604,12 @@ num_items = 1;
                 }
                 umts_fp_conversation_info->num_dch_in_flow++;
 
-                nbap_debug1("    num_dch_in_flow %u", umts_fp_conversation_info->num_dch_in_flow);
+                nbap_debug("    num_dch_in_flow %u", umts_fp_conversation_info->num_dch_in_flow);
 
                 umts_fp_conversation_info->dchs_in_flow_list[umts_fp_conversation_info->num_dch_in_flow] = i;
                 set_umts_fp_conv_data(conversation, umts_fp_conversation_info);
 
-                nbap_debug1("Frame %u PCH-ParametersItem-CTCH-SetupRqstFDD End",
+                nbap_debug("Frame %u PCH-ParametersItem-CTCH-SetupRqstFDD End",
                         actx->pinfo->fd->num);
 
             }
@@ -55167,7 +55159,7 @@ static int dissect_NULL_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tre
 
 
 /*--- End of included file: packet-nbap-fn.c ---*/
-#line 320 "../../asn1/nbap/packet-nbap-template.c"
+#line 312 "../../asn1/nbap/packet-nbap-template.c"
 
 static int dissect_ProtocolIEFieldValue(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_)
 {
@@ -68501,7 +68493,7 @@ void proto_register_nbap(void)
         NULL, HFILL }},
 
 /*--- End of included file: packet-nbap-hfarr.c ---*/
-#line 489 "../../asn1/nbap/packet-nbap-template.c"
+#line 481 "../../asn1/nbap/packet-nbap-template.c"
 	};
 
 	/* List of subtrees */
@@ -70141,7 +70133,7 @@ void proto_register_nbap(void)
     &ett_nbap_Outcome,
 
 /*--- End of included file: packet-nbap-ettarr.c ---*/
-#line 498 "../../asn1/nbap/packet-nbap-template.c"
+#line 490 "../../asn1/nbap/packet-nbap-template.c"
 	};
 
 	static ei_register_info ei[] = {
@@ -71296,7 +71288,7 @@ proto_reg_handoff_nbap(void)
 
 
 /*--- End of included file: packet-nbap-dis-tab.c ---*/
-#line 556 "../../asn1/nbap/packet-nbap-template.c"
+#line 548 "../../asn1/nbap/packet-nbap-template.c"
 }
 
 
diff --git a/epan/dissectors/packet-netflow.c b/epan/dissectors/packet-netflow.c
index 89bb7d925e..1797951f04 100644
--- a/epan/dissectors/packet-netflow.c
+++ b/epan/dissectors/packet-netflow.c
@@ -141,15 +141,9 @@ void proto_register_netflow(void);
 void proto_reg_handoff_netflow(void);
 
 #if 0
-#define ipfix_debug0(str) g_warning(str)
-#define ipfix_debug1(str,p1) g_warning(str,p1)
-#define ipfix_debug2(str,p1,p2) g_warning(str,p1,p2)
-#define ipfix_debug3(str,p1,p2,p3) g_warning(str,p1,p2,p3)
+#define ipfix_debug(...) g_warning(__VA_ARGS__)
 #else
-#define ipfix_debug0(str)
-#define ipfix_debug1(str,p1)
-#define ipfix_debug2(str,p1,p2)
-#define ipfix_debug3(str,p1,p2,p3)
+#define ipfix_debug(...)
 #endif
 
 
@@ -2313,11 +2307,11 @@ dissect_netflow(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data
     dissect_pdu_t  *pduptr;
     guint32         flows_seen = 0;
 
-    ipfix_debug0("dissect_netflow: start");
+    ipfix_debug("dissect_netflow: start");
 
     ver = tvb_get_ntohs(tvb, offset);
 
-    ipfix_debug1("dissect_netflow: found version %d", ver);
+    ipfix_debug("dissect_netflow: found version %d", ver);
 
     switch (ver) {
     case 1:
@@ -2351,13 +2345,13 @@ dissect_netflow(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data
 
     col_set_str(pinfo->cinfo, COL_PROTOCOL, "CFLOW");
     col_clear(pinfo->cinfo, COL_INFO);
-    ipfix_debug0("dissect_netflow: column cleared");
+    ipfix_debug("dissect_netflow: column cleared");
 
     if (tree) {
         ti = proto_tree_add_item(tree, proto_netflow, tvb, offset, -1, ENC_NA);
         netflow_tree = proto_item_add_subtree(ti, ett_netflow);
     }
-    ipfix_debug0("dissect_netflow: tree added");
+    ipfix_debug("dissect_netflow: tree added");
 
     hdrinfo.vspec = ver;
     hdrinfo.src_id = 0;