OSDN Git Service

* change writting.
authorkonn <konn@1a406e8e-add9-4483-a2c8-d8cac5b7c224>
Mon, 3 Jul 2006 17:44:43 +0000 (17:44 +0000)
committerkonn <konn@1a406e8e-add9-4483-a2c8-d8cac5b7c224>
Mon, 3 Jul 2006 17:44:43 +0000 (17:44 +0000)
git-svn-id: svn+ssh://svn.sourceforge.jp/svnroot/modchxj/mod_chxj/trunk@1673 1a406e8e-add9-4483-a2c8-d8cac5b7c224

include/chxj_qr_code.h
include/chxj_specified_device.h
include/chxj_tag_util.h
src/chxj_chtml30.c
src/chxj_hdml.c
src/chxj_img_conv_format.c
src/chxj_jhtml.c
src/chxj_load_device_data.c
src/chxj_qr_code.c

index d3e4846..366e650 100644 (file)
@@ -126,7 +126,8 @@ chxj_qrcode_create_image_data(
   char**     img, 
   size_t*    img_len);
 
-extern void    chxj_qrcode_node_to_qrcode      (qr_code_t* qrcode, Node* root);
+extern void    
+chxj_qrcode_node_to_qrcode      (qr_code_t* qrcode, Node* root);
 extern char*   chxj_qr_code_blob_handler       (request_rec* r, const char* indata, size_t* len);
 
 #endif
index 3329a50..25fa6bd 100644 (file)
@@ -68,7 +68,7 @@ struct device_table_t {
   /*--------------------------------------------------------------------------*/
   /* Resolution                                                               */
   /*--------------------------------------------------------------------------*/
-  int dpi_width;
+  int                    dpi_width;
   int dpi_heigh;
   /*--------------------------------------------------------------------------*/
   /* Color number type                                                        */
index 70d90bf..c2cc170 100644 (file)
@@ -39,9 +39,10 @@ extern char*    qs_get_selected_value(Doc* doc, Node* node, request_rec* r);
 extern char*    qs_alloc_zero_byte_string(request_rec* r);
 extern char*    qs_trim_string(request_rec* r, char* s);
 
-extern int chxj_chxjif_is_mine(device_table* spec, Doc* doc, Node* tag);
-extern char* qs_get_destlang_attr(Doc* doc, Node* tag, request_rec* r);
-extern char* qs_get_parse_attr(Doc* doc, Node* tag, request_rec* r);
+extern int      chxj_chxjif_is_mine(device_table* spec, Doc* doc, Node* tag);
+extern char*    qs_get_destlang_attr(Doc* doc, Node* tag, request_rec* r);
+extern char*    qs_get_parse_attr(Doc* doc, Node* tag, request_rec* r);
+
 #endif
 /*
  * vim:ts=2 et
index 08a1d17..d09f696 100644 (file)
@@ -1258,7 +1258,7 @@ s_chtml30_start_font_tag(void* pdoc, Node* node)
 
     if (strcasecmp(name, "color") == 0) {
       chtml30->out = apr_pstrcat(r->pool, 
-                      chtml30->out, 
+                                 chtml30->out, 
                       " color=\"", 
                       value, 
                       "\"", 
index e46ce30..24ee643 100644 (file)
@@ -1517,7 +1517,7 @@ s_hdml_do_input_text_tag(hdml_t* hdml, Node* tag)
 
   s_output_to_hdml_card(hdml, 
                         " MARKABLE=FALSE>\n"
-                  "<ACTION TYPE=ACCEPT TASK=RETURN RETVALS=$V>\n"
+                        "<ACTION TYPE=ACCEPT TASK=RETURN RETVALS=$V>\n"
                   "</ENTRY>\n");
 
   if (val) 
index b8af658..b545c30 100644 (file)
@@ -180,7 +180,7 @@ static apr_status_t s_send_cache_file(  device_table*         spec,
 static apr_status_t s_header_only_cache_file(device_table* spec, 
                                              query_string_param_t* query_string, 
                                              request_rec* r, 
-  const char* tmpfile);
+                                             const char* tmpfile);
 static query_string_param_t* s_get_query_string_param(request_rec *r);
 static unsigned short s_add_crc(        const char* writedata, 
                                         apr_size_t witebyte);
index c053074..89180fd 100644 (file)
@@ -1240,11 +1240,15 @@ s_jhtml_end_tr_tag(void* pdoc, Node* child)
 static char*
 s_jhtml_start_font_tag(void* pdoc, Node* node) 
 {
-  jhtml_t*      jhtml = GET_JHTML(pdoc);
-  Doc*          doc   = jhtml->doc;
-  request_rec*  r     = doc->r;
+  jhtml_t*      jhtml;
+  Doc*          doc;
+  request_rec*  r;
   Attr*         attr;
 
+  jhtml = GET_JHTML(pdoc);
+  doc   = jhtml->doc;
+  r     = doc->r;
+
   jhtml->out = apr_pstrcat(r->pool, jhtml->out, "<font", NULL);
 
   /*--------------------------------------------------------------------------*/
index 04b0544..0b84495 100644 (file)
@@ -36,7 +36,8 @@ static void
 s_set_user_agent_data(
   Doc* doc, 
   apr_pool_t* p, 
-  mod_chxj_config* conf, Node* node) ;
+  mod_chxj_config* conf, 
+  Node* node) ;
 static void s_set_device_data(Doc* doc, apr_pool_t* p, device_table_list* dtl, Node* node) ;
 /**
  * load device_data.xml
index 3228a96..4ed9067 100644 (file)
@@ -938,8 +938,8 @@ chxj_qr_code(qr_code_t* qrcode, char* module[])
     s_init_modules(qrcode, ii, module);
     s_map_data(qrcode,  module, (unsigned char*)eccstr, data_total_count, ii);
     lost_point = s_calc_lost_point(qrcode, module);
-    if (min_mask_pattern == -1)
-    {
+
+    if (min_mask_pattern == -1) {
       min_mask_pattern = ii;
       min_lost_point = lost_point;
     }