file_rules_delete function

diff --git a/src/rxpd.h b/src/rxpd.h
index 60dc441..4ccf228 100644 (file)
--- a/src/rxpd.h
+++ b/src/rxpd.h
@@ -144,6 +144,9 @@ rxpd_file_new (struct rxpd_base* base, const char* filename);
 void
 rxpd_file_delete (struct rxpd_file* file);
 
+struct rxpd_file*
+rxpd_file_rules_delete (struct rxpd_file* self);
+
 int
 rxpd_file_load (struct rxpd_file* self);
 

diff --git a/src/rxpd_file.c b/src/rxpd_file.c
index d49644b..d0341b1 100644 (file)
--- a/src/rxpd_file.c
+++ b/src/rxpd_file.c
@@ -58,6 +58,18 @@ rxpd_file_new (struct rxpd_base* base, const char* filename)
 
 void
 rxpd_file_delete (struct rxpd_file* self)
+{
+  if (self)
+    {
+      rxpd_file_rules_delete (self);
+      psplay_remove (&self->base->files, &self->node);
+      free ((void*)self->filename);
+      free (self);
+    }
+}
+
+struct rxpd_file*
+rxpd_file_rules_delete (struct rxpd_file* self)
 {
   if (self)
     {
@@ -66,10 +78,8 @@ rxpd_file_delete (struct rxpd_file* self)
           struct rxpd_rule* node = (struct rxpd_rule*)n;
           rxpd_rule_delete (node);
         }
-      psplay_remove (&self->base->files, &self->node);
-      free ((void*)self->filename);
-      free (self);
     }
+  return self;
 }
 
 int