* Changed DEBUG Log.

[modchxj/mod_chxj.git] / src / chxj_chtml40.c

diff --git a/src/chxj_chtml40.c b/src/chxj_chtml40.c
index 937e387..03aab33 100644 (file)
--- a/src/chxj_chtml40.c
+++ b/src/chxj_chtml40.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2009 Atsushi Konno All rights reserved.
+ * Copyright (C) 2005-2011 Atsushi Konno All rights reserved.
  * Copyright (C) 2005 QSDN,Inc. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -472,7 +472,7 @@ chxj_convert_chtml40(
   chtml40_t chtml40;
   Doc       doc;
 
-  DBG(r, "start chxj_convert_chtml40()");
+  DBG(r,"REQ[%X] start %s()",TO_ADDR(r),__func__);
 
   /*--------------------------------------------------------------------------*/
   /* If qrcode xml                                                            */
@@ -480,11 +480,10 @@ chxj_convert_chtml40(
   *dstlen = srclen;
   dst = chxj_qr_code_blob_handler(r, src, (size_t*)dstlen);
   if (dst) {
-    DBG(r,"i found qrcode xml");
-    DBG(r, "end chxj_convert_chtml40()");
+    DBG(r,"REQ[%X] found qrcode xml",TO_ADDR(r));
+    DBG(r,"REQ[%X] end %s()",TO_ADDR(r),__func__);
     return dst;
   }
-  DBG(r,"not found qrcode xml");
 
   /*--------------------------------------------------------------------------*/
   /* The CHTML structure is initialized.                                      */
@@ -541,7 +540,7 @@ chxj_convert_chtml40(
   chxj_dump_out("[src] CHTML -> CHTML4.0", dst, *dstlen);
 #endif
 
-  DBG(r, "end chxj_convert_chtml40()");
+  DBG(r,"REQ[%X] end %s()",TO_ADDR(r),__func__);
   return dst;
 }
 
@@ -597,7 +596,7 @@ s_chtml40_search_emoji(chtml40_t *chtml40, char *txt, char **rslt, Node *node)
   r   = chtml40->doc->r;
 
   if (!spec) {
-    DBG(r,"spec is NULL");
+    DBG(r,"REQ[%X] spec is NULL",TO_ADDR(r));
   }
 
   for (ee = chtml40->conf->emoji;
@@ -657,7 +656,7 @@ chxj_chtml40_emoji_only_converter(request_rec *r, device_table *spec, const char
   chtml40 = &__chtml40;
   doc     = &__doc;
 
-  DBG(r, "REQ[%X] start chxj_chtml40_emoji_eonly_converter()", (unsigned int)(apr_size_t)r);
+  DBG(r,"REQ[%X] start %s()",TO_ADDR(r),__func__);
   memset(doc,     0, sizeof(Doc));
   memset(chtml40, 0, sizeof(chtml40_t));
 
@@ -698,7 +697,7 @@ chxj_chtml40_emoji_only_converter(request_rec *r, device_table *spec, const char
   }
   chtml40->out = chxj_buffered_write_flush(chtml40->out, &doc->buf);
 
-  DBG(r, "REQ[%X] end chxj_chtml40_emoji_eonly_converter()", (unsigned int)(apr_size_t)r);
+  DBG(r,"REQ[%X] end %s()",TO_ADDR(r),__func__);
   return chtml40->out;
 }
 
@@ -4836,9 +4835,9 @@ s_chtml40_link_tag(void *pdoc, Node *node)
   }
 
   if (rel && href && type) {
-    DBG(doc->r, "start load CSS. url:[%s]", href);
+    DBG(doc->r, "REQ[%X] start load CSS. url:[%s]", TO_ADDR(doc->r),href);
     chtml40->style = chxj_css_parse_from_uri(doc->r, doc->pool, chtml40->style, href);
-    DBG(doc->r, "end load CSS. url:[%s]", href);
+    DBG(doc->r, "REQ[%X] end load CSS. url:[%s]", TO_ADDR(doc->r),href);
   }
 
   return chtml40->out;
@@ -5128,9 +5127,9 @@ s_chtml40_style_tag(void *pdoc, Node *node)
     char *name  = qs_get_node_name(doc, child);
     if (STRCASEEQ('t','T',"text", name)) {
       char *value = qs_get_node_value(doc, child);
-      DBG(doc->r, "start load CSS. buf:[%s]", value);
+      DBG(doc->r, "REQ[%X] start load CSS. buf:[%s]", TO_ADDR(doc->r),value);
       chtml40->style = chxj_css_parse_style_value(doc, chtml40->style, value);
-      DBG(doc->r, "end load CSS. value:[%s]", value);
+      DBG(doc->r, "REQ[%X] end load CSS. value:[%s]", TO_ADDR(doc->r),value);
     }
   }
   return chtml40->out;