picnoir
/
Systemd
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

udev: rename udev_rules_unref() to udev_rules_free() 

As udev_rules do not have a reference counter.
This commit is contained in:
Yu Watanabe 2018-11-23 00:07:32 +09:00
parent 03b35f8775
commit 981fae90df
5 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/test/test-udev.c
View File

@ -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;

8
src/udev/udev-rules.c
View File

@ -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);

4
src/udev/udev.h
View File

@ -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);

2
src/udev/udevadm-test.c
View File

@ -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;

4
src/udev/udevd.c
View File

@ -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,