[Cherokee-commits] rev 1444 - in cherokee/trunk

[cherokee at cherokee-project.com]

Author: alo
Date: 2008-05-20 19:24:24 +0200 (Tue, 20 May 2008)
New Revision: 1444
Log:

Get the changeset with:
  svn diff -r 1443:1444 svn://svn.cherokee-project.com/

Modified:
  cherokee/trunk/ChangeLog
    3 +++
  cherokee/trunk/cherokee/rule_default.c
    8 ++++++++
  cherokee/trunk/cherokee/rule_directory.c
    9 +++++++++
  cherokee/trunk/cherokee/rule_extensions.c
   11 +++++++++++
  cherokee/trunk/cherokee/rule_header.c
   10 ++++++++++
  cherokee/trunk/cherokee/rule_request.c
   11 +++++++++++

Modified: cherokee/trunk/ChangeLog
===================================================================
--- cherokee/trunk/ChangeLog	2008-05-20 14:55:10 UTC (rev 1443)
+++ cherokee/trunk/ChangeLog	2008-05-20 17:24:24 UTC (rev 1444)
@@ -1,5 +1,8 @@
 2008-05-20  Alvaro Lopez Ortega  <alvaro at alobbs.com>
 
+	* rule_header.c, rule_directory.c, rule_default.c, rule_request.c,
+	rule_extensions.c: Implements the ->free() methods.
+
 	* cherokee/virtual_server.c (init_entry_property): Removed duped
 	configuration entry.
 

Modified: cherokee/trunk/cherokee/rule_default.c
===================================================================
--- cherokee/trunk/cherokee/rule_default.c	2008-05-20 14:55:10 UTC (rev 1443)
+++ cherokee/trunk/cherokee/rule_default.c	2008-05-20 17:24:24 UTC (rev 1444)
@@ -59,6 +59,13 @@
 	return ret_ok;
 }
 
+static ret_t
+_free (void *p)
+{
+	UNUSED(p);
+	return ret_ok;
+}
+
 ret_t
 cherokee_rule_default_new (cherokee_rule_t **rule)
 {
@@ -72,6 +79,7 @@
 	 */
 	RULE(n)->match     = (rule_func_match_t) match;
 	RULE(n)->configure = (rule_func_configure_t) configure;
+	MODULE(n)->free    = (module_func_free_t) _free;
 
 	*rule = n;
 	return ret_ok;

Modified: cherokee/trunk/cherokee/rule_directory.c
===================================================================
--- cherokee/trunk/cherokee/rule_directory.c	2008-05-20 14:55:10 UTC (rev 1443)
+++ cherokee/trunk/cherokee/rule_directory.c	2008-05-20 17:24:24 UTC (rev 1444)
@@ -109,7 +109,15 @@
 	return ret_ok;
 }
 
+static ret_t
+_free (void *p)
+{
+	cherokee_rule_directory_t *rule = RULE_DIRECTORY(p);
 
+	cherokee_buffer_mrproper (&rule->directory);
+	return ret_ok;
+}
+
 ret_t
 cherokee_rule_directory_new (cherokee_rule_directory_t **rule)
 {
@@ -123,6 +131,7 @@
 	 */
 	RULE(n)->match     = (rule_func_match_t) match;
 	RULE(n)->configure = (rule_func_configure_t) configure;
+	MODULE(n)->free    = (module_func_free_t) _free;
 
 	/* Properties
 	 */

Modified: cherokee/trunk/cherokee/rule_extensions.c
===================================================================
--- cherokee/trunk/cherokee/rule_extensions.c	2008-05-20 14:55:10 UTC (rev 1443)
+++ cherokee/trunk/cherokee/rule_extensions.c	2008-05-20 17:24:24 UTC (rev 1444)
@@ -94,6 +94,16 @@
 	return parse_value (tmp, &rule->extensions);
 }
 
+static ret_t
+_free (void *p)
+{
+	cherokee_rule_extensions_t *rule = RULE_EXTENSIONS(p);
+
+	cherokee_avl_free (&rule->extensions, NULL);
+	return ret_ok;
+}
+
+
 ret_t
 cherokee_rule_extensions_new (cherokee_rule_extensions_t **rule)
 {
@@ -107,6 +117,7 @@
 	 */
 	RULE(n)->match     = (rule_func_match_t) match;
 	RULE(n)->configure = (rule_func_configure_t) configure;
+	MODULE(n)->free    = (module_func_free_t) _free;
 
 	/* Properties
 	 */

Modified: cherokee/trunk/cherokee/rule_header.c
===================================================================
--- cherokee/trunk/cherokee/rule_header.c	2008-05-20 14:55:10 UTC (rev 1443)
+++ cherokee/trunk/cherokee/rule_header.c	2008-05-20 17:24:24 UTC (rev 1444)
@@ -142,7 +142,16 @@
 	return ret_ok;
 }
 
+static ret_t
+_free (void *p)
+{
+	cherokee_rule_header_t *rule = RULE_HEADER(p);
 
+	cherokee_buffer_mrproper (&rule->match);
+	return ret_ok;
+}
+
+
 ret_t
 cherokee_rule_header_new (cherokee_rule_header_t **rule)
 {
@@ -156,6 +165,7 @@
 	 */
 	RULE(n)->match     = (rule_func_match_t) match;
 	RULE(n)->configure = (rule_func_configure_t) configure;
+	MODULE(n)->free    = (module_func_free_t) _free;
 
 	/* Properties
 	 */

Modified: cherokee/trunk/cherokee/rule_request.c
===================================================================
--- cherokee/trunk/cherokee/rule_request.c	2008-05-20 14:55:10 UTC (rev 1443)
+++ cherokee/trunk/cherokee/rule_request.c	2008-05-20 17:24:24 UTC (rev 1444)
@@ -130,6 +130,16 @@
 }
 
 
+static ret_t
+_free (void *p)
+{
+	cherokee_rule_request_t *rule = RULE_REQUEST(p);
+
+	cherokee_buffer_mrproper (&rule->pattern);
+	return ret_ok;
+}
+
+
 ret_t
 cherokee_rule_request_new (cherokee_rule_request_t  **rule)
 {
@@ -143,6 +153,7 @@
 	 */
 	RULE(n)->match     = (rule_func_match_t) match;
 	RULE(n)->configure = (rule_func_configure_t) configure;
+	MODULE(n)->free    = (module_func_free_t) _free;
 
 	/* Properties
 	 */