OSDN Git Service

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

17 files changed:
include/chxj_apply_convrule.h
include/chxj_calc_ecc.h
include/chxj_chtml20.h
include/chxj_chtml30.h
include/chxj_cookie.h
include/chxj_dump.h
include/chxj_encoding.h
include/chxj_hdml.h
include/chxj_img_conv.h
include/chxj_img_conv_format.h
include/chxj_load_device_data.h
include/chxj_xhtml_mobile_1_0.h
src/chxj_chtml30.c
src/chxj_cookie.c
src/chxj_encoding.c
src/chxj_hdml.c
src/chxj_jhtml.c

index b1eba7b..22f14fb 100644 (file)
@@ -20,7 +20,8 @@
 #include "mod_chxj.h"
 
 extern chxjconvrule_entry* 
-chxj_apply_convrule(request_rec *r, apr_array_header_t *convrules);
+chxj_apply_convrule(
+  request_rec *r, apr_array_header_t *convrules);
 
 #endif
 /*
index 28f89b5..93f527c 100644 (file)
@@ -18,7 +18,8 @@
 #define __CHXJ_CALC_ECC_H__
 #include "chxj_qr_code.h"
 
-extern int chxj_calc_ecc(qr_code_t* qrcode,
+extern int 
+chxj_calc_ecc(qr_code_t* qrcode,
               unsigned char* indata, 
               unsigned char* dst);
 #endif
index 0f31de3..96af551 100644 (file)
@@ -45,7 +45,7 @@ struct ctml20_t {
 extern char*
 chxj_exchange_chtml20(
   request_rec* r,
-  device_table* spec,
+  device_table*       spec,
   const char*         src,
   apr_size_t          srclen,
   apr_size_t*         dstlen,
index 6aa6d1b..770fa2d 100644 (file)
@@ -45,7 +45,7 @@ struct chtml30_t {
 extern char*
 chxj_exchange_chtml30(
   request_rec*    r,
-  device_table*   spec,
+  device_table*       spec,
   const char*         src,
   apr_size_t          srclen,
   apr_size_t*         dstlen,
index faadd0e..93ddfa3 100644 (file)
@@ -34,7 +34,7 @@ struct cookie_t {
 
 extern cookie_t* chxj_save_cookie(request_rec *r);
 extern char*     chxj_add_cookie_parameter(request_rec* r, char* value, cookie_t* cookie);
-extern int chxj_cookie_check_host(request_rec* r, char* value);
+extern int       chxj_cookie_check_host(request_rec* r, char* value);
 extern cookie_t* chxj_load_cookie(request_rec* r, char* cookie_id);
 extern apr_file_t* chxj_cookie_db_lock(request_rec* r);
 extern void chxj_cookie_db_unlock(request_rec* r, apr_file_t* file);
index 6e0dbfc..4197b08 100644 (file)
@@ -16,5 +16,8 @@
  */
 #ifndef __CHXJ_DUMP_H__
 #define __CHXJ_DUMP_H__
-extern void chxj_dump_out(const char* title, const char* s, int slen);
+
+extern void 
+chxj_dump_out(const char* title, const char* s, int slen);
+
 #endif
index 729dc0a..55a1e6e 100644 (file)
@@ -25,7 +25,8 @@
 /* Prototype                                                                  */
 /*----------------------------------------------------------------------------*/
 extern char* 
-chxj_encoding(request_rec *r, const char* src, apr_size_t* len);
+chxj_encoding(
+  request_rec *r, const char* src, apr_size_t* len);
 extern char* chxj_rencoding(request_rec *r, const char* src, apr_size_t* len);
 extern char* chxj_encoding_parameter(request_rec* r, const char* value);
 #endif
index 4fc0af5..17d0d0b 100644 (file)
@@ -110,7 +110,8 @@ extern char* chxj_exchange_hdml(
   chxjconvrule_entry* entryp,
   cookie_t*           cookie);
 
-extern char* qs_out_apr_pstrcat(request_rec* r, char* o, char* s, int* len);
+extern char* 
+qs_out_apr_pstrcat(request_rec* r, char* o, char* s, int* len);
 extern char* qs_conv_istyle_to_format(request_rec* r, char* is);
 
 #endif
index 8334424..c9efb3d 100644 (file)
@@ -18,5 +18,6 @@
 #define __CHXJ_IMG_CONV_H__
 #include "mod_chxj.h"
 
-extern char* chxj_img_conv(request_rec* r, device_table* spec, const char* s);
+extern char* 
+chxj_img_conv(request_rec* r, device_table* spec, const char* s);
 #endif
index 714a2df..6bed40c 100644 (file)
@@ -21,7 +21,8 @@
 #define DEFAULT_IMAGE_CACHE_DIR "/tmp"
 
 
-extern int chxj_img_conv_format_handler(request_rec* r);
+extern int 
+chxj_img_conv_format_handler(request_rec* r);
 char* chxj_exchange_image(request_rec *r, const char** src, apr_size_t* len);
 int chxj_trans_name(request_rec *r);
 
index e19e555..617d34c 100644 (file)
@@ -18,6 +18,6 @@
 #define __LOAD_DEVICE_DATA_H__
 #include "mod_chxj.h"
 
-void chxj_load_device_data(Doc* doc, apr_pool_t *p, mod_chxj_config* conf);
+extern void chxj_load_device_data(Doc* doc, apr_pool_t *p, mod_chxj_config* conf);
 
 #endif
index c35ca35..89e8d44 100644 (file)
@@ -28,7 +28,7 @@ struct xhtml_t {
     char*              out;
     int                out_len;
     int                pre_flag;
-    int                textarea_flag;
+    int                 textarea_flag;
 
     device_table*       spec;
     mod_chxj_config*    conf;
index c217089..7ad7b7b 100644 (file)
@@ -791,6 +791,7 @@ s_chtml30_start_base_tag(void* pdoc, Node* node)
   for (attr = qs_get_attr(doc,node);
        attr;
        attr = qs_get_next_attr(doc,attr)) {
+
     char* name = qs_get_attr_name(doc,attr);
     char* value = qs_get_attr_value(doc,attr);
     if (strcasecmp(name, "href") == 0) {
index e5b083a..8ecfc2a 100644 (file)
@@ -240,7 +240,7 @@ chxj_load_cookie(request_rec* r, char* cookie_id)
   char*                   pstat;
   char*                   key;
   char*                   val;
-  char*               pair;
+  char*                   pair;
 
 
 
index 7742da1..4a1491b 100644 (file)
@@ -29,6 +29,7 @@
 #  endif
 #endif
 
+
 char*
 chxj_encoding(request_rec *r, const char* src, apr_size_t* len)
 {
index fc254a7..2c1b186 100644 (file)
@@ -494,7 +494,7 @@ s_hdml_search_emoji(hdml_t* hdml, char* txt, char** rslt)
   emoji_t*      ee;
   request_rec*  r;
   device_table* spec;
-  int len;
+  int           len;
 
   spec = hdml->spec;
 
index c3c527b..62c4ef6 100644 (file)
@@ -882,7 +882,7 @@ s_jhtml_start_body_tag(void* pdoc, Node* node)
       jhtml->out = apr_pstrcat(r->pool, 
                                jhtml->out, 
                                " bgcolor=\"", 
-                      value, 
+                               value, 
                       "\"", 
                       NULL);
     }