diff options
| author | Kay Sievers <kay.sievers@vrfy.org> | 2010-03-10 14:52:42 +0100 |
|---|---|---|
| committer | Kay Sievers <kay.sievers@vrfy.org> | 2010-03-10 14:52:42 +0100 |
| commit | fbb31cd6e10fe66d2da781db0ba9a8d671a4c6aa (patch) | |
| tree | 0f8ad4f66d9a0e6b89fab66125b620bb7223100e /udev | |
| parent | 455f792e4791e037eb0406005b92c345cf0baf56 (diff) | |
libbudev-private: rename udev_list_entry_get_flag()
Diffstat (limited to 'udev')
| -rw-r--r-- | udev/udev-event.c | 2 | ||||
| -rw-r--r-- | udev/udev-node.c | 2 | ||||
| -rw-r--r-- | udev/udev-rules.c | 12 |
3 files changed, 8 insertions, 8 deletions
diff --git a/udev/udev-event.c b/udev/udev-event.c index 4e1773ffea..986c119fbb 100644 --- a/udev/udev-event.c +++ b/udev/udev-event.c @@ -729,7 +729,7 @@ int udev_event_execute_run(struct udev_event *event, const sigset_t *sigmask) udev_event_apply_format(event, cmd, program, sizeof(program)); envp = udev_device_get_properties_envp(event->dev); if (util_run_program(event->udev, program, envp, NULL, 0, NULL, sigmask) != 0) { - if (udev_list_entry_get_flag(list_entry)) + if (udev_list_entry_get_flags(list_entry)) err = -1; } } diff --git a/udev/udev-node.c b/udev/udev-node.c index 307a76b271..23bfade28c 100644 --- a/udev/udev-node.c +++ b/udev/udev-node.c @@ -405,7 +405,7 @@ int udev_node_add(struct udev_device *dev, mode_t mode, uid_t uid, gid_t gid) /* create/update symlinks, add symlinks to name index */ udev_list_entry_foreach(list_entry, udev_device_get_devlinks_list_entry(dev)) { - if (udev_list_entry_get_flag(list_entry)) + if (udev_list_entry_get_flags(list_entry)) /* simple unmanaged link name */ node_symlink(udev, udev_device_get_devnode(dev), udev_list_entry_get_name(list_entry)); else diff --git a/udev/udev-rules.c b/udev/udev-rules.c index 3da2033d51..60daad520a 100644 --- a/udev/udev-rules.c +++ b/udev/udev-rules.c @@ -717,7 +717,7 @@ static int import_property_from_string(struct udev_device *dev, char *line) entry = udev_device_add_property(dev, key, val); /* store in db, skip private keys */ if (key[0] != '.') - udev_list_entry_set_flag(entry, 1); + udev_list_entry_set_flags(entry, 1); } return 0; } @@ -785,7 +785,7 @@ static int import_parent_into_properties(struct udev_device *dev, const char *fi entry = udev_device_add_property(dev, key, val); /* store in db, skip private keys */ if (key[0] != '.') - udev_list_entry_set_flag(entry, 1); + udev_list_entry_set_flags(entry, 1); } } return 0; @@ -1831,13 +1831,13 @@ struct udev_rules *udev_rules_new(struct udev *udev, int resolve_names) filename_off = add_string(rules, filename); /* the offset in the rule is limited to unsigned short */ if (filename_off < USHRT_MAX) - udev_list_entry_set_flag(file_loop, filename_off); + udev_list_entry_set_flags(file_loop, filename_off); } /* parse list of files */ udev_list_entry_foreach_safe(file_loop, file_tmp, udev_list_get_entry(&file_list)) { const char *filename = udev_list_entry_get_name(file_loop); - unsigned int filename_off = udev_list_entry_get_flag(file_loop); + unsigned int filename_off = udev_list_entry_get_flags(file_loop); if (stat(filename, &statbuf) == 0 && statbuf.st_size > 0) parse_file(rules, filename, filename_off); @@ -2420,7 +2420,7 @@ int udev_rules_apply_to_event(struct udev_rules *rules, struct udev_event *event entry = udev_device_add_property(event->dev, name, temp_value); /* store in db, skip private keys */ if (name[0] != '.') - udev_list_entry_set_flag(entry, 1); + udev_list_entry_set_flags(entry, 1); } else { udev_device_add_property(event->dev, name, NULL); } @@ -2542,7 +2542,7 @@ int udev_rules_apply_to_event(struct udev_rules *rules, struct udev_event *event list_entry = udev_list_entry_add(event->udev, &event->run_list, &rules->buf[cur->key.value_off], NULL, 1, 0); if (cur->key.fail_on_error) - udev_list_entry_set_flag(list_entry, 1); + udev_list_entry_set_flags(list_entry, 1); break; } case TK_A_GOTO: |