dissectors: Replace g_log() with ws_log()

1 files changed, 20 insertions, 20 deletions

diff --git a/epan/dissectors/packet-iax2.c b/epan/dissectors/packet-iax2.c
index f45ec6e966..f5575e55f2 100644
--- a/epan/dissectors/packet-iax2.c
+++ b/epan/dissectors/packet-iax2.c
@@ -671,7 +671,7 @@ static gint iax_circuit_equal(gconstpointer v, gconstpointer w)
             v1->port  == v2->port  &&
             v1->callno== v2->callno);
 #ifdef DEBUG_HASHING
-  g_debug("+++ Comparing for equality: %s, %s: %u", key_to_str(v1), key_to_str(v2), result);
+  ws_debug("+++ Comparing for equality: %s, %s: %u", key_to_str(v1), key_to_str(v2), result);
 #endif
 
   return result;
@@ -689,7 +689,7 @@ static guint iax_circuit_hash(gconstpointer v)
   hash_val += (guint)(key->callno);
 
 #ifdef DEBUG_HASHING
-  g_debug("+++ Hashing key: %s, result %#x", key_to_str(key), hash_val);
+  ws_debug("+++ Hashing key: %s, result %#x", key_to_str(key), hash_val);
 #endif
 
   return (guint)hash_val;
@@ -731,7 +731,7 @@ static guint iax_circuit_lookup(const address *address_p,
     g_hash_table_insert(iax_circuit_hashtab, new_key, circuit_id_p);
 
 #ifdef DEBUG_HASHING
-    g_debug("Created new circuit id %u for node %s", *circuit_id_p, key_to_str(new_key));
+    ws_debug("Created new circuit id %u for node %s", *circuit_id_p, key_to_str(new_key));
 #endif
   }
 
@@ -871,7 +871,7 @@ static iax_call_data *iax_lookup_call_from_dest(packet_info *pinfo, proto_item *
 
   if (!dst_conv) {
 #ifdef DEBUG_HASHING
-    g_debug("++ destination circuit not found, must have missed NEW packet");
+    ws_debug("++ destination circuit not found, must have missed NEW packet");
 #endif
     if (reversed_p)
       *reversed_p = FALSE;
@@ -879,7 +879,7 @@ static iax_call_data *iax_lookup_call_from_dest(packet_info *pinfo, proto_item *
   }
 
 #ifdef DEBUG_HASHING
-  g_debug("++ found destination circuit");
+  ws_debug("++ found destination circuit");
 #endif
 
   iax_call = (iax_call_data *)conversation_get_proto_data(dst_conv, proto_iax2);
@@ -890,7 +890,7 @@ static iax_call_data *iax_lookup_call_from_dest(packet_info *pinfo, proto_item *
 
   if (is_forward_circuit(dst_circuit_id, iax_call)) {
 #ifdef DEBUG_HASHING
-    g_debug("++ destination circuit matches forward_circuit_id of call, "
+    ws_debug("++ destination circuit matches forward_circuit_id of call, "
              "therefore packet is reversed");
 #endif
 
@@ -901,13 +901,13 @@ static iax_call_data *iax_lookup_call_from_dest(packet_info *pinfo, proto_item *
          doesn't have a reverse circuit associated with it.
          create one now. */
 #ifdef DEBUG_HASHING
-      g_debug("++ reverse_circuit_id of call is zero, need to create a "
+      ws_debug("++ reverse_circuit_id of call is zero, need to create a "
               "new reverse circuit for this call");
 #endif
 
       iax2_new_circuit_for_call(pinfo, item, src_circuit_id, framenum, iax_call, TRUE);
 #ifdef DEBUG_HASHING
-      g_debug("++ done");
+      ws_debug("++ done");
 #endif
     } else if (!is_reverse_circuit(src_circuit_id, iax_call)) {
       expert_add_info_format(pinfo, item, &ei_iax_circuit_id_conflict,
@@ -920,7 +920,7 @@ static iax_call_data *iax_lookup_call_from_dest(packet_info *pinfo, proto_item *
     }
   } else if (is_reverse_circuit(dst_circuit_id, iax_call)) {
 #ifdef DEBUG_HASHING
-    g_debug("++ destination circuit matches reverse_circuit_id of call, "
+    ws_debug("++ destination circuit matches reverse_circuit_id of call, "
             "therefore packet is forward");
 #endif
 
@@ -963,7 +963,7 @@ static iax_call_data *iax_lookup_call( packet_info *pinfo,
 #ifdef DEBUG_HASHING
   srcstr = address_to_str(NULL, &pinfo->src);
   dststr = address_to_str(NULL, &pinfo->dst);
-  g_debug("++ iax_lookup_circuit_details: Looking up circuit for frame %u, "
+  ws_debug("++ iax_lookup_circuit_details: Looking up circuit for frame %u, "
           "from {%s:%u:%u} to {%s:%u:%u}", pinfo->num,
           srcstr, pinfo->srcport, scallno,
           dststr, pinfo->destport, dcallno);
@@ -981,7 +981,7 @@ static iax_call_data *iax_lookup_call( packet_info *pinfo,
   if (dcallno != 0) {
     guint dst_circuit_id;
 #ifdef DEBUG_HASHING
-    g_debug("++ dcallno non-zero, looking up destination circuit");
+    ws_debug("++ dcallno non-zero, looking up destination circuit");
 #endif
 
     dst_circuit_id = iax_circuit_lookup(&pinfo->dst, pinfo->ptype,
@@ -1025,9 +1025,9 @@ static iax_call_data *iax_lookup_call( packet_info *pinfo,
 
 #ifdef DEBUG_HASHING
   if (iax_call) {
-    g_debug("++ Found call for packet: id %u, reversed=%c", iax_call->forward_circuit_ids[0], reversed?'1':'0');
+    ws_debug("++ Found call for packet: id %u, reversed=%c", iax_call->forward_circuit_ids[0], reversed?'1':'0');
   } else {
-    g_debug("++ Call not found. Must have missed the NEW packet?");
+    ws_debug("++ Call not found. Must have missed the NEW packet?");
   }
 #endif
 
@@ -1053,7 +1053,7 @@ static iax_call_data *iax_new_call( packet_info *pinfo,
   static const nstime_t  millisecond = NSTIME_INIT_SECS_MSECS(0, 1);
 
 #ifdef DEBUG_HASHING
-  g_debug("+ new_circuit: Handling NEW packet, frame %u", pinfo->num);
+  ws_debug("+ new_circuit: Handling NEW packet, frame %u", pinfo->num);
 #endif
 
   circuit_id = iax_circuit_lookup(&pinfo->src, pinfo->ptype,
@@ -2295,7 +2295,7 @@ static void process_iax_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
   iax_call_data *iax_call = iax_packet -> call_data;
 
 #ifdef DEBUG_DESEGMENT
-  g_debug("calling process_iax_pdu; len = %u", tvb_reported_length(tvb));
+  ws_debug("calling process_iax_pdu; len = %u", tvb_reported_length(tvb));
 #endif
 
   if (!video && iax_call && iax_call->subdissector) {
@@ -2321,7 +2321,7 @@ static void process_iax_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
   }
 
 #ifdef DEBUG_DESEGMENT
-  g_debug("called process_iax_pdu; pinfo->desegment_len=%u; pinfo->desegment_offset=%u",
+  ws_debug("called process_iax_pdu; pinfo->desegment_len=%u; pinfo->desegment_offset=%u",
             pinfo->desegment_len, pinfo->desegment_offset);
 #endif
 }
@@ -2344,7 +2344,7 @@ static void desegment_iax(tvbuff_t *tvb, packet_info *pinfo, proto_tree *iax2_tr
   pinfo->desegment_len    = 0;
 
 #ifdef DEBUG_DESEGMENT
-  g_debug("dissecting packet %u", pinfo->num);
+  ws_debug("dissecting packet %u", pinfo->num);
 #endif
 
   dirdata = &(iax_call->dirdata[!!(iax_packet->reversed)]);
@@ -2358,7 +2358,7 @@ static void desegment_iax(tvbuff_t *tvb, packet_info *pinfo, proto_tree *iax2_tr
     gboolean complete;
 
 #ifdef DEBUG_DESEGMENT
-    g_debug("visited: %i; c_f_b: %u; hash: %u->%u", pinfo->fd->visited?1:0,
+    ws_debug("visited: %i; c_f_b: %u; hash: %u->%u", pinfo->fd->visited?1:0,
             dirdata->current_frag_bytes, pinfo->num, dirdata->current_frag_id);
 #endif
 
@@ -2372,7 +2372,7 @@ static void desegment_iax(tvbuff_t *tvb, packet_info *pinfo, proto_tree *iax2_tr
       dirdata->current_frag_bytes += frag_len;
       complete                     = dirdata->current_frag_bytes > tot_len;
 #ifdef DEBUG_DESEGMENT
-      g_debug("hash: %u->%u; frag_offset: %u; c_f_b: %u; totlen: %u",
+      ws_debug("hash: %u->%u; frag_offset: %u; c_f_b: %u; totlen: %u",
               pinfo->num, fid, frag_offset, dirdata->current_frag_bytes, tot_len);
 #endif
     } else {
@@ -2474,7 +2474,7 @@ static void desegment_iax(tvbuff_t *tvb, packet_info *pinfo, proto_tree *iax2_tr
                            tvb, deseg_offset, pinfo, fid, NULL,
                            0, frag_len, TRUE);
 #ifdef DEBUG_DESEGMENT
-    g_debug("Start offset of undissected bytes: %u; "
+    ws_debug("Start offset of undissected bytes: %u; "
             "Bytes remaining in this segment: %u; min required bytes: %u\n",
             deseg_offset, frag_len, frag_len + pinfo->desegment_len);
 #endif