From 4c64ea645c899ce14661794c979145409a154301 Mon Sep 17 00:00:00 2001
From: konn <konn@1a406e8e-add9-4483-a2c8-d8cac5b7c224>
Date: Sat, 21 Jun 2008 07:20:01 +0000
Subject: [PATCH]   * delete combinator attribute.

git-svn-id: svn+ssh://svn.sourceforge.jp/svnroot/modchxj/mod_chxj/branches/sandbox@2716 1a406e8e-add9-4483-a2c8-d8cac5b7c224
---
 include/chxj_css.h |  1 -
 src/chxj_css.c     | 13 +------------
 2 files changed, 1 insertion(+), 13 deletions(-)

diff --git a/include/chxj_css.h b/include/chxj_css.h
index 59318cff..de812f9e 100644
--- a/include/chxj_css.h
+++ b/include/chxj_css.h
@@ -40,7 +40,6 @@ typedef struct __css_selector_t {
   struct __css_selector_t **ref;
   /* has tag or/and class or/and id */
   char *name;
-  enum Combinator combinator;
   css_property_t property_head;
 } css_selector_t;
 
diff --git a/src/chxj_css.c b/src/chxj_css.c
index fe6f2072..5040d3bf 100644
--- a/src/chxj_css.c
+++ b/src/chxj_css.c
@@ -53,7 +53,6 @@ struct css_already_import_stack {
 struct css_app_data {
   css_stylesheet_t *stylesheet;
   char **selector_list;
-  enum Combinator *combinator_list;
   int selector_count;
   apr_pool_t *pool;
   request_rec *r;
@@ -567,20 +566,12 @@ s_css_parser_from_uri_start_selector(CRDocHandler * a_this, CRSelector *a_select
     app_data->error_occured = 1;
     return;
   }
-  app_data->combinator_list = apr_palloc(app_data->pool, sizeof(enum Combinator) * app_data->selector_count);
-  if (! app_data->selector_list) {
-    ERR(app_data->r, "%s:%d Out of memory", APLOG_MARK);
-    app_data->error_occured = 1;
-    return;
-  }
-
   ii = 0;
   for (cur = a_selector_list; cur; cur = cur->next) {
     if (cur->simple_sel) {
       guchar *tmp_str = cr_simple_sel_to_string(cur->simple_sel);
       if (tmp_str) {
         app_data->selector_list[ii] = apr_pstrdup(app_data->pool, (char *)tmp_str);
-        app_data->combinator_list[ii++] = cur->simple_sel->combinator;
         g_free (tmp_str);
         tmp_str = NULL;
       }
@@ -602,7 +593,6 @@ s_css_parser_from_uri_end_selector(CRDocHandler * a_this, CRSelector *a_selector
   if (app_data->property_head.next)  {
     for (ii=0; ii<app_data->selector_count; ii++) {
       css_selector_t *sel = s_new_selector(app_data->pool, app_data->stylesheet, app_data->selector_list[ii]); 
-      sel->combinator = app_data->combinator_list[ii];
 
       for (cur = app_data->property_head.next; cur && cur != &app_data->property_head; cur = cur->next) {
         css_property_t *tgt = s_css_parser_copy_property(app_data->pool, cur);
@@ -894,7 +884,6 @@ s_merge_stylesheet(apr_pool_t *pool, css_stylesheet_t *old_stylesheet, css_style
       new_selector->property_head.next = &new_selector->property_head;
       new_selector->property_head.ref  = &new_selector->property_head.next;
       new_selector->name = apr_pstrdup(pool, name);
-      new_selector->combinator = cur->combinator;
       for (cur_prop = cur->property_head.next; cur_prop != &cur->property_head; cur_prop = cur_prop->next) {
         css_property_t *target = s_css_parser_copy_property(pool, cur_prop);
         list_insert(target, (&new_selector->property_head));
@@ -932,7 +921,7 @@ chxj_css_stylesheet_dump(css_stylesheet_t *stylesheet)
   css_property_t *cur_prop;
 
   for (cur_sel = stylesheet->selector_head.next; cur_sel != &stylesheet->selector_head; cur_sel = cur_sel->next) {
-    fprintf(stderr, "selector:[%s] combinator:[%d]\n", cur_sel->name, cur_sel->combinator);
+    fprintf(stderr, "selector:[%s]\n", cur_sel->name);
     for (cur_prop = cur_sel->property_head.next; cur_prop != &cur_sel->property_head; cur_prop = cur_prop->next) {
       fprintf(stderr, "\tproperty:\n");
       fprintf(stderr, "\t\t- name:%s\n", cur_prop->name);
-- 
2.11.0