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

udev: use typedef for struct udev_event

This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2018-12-14 10:27:24 +01:00
parent 9a07157dd5
commit 2e08871534
6 changed files with 29 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -56,7 +56,7 @@ static int fake_filesystems(void) {
static int run(int argc, char *argv[]) {
_cleanup_(udev_rules_freep) UdevRules *rules = NULL;
_cleanup_(udev_event_freep) struct udev_event *event = NULL;
_cleanup_(udev_event_freep) UdevEvent *event = NULL;
_cleanup_(sd_device_unrefp) sd_device *dev = NULL;
const char *devpath, *devname, *action;
int r;

26
src/udev/udev-event.c
View File

@ -45,16 +45,16 @@ typedef struct Spawn {
size_t result_len;
} Spawn;
struct udev_event *udev_event_new(sd_device *dev, usec_t exec_delay_usec, sd_netlink *rtnl) {
struct udev_event *event;
UdevEvent *udev_event_new(sd_device *dev, usec_t exec_delay_usec, sd_netlink *rtnl) {
UdevEvent *event;
assert(dev);
event = new(struct udev_event, 1);
event = new(UdevEvent, 1);
if (!event)
return NULL;
*event = (struct udev_event) {
*event = (UdevEvent) {
.dev = sd_device_ref(dev),
.birth_usec = now(CLOCK_MONOTONIC),
.exec_delay_usec = exec_delay_usec,
@ -64,7 +64,7 @@ struct udev_event *udev_event_new(sd_device *dev, usec_t exec_delay_usec, sd_net
return event;
}
struct udev_event *udev_event_free(struct udev_event *event) {
UdevEvent *udev_event_free(UdevEvent *event) {
if (!event)
return NULL;
@ -125,7 +125,7 @@ static const struct subst_map_entry map[] = {
{ .name = "sys", .fmt = 'S', .type = SUBST_SYS },
};
static ssize_t subst_format_var(struct udev_event *event,
static ssize_t subst_format_var(UdevEvent *event,
const struct subst_map_entry *entry, char *attr,
char *dest, size_t l) {
sd_device *parent, *dev = event->dev;
@ -312,7 +312,7 @@ static ssize_t subst_format_var(struct udev_event *event,
return s - dest;
}
ssize_t udev_event_apply_format(struct udev_event *event,
ssize_t udev_event_apply_format(UdevEvent *event,
const char *src, char *dest, size_t size,
bool replace_whitespace) {
const char *from;
@ -593,7 +593,7 @@ static int spawn_wait(Spawn *spawn) {
return ret;
}
int udev_event_spawn(struct udev_event *event,
int udev_event_spawn(UdevEvent *event,
usec_t timeout_usec,
bool accept_failure,
const char *cmd,
@ -683,7 +683,7 @@ int udev_event_spawn(struct udev_event *event,
return r;
}
static int rename_netif(struct udev_event *event) {
static int rename_netif(UdevEvent *event) {
sd_device *dev = event->dev;
const char *action, *oldname;
char name[IFNAMSIZ];
@ -726,7 +726,7 @@ static int rename_netif(struct udev_event *event) {
return 1;
}
static int update_devnode(struct udev_event *event) {
static int update_devnode(UdevEvent *event) {
sd_device *dev = event->dev;
const char *action;
bool apply;
@ -777,7 +777,7 @@ static int update_devnode(struct udev_event *event) {
}
static void event_execute_rules_on_remove(
struct udev_event *event,
UdevEvent *event,
usec_t timeout_usec,
Hashmap *properties_list,
UdevRules *rules) {
@ -806,7 +806,7 @@ static void event_execute_rules_on_remove(
(void) udev_node_remove(dev);
}
int udev_event_execute_rules(struct udev_event *event,
int udev_event_execute_rules(UdevEvent *event,
usec_t timeout_usec,
Hashmap *properties_list,
UdevRules *rules) {
@ -876,7 +876,7 @@ int udev_event_execute_rules(struct udev_event *event,
return 0;
}
void udev_event_execute_run(struct udev_event *event, usec_t timeout_usec) {
void udev_event_execute_run(UdevEvent *event, usec_t timeout_usec) {
const char *cmd;
void *val;
Iterator i;

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

@ -640,7 +640,7 @@ static int import_file_into_properties(sd_device *dev, const char *filename) {
return 0;
}
static int import_program_into_properties(struct udev_event *event,
static int import_program_into_properties(UdevEvent *event,
usec_t timeout_usec,
const char *program) {
char result[UTIL_LINE_SIZE];
@ -1668,7 +1668,7 @@ static int match_key(UdevRules *rules, struct token *token, const char *val) {
return -1;
}
static int match_attr(UdevRules *rules, sd_device *dev, struct udev_event *event, struct token *cur) {
static int match_attr(UdevRules *rules, sd_device *dev, UdevEvent *event, struct token *cur) {
char nbuf[UTIL_NAME_SIZE], vbuf[UTIL_NAME_SIZE];
const char *name, *value;
size_t len;
@ -1721,7 +1721,7 @@ enum escape_type {
int udev_rules_apply_to_event(
UdevRules *rules,
struct udev_event *event,
UdevEvent *event,
usec_t timeout_usec,
Hashmap *properties_list) {
sd_device *dev = event->dev;

20
src/udev/udev.h
View File

@ -16,7 +16,7 @@
#define READ_END 0
#define WRITE_END 1
struct udev_event {
typedef struct UdevEvent {
sd_device *dev;
sd_device *dev_parent;
sd_device *dev_db_clone;
@ -43,7 +43,7 @@ struct udev_event {
bool name_final;
bool devlink_final;
bool run_final;
};
} UdevEvent;
/* udev-rules.c */
typedef struct UdevRules UdevRules;
@ -52,7 +52,7 @@ int udev_rules_new(UdevRules **ret_rules, ResolveNameTiming resolve_name_timing)
UdevRules *udev_rules_free(UdevRules *rules);
bool udev_rules_check_timestamp(UdevRules *rules);
int udev_rules_apply_to_event(UdevRules *rules, struct udev_event *event,
int udev_rules_apply_to_event(UdevRules *rules, UdevEvent *event,
usec_t timeout_usec,
Hashmap *properties_list);
int udev_rules_apply_static_dev_perms(UdevRules *rules);
@ -62,21 +62,21 @@ static inline usec_t udev_warn_timeout(usec_t timeout_usec) {
}
/* udev-event.c */
struct udev_event *udev_event_new(sd_device *dev, usec_t exec_delay_usec, sd_netlink *rtnl);
struct udev_event *udev_event_free(struct udev_event *event);
ssize_t udev_event_apply_format(struct udev_event *event,
UdevEvent *udev_event_new(sd_device *dev, usec_t exec_delay_usec, sd_netlink *rtnl);
UdevEvent *udev_event_free(UdevEvent *event);
ssize_t udev_event_apply_format(UdevEvent *event,
const char *src, char *dest, size_t size,
bool replace_whitespace);
int udev_event_spawn(struct udev_event *event,
int udev_event_spawn(UdevEvent *event,
usec_t timeout_usec,
bool accept_failure,
const char *cmd, char *result, size_t ressize);
int udev_event_execute_rules(struct udev_event *event,
int udev_event_execute_rules(UdevEvent *event,
usec_t timeout_usec,
Hashmap *properties_list,
UdevRules *rules);
void udev_event_execute_run(struct udev_event *event, usec_t timeout_usec);
void udev_event_execute_run(UdevEvent *event, usec_t timeout_usec);
/* Cleanup functions */
DEFINE_TRIVIAL_CLEANUP_FUNC(struct udev_event*, udev_event_free);
DEFINE_TRIVIAL_CLEANUP_FUNC(UdevEvent*, udev_event_free);
DEFINE_TRIVIAL_CLEANUP_FUNC(UdevRules*, udev_rules_free);

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

@ -87,7 +87,7 @@ static int parse_argv(int argc, char *argv[]) {
int test_main(int argc, char *argv[], void *userdata) {
_cleanup_(udev_rules_freep) UdevRules *rules = NULL;
_cleanup_(udev_event_freep) struct udev_event *event = NULL;
_cleanup_(udev_event_freep) UdevEvent *event = NULL;
_cleanup_(sd_device_unrefp) sd_device *dev = NULL;
const char *cmd, *key, *value;
sigset_t mask, sigmask_orig;

2
src/udev/udevd.c
View File

@ -394,7 +394,7 @@ static int worker_lock_block_device(sd_device *dev, int *ret_fd) {
}
static int worker_process_device(Manager *manager, sd_device *dev) {
_cleanup_(udev_event_freep) struct udev_event *udev_event = NULL;
_cleanup_(udev_event_freep) UdevEvent *udev_event = NULL;
_cleanup_close_ int fd_lock = -1;
const char *seqnum;
int r;