* Writing is changed.

git-svn-id: svn+ssh://svn.sourceforge.jp/svnroot/modchxj/mod_chxj/trunk@959 1a406e8e-add9-4483-a2c8-d8cac5b7c224

diff --git a/include/chxj_specified_device.h b/include/chxj_specified_device.h
index 43573d9..50c97cd 100644 (file)
--- a/include/chxj_specified_device.h
+++ b/include/chxj_specified_device.h
@@ -82,13 +82,13 @@ typedef struct _device_table_t {
 
 } device_table;
 
-typedef struct device_table_list_t {
-  struct device_table_list_t* next;
+typedef struct _device_table_list_t {
+  struct _device_table_list_t* next;
   char* pattern;
   ap_regex_t* regexp;
   device_table* table;
   device_table* tail;
-} device_table_list_t;
+} device_table_list;
 
 device_table* chxj_specified_device(request_rec* r, const char* user_agent);
 

diff --git a/src/chxj_load_device_data.c b/src/chxj_load_device_data.c
index 5aedd07..8e8a9ba 100644 (file)
--- a/src/chxj_load_device_data.c
+++ b/src/chxj_load_device_data.c
@@ -28,7 +28,7 @@
 
 static void s_set_devices_data(Doc* doc, apr_pool_t* p, mod_chxj_config* conf, Node* node) ;
 static void s_set_user_agent_data(Doc* doc, apr_pool_t* p, mod_chxj_config* conf, Node* node) ;
-static void s_set_device_data(Doc* doc, apr_pool_t* p, device_table_list_t* dtl, Node* node) ;
+static void s_set_device_data(Doc* doc, apr_pool_t* p, device_table_list* dtl, Node* node) ;
 /**
  * load device_data.xml
  */
@@ -66,7 +66,7 @@ static void
 s_set_user_agent_data(Doc* doc, apr_pool_t* p, mod_chxj_config* conf, Node* node) 
 {
   Node* child;
-  device_table_list_t* t;
+  device_table_list* t;
 
   for (child = qs_get_child_node(doc,node);
        child ;
@@ -75,10 +75,10 @@ s_set_user_agent_data(Doc* doc, apr_pool_t* p, mod_chxj_config* conf, Node* node
 
     if ((*name == 'u' || *name == 'U') && strcasecmp(name, "user_agent") == 0 ) {
       Attr* attr;
-      device_table_list_t* dtl;
+      device_table_list* dtl;
 
       if (! conf->devices) {
-        conf->devices = apr_pcalloc(p, sizeof(device_table_list_t));
+        conf->devices = apr_pcalloc(p, sizeof(device_table_list));
         conf->devices->next    = NULL;
         conf->devices->pattern = NULL;
         conf->devices->table   = NULL;
@@ -90,7 +90,7 @@ s_set_user_agent_data(Doc* doc, apr_pool_t* p, mod_chxj_config* conf, Node* node
           if (! t->next)
             break;
         }
-        t->next = apr_pcalloc(p, sizeof(device_table_list_t));
+        t->next = apr_pcalloc(p, sizeof(device_table_list));
         t->next->next    = NULL;
         t->next->pattern = NULL;
         t->next->table   = NULL;
@@ -115,7 +115,7 @@ s_set_user_agent_data(Doc* doc, apr_pool_t* p, mod_chxj_config* conf, Node* node
 }
 
 static void
-s_set_device_data(Doc* doc, apr_pool_t* p, device_table_list_t* dtl, Node* node) 
+s_set_device_data(Doc* doc, apr_pool_t* p, device_table_list* dtl, Node* node) 
 {
   Node* child;
   device_table* dt;

diff --git a/src/chxj_specified_device.c b/src/chxj_specified_device.c
index f0573d0..8bce12e 100644 (file)
--- a/src/chxj_specified_device.c
+++ b/src/chxj_specified_device.c
@@ -30,7 +30,7 @@ chxj_specified_device(request_rec* r, const char* user_agent)
 {
   ap_regmatch_t        match[10];
   device_table*        returnType = &UNKNOWN_DEVICE;
-  device_table_list_t* dtl;
+  device_table_list*   dtl;
   device_table*        dt;
   mod_chxj_config*     conf; 
   char*                device_id;