OSDN Git Service

*** empty log message ***
authorkonn <konn@1a406e8e-add9-4483-a2c8-d8cac5b7c224>
Sat, 8 Jul 2006 14:41:59 +0000 (14:41 +0000)
committerkonn <konn@1a406e8e-add9-4483-a2c8-d8cac5b7c224>
Sat, 8 Jul 2006 14:41:59 +0000 (14:41 +0000)
git-svn-id: svn+ssh://svn.sourceforge.jp/svnroot/modchxj/mod_chxj/trunk@1723 1a406e8e-add9-4483-a2c8-d8cac5b7c224

include/chxj_tag_util.h
include/qs_malloc.h
include/qs_parse_string.h
src/chxj_img_conv_format.c
src/chxj_jhtml.c
src/chxj_qr_code.c

index 8ca9777..2b1fbe7 100644 (file)
@@ -73,8 +73,8 @@ extern char* qs_get_selected_value_text(
   request_rec* r);
 
 extern char* qs_get_selected_value(
-  Doc*  doc, 
-  Node* node,
+  Doc*         doc, 
+  Node*        node,
   request_rec* r);
 
 extern char* qs_alloc_zero_byte_string(request_rec* r);
index e74032a..92404b8 100644 (file)
@@ -18,6 +18,6 @@
 #define __QS_MALLOC_H__
 #include "qs_parse_string.h"
 
-void qs_init_malloc(Doc* doc);
-void qs_all_free(Doc* doc, const char* fname, int line);
+extern void qs_init_malloc(Doc* doc);
+extern void qs_all_free(Doc* doc, const char* fname, int line);
 #endif
index 79f31dc..53be26c 100644 (file)
@@ -174,7 +174,8 @@ extern void qs_free_node(
   Doc* doc,
   Node*);
 
-Node* qs_get_root(Doc* doc) ;
+extern Node* qs_get_root(
+  Doc* doc) ;
 Node* qs_parse_string(Doc* doc, const char* ss, int len);
 char* qs_get_node_value(Doc* doc,Node* node);
 char* qs_get_node_name(Doc* doc, Node* node) ;
index c93ae31..79e20c3 100644 (file)
@@ -211,12 +211,11 @@ static char* s_create_blob_data(request_rec*          r,
                                 char*                 indata,
                                 apr_size_t*           len);
 
-static int s_img_conv_format_from_file(
-                request_rec*          r, 
-                mod_chxj_config*      conf, 
-                const char*           user_agent,
-                query_string_param_t* qsp,
-                device_table*         spec);
+static int s_img_conv_format_from_file(request_rec*          r, 
+                                       mod_chxj_config*      conf, 
+                                       const char*           user_agent,
+                                       query_string_param_t* qsp,
+                                       device_table*         spec);
 
 
 
index a3b1833..6079a44 100644 (file)
@@ -2305,9 +2305,13 @@ s_jhtml_start_div_tag(void* pdoc, Node* child)
 static char*
 s_jhtml_end_div_tag(void* pdoc, Node* child)
 {
-  jhtml_t*     jhtml = GET_JHTML(pdoc);
-  Doc*         doc   = jhtml->doc;
-  request_rec* r     = doc->r;
+  jhtml_t*     jhtml;
+  Doc*         doc;
+  request_rec* r;
+
+  jhtml = GET_JHTML(pdoc);
+  doc   = jhtml->doc;
+  r     = doc->r;
 
   jhtml->out = apr_pstrcat(r->pool, jhtml->out, "</div>\n", NULL);
 
index e5f6593..98d1190 100644 (file)
@@ -1078,8 +1078,7 @@ chxj_qrcode_node_to_qrcode(qr_code_t* qrcode, Node* node)
         continue;
       }
 
-      if (strcasecmp("L", value) == 0)
-      {
+      if (strcasecmp("L", value) == 0) {
         qrcode->level = QR_LEVEL_L;
       }
       else