MATE: allow _AVP_DEBUGGING flag to be set

1 files changed, 31 insertions, 32 deletions

diff --git a/plugins/epan/mate/mate_util.c b/plugins/epan/mate/mate_util.c
index 11be35068f..4356b79cf1 100644
--- a/plugins/epan/mate/mate_util.c
+++ b/plugins/epan/mate/mate_util.c
@@ -48,7 +48,6 @@ void dbg_print(const gint* which, gint how, FILE* where, const gchar* fmt, ... )
 
 }
 
-
 /***************************************************************************
  *  single copy strings
  ***************************************************************************
@@ -312,7 +311,7 @@ extern AVP* new_avp_from_finfo(const gchar* name, field_info* finfo) {
 	new_avp_val->o = '=';
 
 #ifdef _AVP_DEBUGGING
-	dbg_print (dbg_avp,1,dbg_fp,"new_avp_from_finfo: %X %s%c%s;",(guint32) new_avp_val,new_avp_val->n,new_avp_val->o,new_avp_val->v);
+	dbg_print (dbg_avp,1,dbg_fp,"new_avp_from_finfo: %p %s%c%s;",new_avp_val,new_avp_val->n,new_avp_val->o,new_avp_val->v);
 #endif
 
 	return new_avp_val;
@@ -338,7 +337,7 @@ extern AVP* new_avp(const gchar* name, const gchar* value, gchar o) {
 	new_avp_val->o = o;
 
 #ifdef _AVP_DEBUGGING
-	dbg_print(dbg_avp,1,dbg_fp,"new_avp_val: %X %s%c%s;",(guint32) new_avp_val,new_avp_val->n,new_avp_val->o,new_avp_val->v);
+	dbg_print(dbg_avp,1,dbg_fp,"new_avp_val: %p %s%c%s;",new_avp_val,new_avp_val->n,new_avp_val->o,new_avp_val->v);
 #endif
 	return new_avp_val;
 }
@@ -353,7 +352,7 @@ extern AVP* new_avp(const gchar* name, const gchar* value, gchar o) {
  **/
 extern void delete_avp(AVP* avp) {
 #ifdef _AVP_DEBUGGING
-	dbg_print(dbg_avp,1,dbg_fp,"delete_avp: %X %s%c%s;",(guint32) avp,avp->n,avp->o,avp->v);
+	dbg_print(dbg_avp,1,dbg_fp,"delete_avp: %p %s%c%s;",avp,avp->n,avp->o,avp->v);
 #endif
 
 	scs_unsubscribe(avp_strings, avp->n);
@@ -379,7 +378,7 @@ extern AVP* avp_copy(AVP* from) {
 	new_avp_val->o = from->o;
 
 #ifdef _AVP_DEBUGGING
-	dbg_print(dbg_avp,1,dbg_fp,"copy_avp: %X %s%c%s;",(guint32) new_avp_val,new_avp_val->n,new_avp_val->o,new_avp_val->v);
+	dbg_print(dbg_avp,1,dbg_fp,"copy_avp: %p %s%c%s;",new_avp_val,new_avp_val->n,new_avp_val->o,new_avp_val->v);
 #endif
 
 	return new_avp_val;
@@ -398,7 +397,7 @@ extern AVPL* new_avpl(const gchar* name) {
 	AVPL* new_avpl_p = (AVPL*)g_slice_new(any_avp_type);
 
 #ifdef _AVP_DEBUGGING
-	dbg_print(dbg_avpl_op,7,dbg_fp,"new_avpl_p: %X name=%s",new_avpl_p,name);
+	dbg_print(dbg_avpl_op,7,dbg_fp,"new_avpl_p: %p name=%s",new_avpl_p,name);
 #endif
 
 	new_avpl_p->name = name ? scs_subscribe(avp_strings, name) : scs_subscribe(avp_strings, "");
@@ -464,7 +463,7 @@ extern gboolean insert_avp(AVPL* avpl, AVP* avp) {
 	AVPN* c;
 
 #ifdef _AVP_DEBUGGING
-	dbg_print(dbg_avpl_op,4,dbg_fp,"insert_avp: %X %X %s%c%s;",avpl,avp,avp->n,avp->o,avp->v);
+	dbg_print(dbg_avpl_op,4,dbg_fp,"insert_avp: %p %p %s%c%s;",avpl,avp,avp->n,avp->o,avp->v);
 #endif
 
 	/* get to the insertion point */
@@ -516,7 +515,7 @@ extern AVP* get_avp_by_name(AVPL* avpl, gchar* name, void** cookie) {
 	AVPN* start = (AVPN*) *cookie;
 
 #ifdef _AVP_DEBUGGING
-	dbg_print(dbg_avpl_op,7,dbg_fp,"get_avp_by_name: entering: %X %s %X",avpl,name,*cookie);
+	dbg_print(dbg_avpl_op,7,dbg_fp,"get_avp_by_name: entering: %p %s %p",avpl,name,*cookie);
 #endif
 
 	name = scs_subscribe(avp_strings, name);
@@ -532,7 +531,7 @@ extern AVP* get_avp_by_name(AVPL* avpl, gchar* name, void** cookie) {
 	*cookie = curr;
 
 #ifdef _AVP_DEBUGGING
-	dbg_print(dbg_avpl_op,5,dbg_fp,"get_avp_by_name: got avp: %X",curr);
+	dbg_print(dbg_avpl_op,5,dbg_fp,"get_avp_by_name: got avp: %p",curr);
 #endif
 
 	scs_unsubscribe(avp_strings, name);
@@ -555,7 +554,7 @@ extern AVP* extract_avp_by_name(AVPL* avpl, gchar* name) {
 	AVP* avp = NULL;
 
 #ifdef _AVP_DEBUGGING
-	dbg_print(dbg_avpl_op,7,dbg_fp,"extract_avp_by_name: entering: %X %s",avpl,name);
+	dbg_print(dbg_avpl_op,7,dbg_fp,"extract_avp_by_name: entering: %p %s",avpl,name);
 #endif
 
 	name = scs_subscribe(avp_strings, name);
@@ -580,11 +579,11 @@ extern AVP* extract_avp_by_name(AVPL* avpl, gchar* name) {
 	(avpl->len)--;
 
 #ifdef _AVP_DEBUGGING
-	dbg_print(dbg_avpl,4,dbg_fp,"avpl: %X new len: %i",avpl,avpl->len);
+	dbg_print(dbg_avpl,4,dbg_fp,"avpl: %p new len: %i",avpl,avpl->len);
 #endif
 
 #ifdef _AVP_DEBUGGING
-	dbg_print(dbg_avpl_op,5,dbg_fp,"extract_avp_by_name: got avp: %X",avp);
+	dbg_print(dbg_avpl_op,5,dbg_fp,"extract_avp_by_name: got avp: %p",avp);
 #endif
 
 	return avp;
@@ -605,7 +604,7 @@ extern AVP* extract_first_avp(AVPL* avpl) {
 	AVPN* node;
 
 #ifdef _AVP_DEBUGGING
-	dbg_print(dbg_avpl_op,7,dbg_fp,"extract_first_avp: %X",avpl);
+	dbg_print(dbg_avpl_op,7,dbg_fp,"extract_first_avp: %p",avpl);
 #endif
 
 	node = avpl->null.next;
@@ -619,12 +618,12 @@ extern AVP* extract_first_avp(AVPL* avpl) {
 		g_slice_free(any_avp_type,(any_avp_type*)node);
 		(avpl->len)--;
 #ifdef _AVP_DEBUGGING
-		dbg_print(dbg_avpl,4,dbg_fp,"avpl: %X new len: %i",avpl,avpl->len);
+		dbg_print(dbg_avpl,4,dbg_fp,"avpl: %p new len: %i",avpl,avpl->len);
 #endif
 	}
 
 #ifdef _AVP_DEBUGGING
-	dbg_print(dbg_avpl_op,5,dbg_fp,"extract_first_avp: got avp: %X",avp);
+	dbg_print(dbg_avpl_op,5,dbg_fp,"extract_first_avp: got avp: %p",avp);
 #endif
 
 	return avp;
@@ -656,12 +655,12 @@ extern AVP* extract_last_avp(AVPL* avpl) {
 		g_slice_free(any_avp_type,(any_avp_type*)node);
 		(avpl->len)--;
 #ifdef _AVP_DEBUGGING
-		dbg_print(dbg_avpl,4,dbg_fp,"avpl: %X new len: %i",avpl,avpl->len);
+		dbg_print(dbg_avpl,4,dbg_fp,"avpl: %p new len: %i",avpl,avpl->len);
 #endif
 	}
 
 #ifdef _AVP_DEBUGGING
-	dbg_print(dbg_avpl_op,5,dbg_fp,"extract_last_avp: got avp: %X",avp);
+	dbg_print(dbg_avpl_op,5,dbg_fp,"extract_last_avp: got avp: %p",avp);
 #endif
 
 	return avp;
@@ -681,7 +680,7 @@ extern AVP* extract_last_avp(AVPL* avpl) {
 extern void delete_avpl(AVPL* avpl, gboolean avps_too) {
 	AVP* avp;
 #ifdef _AVP_DEBUGGING
-	dbg_print(dbg_avpl,3,dbg_fp,"delete_avpl: %X",avpl);
+	dbg_print(dbg_avpl,3,dbg_fp,"delete_avpl: %p",avpl);
 #endif
 
 	while(( avp = extract_last_avp(avpl))) {
@@ -710,7 +709,7 @@ extern AVP* get_next_avp(AVPL* avpl, void** cookie) {
 	AVPN* node;
 
 #ifdef _AVP_DEBUGGING
-	dbg_print(dbg_avpl_op,5,dbg_fp,"get_next_avp: avpl: %X avpn: %X",avpl,*cookie);
+	dbg_print(dbg_avpl_op,5,dbg_fp,"get_next_avp: avpl: %p avpn: %p",avpl,*cookie);
 #endif
 
 	if (*cookie) {
@@ -722,7 +721,7 @@ extern AVP* get_next_avp(AVPL* avpl, void** cookie) {
 	*cookie = node->next;
 
 #ifdef _AVP_DEBUGGING
-	dbg_print(dbg_avpl_op,5,dbg_fp,"extract_last_avp: got avp: %X",node->avp);
+	dbg_print(dbg_avpl_op,5,dbg_fp,"extract_last_avp: got avp: %p",node->avp);
 #endif
 
 	return node->avp;
@@ -787,7 +786,7 @@ extern void merge_avpl(AVPL* dst, AVPL* src, gboolean copy_avps) {
 	AVPN* cs = NULL;
 
 #ifdef _AVP_DEBUGGING
-	dbg_print(dbg_avpl_op,3,dbg_fp,"merge_avpl: %X %X",dst,src);
+	dbg_print(dbg_avpl_op,3,dbg_fp,"merge_avpl: %p %p",dst,src);
 #endif
 
 	cs = src->null.next;
@@ -857,7 +856,7 @@ extern AVPL* new_avpl_from_avpl(const gchar* name, AVPL* avpl, gboolean copy_avp
 	AVP* copy;
 
 #ifdef _AVP_DEBUGGING
-	dbg_print(dbg_avpl_op,3,dbg_fp,"new_avpl_from_avpl: %X from=%X name='%s'",newavpl,avpl,name);
+	dbg_print(dbg_avpl_op,3,dbg_fp,"new_avpl_from_avpl: %p from=%p name='%s'",newavpl,avpl,name);
 #endif
 
 	while(( avp = get_next_avp(avpl,&cookie) )) {
@@ -989,7 +988,7 @@ extern AVPL* new_avpl_loose_match(const gchar* name,
 	AVPN* cs = NULL;
 
 #ifdef _AVP_DEBUGGING
-	dbg_print(dbg_avpl_op,3,dbg_fp,"new_avpl_loose_match: %X src=%X op=%X name='%s'",newavpl,src,op,name);
+	dbg_print(dbg_avpl_op,3,dbg_fp,"new_avpl_loose_match: %p src=%p op=%p name='%s'",newavpl,src,op,name);
 #endif
 
 
@@ -1048,12 +1047,12 @@ extern AVPL* new_avpl_pairs_match(const gchar* name, AVPL* src, AVPL* op, gboole
 	const gchar *last_match = NULL;
 	gboolean matched = TRUE;
 
+	newavpl = new_avpl(scs_subscribe(avp_strings, name));
+
 #ifdef _AVP_DEBUGGING
 	dbg_print(dbg_avpl_op,3,dbg_fp,"%s: %p src=%p op=%p name='%s'",G_STRFUNC,newavpl,src,op,name);
 #endif
 
-	newavpl = new_avpl(scs_subscribe(avp_strings, name));
-
 	cs = src->null.next;
 	co = op->null.next;
 	while (cs->avp && co->avp) {
@@ -1191,7 +1190,7 @@ extern void avpl_transform(AVPL* src, AVPL_Transf* op) {
 	AVPN* n;
 
 #ifdef _AVP_DEBUGGING
-	dbg_print(dbg_avpl_op,3,dbg_fp,"avpl_transform: src=%X op=%X",src,op);
+	dbg_print(dbg_avpl_op,3,dbg_fp,"avpl_transform: src=%p op=%p",src,op);
 #endif
 
 	for ( ; op ; op = op->next) {
@@ -1256,7 +1255,7 @@ extern LoAL* new_loal(const gchar* name) {
 	}
 
 #ifdef _AVP_DEBUGGING
-	dbg_print(dbg_avpl_op,3,dbg_fp,"new_loal_p: %X name=%s",new_loal_p,name);
+	dbg_print(dbg_avpl_op,3,dbg_fp,"new_loal_p: %p name=%s",new_loal_p,name);
 #endif
 
 	new_loal_p->name = scs_subscribe(avp_strings,name);
@@ -1279,7 +1278,7 @@ extern void loal_append(LoAL* loal, AVPL* avpl) {
 	LoALnode* node = (LoALnode*)g_slice_new(any_avp_type);
 
 #ifdef _AVP_DEBUGGING
-	dbg_print(dbg_avpl_op,3,dbg_fp,"new_loal_node: %X",node);
+	dbg_print(dbg_avpl_op,3,dbg_fp,"new_loal_node: %p",node);
 #endif
 
 	node->avpl = avpl;
@@ -1323,7 +1322,7 @@ extern AVPL* extract_first_avpl(LoAL* loal) {
 
 #ifdef _AVP_DEBUGGING
 		dbg_print(dbg_avpl_op,3,dbg_fp,"extract_first_avpl: got %s",avpl->name);
-		dbg_print(dbg_avpl_op,3,dbg_fp,"delete_loal_node: %X",node);
+		dbg_print(dbg_avpl_op,3,dbg_fp,"delete_loal_node: %p",node);
 #endif
 	}
 
@@ -1355,7 +1354,7 @@ extern AVPL* extract_last_avpl(LoAL* loal){
 	if ( avpl ) {
 		g_slice_free(any_avp_type,(any_avp_type*)node);
 #ifdef _AVP_DEBUGGING
-		dbg_print(dbg_avpl_op,3,dbg_fp,"delete_loal_node: %X",node);
+		dbg_print(dbg_avpl_op,3,dbg_fp,"delete_loal_node: %p",node);
 #endif
 	}
 
@@ -1377,7 +1376,7 @@ extern AVPL* get_next_avpl(LoAL* loal,void** cookie) {
 	LoALnode* node;
 
 #ifdef _AVP_DEBUGGING
-	dbg_print(dbg_avpl_op,3,dbg_fp,"get_next_avpl: loal=%X node=%X",loal,*cookie);
+	dbg_print(dbg_avpl_op,3,dbg_fp,"get_next_avpl: loal=%p node=%p",loal,*cookie);
 #endif
 
 	if (*cookie) {
@@ -1404,7 +1403,7 @@ extern void delete_loal(LoAL* loal, gboolean avpls_too, gboolean avps_too) {
 	AVPL* avpl;
 
 #ifdef _AVP_DEBUGGING
-	dbg_print(dbg_avpl_op,3,dbg_fp,"delete_loal: %X",loal);
+	dbg_print(dbg_avpl_op,3,dbg_fp,"delete_loal: %p",loal);
 #endif
 
 	while(( avpl = extract_last_avpl(loal) )) {