tmpfiles: rename a couple of functions

remove_item -> remove_item_instance
remove_item_glob -> remove_item

diff --git a/src/tmpfiles.c b/src/tmpfiles.c
index 61711401858efea68068adf95ec9d92718140464..4308f7f943ed76e4456399702414e73824f8af63 100644 (file)
--- a/src/tmpfiles.c
+++ b/src/tmpfiles.c
@@ -563,7 +563,7 @@ finish:
         return r;
 }
 
         return r;
 }
 

-static int remove_item(Item *i, const char *instance) {
+static int remove_item_instance(Item *i, const char *instance) {

         int r;
 
         assert(i);
         int r;
 
         assert(i);


@@ -599,7 +599,7 @@ static int remove_item(Item *i, const char *instance) {
         return 0;
 }
 
         return 0;
 }
 

-static int remove_item_glob(Item *i) {
+static int remove_item(Item *i) {

         assert(i);
 
         switch (i->type) {
         assert(i);
 
         switch (i->type) {


@@ -633,7 +633,7 @@ static int remove_item_glob(Item *i) {
                 }
 
                 STRV_FOREACH(fn, g.gl_pathv)
                 }
 
                 STRV_FOREACH(fn, g.gl_pathv)

-                        if ((k = remove_item(i, *fn)) < 0)
+                        if ((k = remove_item_instance(i, *fn)) < 0)

                                 r = k;
 
                 globfree(&g);
                                 r = k;
 
                 globfree(&g);


@@ -650,7 +650,7 @@ static int process_item(Item *i) {
         assert(i);
 
         r = arg_create ? create_item(i) : 0;
         assert(i);
 
         r = arg_create ? create_item(i) : 0;

-        q = arg_remove ? remove_item_glob(i) : 0;
+        q = arg_remove ? remove_item(i) : 0;

         p = arg_clean ? clean_item(i) : 0;
 
         if (r < 0)
         p = arg_clean ? clean_item(i) : 0;
 
         if (r < 0)