Merge branch 'master' into branch_0.13.0

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

diff --git a/src/chxj_load_emoji_data.c b/src/chxj_load_emoji_data.c
index 15fac24..d44fa37 100644 (file)
--- a/src/chxj_load_emoji_data.c
+++ b/src/chxj_load_emoji_data.c
@@ -1,6 +1,6 @@
 /*
+ * Copyright (C) 2005-2009 Atsushi Konno All rights reserved.
  * Copyright (C) 2005 QSDN,Inc. All rights reserved.
- * Copyright (C) 2005 Atsushi Konno All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,14 +18,40 @@
 #include "mod_chxj.h"
 #include "chxj_load_emoji_data.h"
 
-static char* s_load_emoji_set_tag( Doc* doc, apr_pool_t* p, mod_chxj_config* conf, Node* node);
-static char* s_set_emoji_data( Doc* doc, apr_pool_t* p, mod_chxj_config* conf, Node* node);
-static char* s_load_emoji_emoji_tag( Doc* doc, apr_pool_t* p, mod_chxj_config* conf, Node* node);
-static void  s_emoji_add_to_tail( mod_chxj_config* conf, emoji_t* emoji);
-static char* s_load_emoji_no_tag( Doc* doc, apr_pool_t* p, emoji_t* em, Node* node);
+static char* s_load_emoji_set_tag(
+  Doc*             doc,
+  apr_pool_t*      p,
+  mod_chxj_config* conf,
+  Node*            node);
+
+static char* s_set_emoji_data(
+  Doc*             doc,
+  apr_pool_t*      p,
+  mod_chxj_config* conf,
+  Node*            node);
+
+static char* s_load_emoji_emoji_tag(
+  Doc*             doc,
+  apr_pool_t*      p,
+  mod_chxj_config* conf,
+  Node*            node);
+
+static void  s_emoji_add_to_tail(
+  mod_chxj_config* conf,
+  emoji_t*         emoji);
+
+static char* s_load_emoji_no_tag(
+  Doc*        doc,
+  apr_pool_t* p,
+  emoji_t*    em,
+  Node*       node);
+
 static char* s_load_emoji_imode_tag( Doc* doc, apr_pool_t* p, emoji_t* em, Node* node);
+
 static char* s_load_emoji_ezweb_tag( Doc* doc, apr_pool_t* p, emoji_t* em, Node* node);
+
 static char* s_load_emoji_jphone_tag( Doc* doc, apr_pool_t* p, emoji_t* em, Node* node);
+
 static char  s_hexstring_to_byte(char* s);
 
 
@@ -43,7 +69,7 @@ chxj_load_emoji_data(
   conf->emoji      = NULL;
   conf->emoji_tail = NULL;
 
-  if (rtn = s_set_emoji_data(doc, p, conf,qs_get_root(doc))
+  if ((rtn = s_set_emoji_data(doc, p, conf,qs_get_root(doc))) != NULL)
     return rtn;
 
   return NULL;
@@ -93,7 +119,7 @@ s_load_emoji_emoji_tag(
     char* name = qs_get_node_name(doc, child);
 
     if ((*name == 's' || *name == 'S') && strcasecmp(name, "set") == 0) {
-      if (rtn = s_load_emoji_set_tag(doc, p, conf, child)) 
+      if ((rtn = s_load_emoji_set_tag(doc, p, conf, child)) != NULL) 
         return rtn;
     }
   }
@@ -128,7 +154,7 @@ s_load_emoji_set_tag(
     case 'n':
     case 'N':
       if (strcasecmp(name, "no") == 0) {
-        if (rtn = s_load_emoji_no_tag(doc, p, em, child)) 
+        if ((rtn = s_load_emoji_no_tag(doc, p, em, child)) != NULL)
           return rtn;
       }
       break;
@@ -136,7 +162,7 @@ s_load_emoji_set_tag(
     case 'i':
     case 'I':
       if (strcasecmp(name, "imode") == 0) {
-        if (rtn = s_load_emoji_imode_tag(doc, p, em, child)) 
+        if ((rtn = s_load_emoji_imode_tag(doc, p, em, child)) != NULL)
           return rtn;
       }
       break;
@@ -144,7 +170,7 @@ s_load_emoji_set_tag(
     case 'e':
     case 'E':
       if (strcasecmp(name, "ezweb") == 0) {
-        if (rtn = s_load_emoji_ezweb_tag(doc, p, em, child)) 
+        if ((rtn = s_load_emoji_ezweb_tag(doc, p, em, child)) != NULL)
           return rtn;
       }
       break;
@@ -152,7 +178,7 @@ s_load_emoji_set_tag(
     case 'j':
     case 'J':
       if (strcasecmp(name, "jphone") == 0) {
-        if (rtn = s_load_emoji_jphone_tag(doc, p, em, child))
+        if ((rtn = s_load_emoji_jphone_tag(doc, p, em, child)) != NULL)
           return rtn;
       }
       break;
@@ -424,7 +450,7 @@ s_load_emoji_jphone_tag(
         char* cvalue = qs_get_node_value(doc, stringnode);
 
         if ((*cname == 't' || *cname == 'T') && strcasecmp(cname, "text") == 0) {
-          int   ii;
+          unsigned int   ii;
           int   jj;
           char* tmp;
  
@@ -461,12 +487,15 @@ s_load_emoji_jphone_tag(
   return NULL;
 }
 
+
+
 static void
 s_emoji_add_to_tail(
   mod_chxj_config* conf,
-  emoji_t* emoji)
+  emoji_t*         emoji)
 {
   emoji->next = NULL;
+
   if (conf->emoji == NULL) {
     conf->emoji      = emoji;
     conf->emoji_tail = emoji;
@@ -474,21 +503,22 @@ s_emoji_add_to_tail(
   }
 
   conf->emoji_tail->next = emoji;
-  conf->emoji_tail = emoji;
+  conf->emoji_tail       = emoji;
 }
 
+
+
 static char 
 s_hexstring_to_byte(char* s)
 {
-  int len;
-  int ii;
+  int  len;
+  int  ii;
   char one_byte = 0;
 
   len = strlen(s);
-  for (ii=0; ii<len; ii++)
-  {
-    switch(s[ii]) 
-    {
+
+  for (ii=0; ii<len; ii++) {
+    switch(s[ii]) {
     case '1':
     case '2':
     case '3':
@@ -529,6 +559,7 @@ s_hexstring_to_byte(char* s)
       break;
     }
   }
+
   return one_byte;
 }
 /*