udev: rename udev_rules_unref() to udev_rules_free()

As udev_rules do not have a reference counter.

diff --git a/src/test/test-udev.c b/src/test/test-udev.c
index 3d5bc3ac0b3a59fcb1f835631496d7d504724ec6..b5d3eb7bc454415a2f62f1e7498b16f773dd24c4 100644 (file)
--- a/src/test/test-udev.c
+++ b/src/test/test-udev.c
@@ -55,7 +55,7 @@ static int fake_filesystems(void) {
 }
 
 static int run(int argc, char *argv[]) {
-        _cleanup_(udev_rules_unrefp) struct udev_rules *rules = NULL;
+        _cleanup_(udev_rules_freep) struct udev_rules *rules = NULL;
         _cleanup_(udev_event_freep) struct udev_event *event = NULL;
         _cleanup_(sd_device_unrefp) sd_device *dev = NULL;
         const char *devpath, *devname, *action;

diff --git a/src/udev/udev-rules.c b/src/udev/udev-rules.c
index da1dee6e138707a12db8f3307a5c80fbf528d5ed..7fd2c8437201ed29758dd6cd4752068192a28b93 100644 (file)
--- a/src/udev/udev-rules.c
+++ b/src/udev/udev-rules.c
@@ -1531,19 +1531,19 @@ struct udev_rules *udev_rules_new(ResolveNameTiming resolve_name_timing) {
         /* init token array and string buffer */
         rules->tokens = malloc_multiply(PREALLOC_TOKEN, sizeof(struct token));
         if (rules->tokens == NULL)
-                return udev_rules_unref(rules);
+                return udev_rules_free(rules);
         rules->token_max = PREALLOC_TOKEN;
 
         rules->strbuf = strbuf_new();
         if (!rules->strbuf)
-                return udev_rules_unref(rules);
+                return udev_rules_free(rules);
 
         udev_rules_check_timestamp(rules);
 
         r = conf_files_list_strv(&files, ".rules", NULL, 0, rules_dirs);
         if (r < 0) {
                 log_error_errno(r, "failed to enumerate rules files: %m");
-                return udev_rules_unref(rules);
+                return udev_rules_free(rules);
         }
 
         /*
@@ -1582,7 +1582,7 @@ struct udev_rules *udev_rules_new(ResolveNameTiming resolve_name_timing) {
         return rules;
 }
 
-struct udev_rules *udev_rules_unref(struct udev_rules *rules) {
+struct udev_rules *udev_rules_free(struct udev_rules *rules) {
         if (rules == NULL)
                 return NULL;
         free(rules->tokens);

diff --git a/src/udev/udev.h b/src/udev/udev.h
index 320f9a15346d13cc2ce8e25de4f14ae8bf4f95b5..27b335fd44c56d90473a518de61be4a12e96ed04 100644 (file)
--- a/src/udev/udev.h
+++ b/src/udev/udev.h
@@ -48,7 +48,7 @@ struct udev_event {
 /* udev-rules.c */
 struct udev_rules;
 struct udev_rules *udev_rules_new(ResolveNameTiming resolve_name_timing);
-struct udev_rules *udev_rules_unref(struct udev_rules *rules);
+struct udev_rules *udev_rules_free(struct udev_rules *rules);
 bool udev_rules_check_timestamp(struct udev_rules *rules);
 int udev_rules_apply_to_event(struct udev_rules *rules, struct udev_event *event,
                               usec_t timeout_usec,
@@ -77,4 +77,4 @@ void udev_event_execute_run(struct udev_event *event, usec_t timeout_usec);
 
 /* Cleanup functions */
 DEFINE_TRIVIAL_CLEANUP_FUNC(struct udev_event*, udev_event_free);
-DEFINE_TRIVIAL_CLEANUP_FUNC(struct udev_rules*, udev_rules_unref);
+DEFINE_TRIVIAL_CLEANUP_FUNC(struct udev_rules*, udev_rules_free);

diff --git a/src/udev/udevadm-test.c b/src/udev/udevadm-test.c
index a5f05ea83672a6b914e239cb615d8fdf6439a2a8..005553cbb6724abd244b4041407620904b9e614e 100644 (file)
--- a/src/udev/udevadm-test.c
+++ b/src/udev/udevadm-test.c
@@ -86,7 +86,7 @@ static int parse_argv(int argc, char *argv[]) {
 }
 
 int test_main(int argc, char *argv[], void *userdata) {
-        _cleanup_(udev_rules_unrefp) struct udev_rules *rules = NULL;
+        _cleanup_(udev_rules_freep) struct udev_rules *rules = NULL;
         _cleanup_(udev_event_freep) struct udev_event *event = NULL;
         _cleanup_(sd_device_unrefp) sd_device *dev = NULL;
         const char *cmd, *key, *value;

diff --git a/src/udev/udevd.c b/src/udev/udevd.c
index db33de3c5f800f292f144616e1ae7d1ecc88f1f3..6eacfe811f6e817c9ba78c9537aeaff496985a9d 100644 (file)
--- a/src/udev/udevd.c
+++ b/src/udev/udevd.c
@@ -310,7 +310,7 @@ static void manager_free(Manager *manager) {
         sd_netlink_unref(manager->rtnl);
 
         hashmap_free_free_free(manager->properties);
-        udev_rules_unref(manager->rules);
+        udev_rules_free(manager->rules);
 
         safe_close(manager->fd_inotify);
         safe_close_pair(manager->worker_watch);
@@ -843,7 +843,7 @@ static void manager_reload(Manager *manager) {
                   "STATUS=Flushing configuration...");
 
         manager_kill_workers(manager);
-        manager->rules = udev_rules_unref(manager->rules);
+        manager->rules = udev_rules_free(manager->rules);
         udev_builtin_exit();
 
         sd_notifyf(false,