diff options
| author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2015-01-07 10:28:04 -0500 |
|---|---|---|
| committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2015-01-18 19:06:48 -0500 |
| commit | 2695c5c44e028d1bc07404baf3357e5a6017fc57 (patch) | |
| tree | a2016f88be960359644cd57ab9e31ebcaef6c417 | |
| parent | 302fbdf29eb0ad4ca1fe8ee18755edad7db11b37 (diff) | |
Add initialization helper for file_handle_union
| -rw-r--r-- | src/libudev/libudev-monitor.c | 5 | ||||
| -rw-r--r-- | src/shared/path-util.c | 5 | ||||
| -rw-r--r-- | src/shared/util.h | 1 | ||||
| -rw-r--r-- | src/tmpfiles/tmpfiles.c | 5 |
4 files changed, 4 insertions, 12 deletions
diff --git a/src/libudev/libudev-monitor.c b/src/libudev/libudev-monitor.c index 0d361426f7..da2b63473f 100644 --- a/src/libudev/libudev-monitor.c +++ b/src/libudev/libudev-monitor.c @@ -109,10 +109,7 @@ static struct udev_monitor *udev_monitor_new(struct udev *udev) /* we consider udev running when /dev is on devtmpfs */ static bool udev_has_devtmpfs(struct udev *udev) { - union file_handle_union h = { - .handle.handle_bytes = MAX_HANDLE_SZ - }; - + union file_handle_union h = FILE_HANDLE_INIT; _cleanup_fclose_ FILE *f = NULL; char line[LINE_MAX], *e; int mount_id; diff --git a/src/shared/path-util.c b/src/shared/path-util.c index ee87c7493d..00d2d44993 100644 --- a/src/shared/path-util.c +++ b/src/shared/path-util.c @@ -454,10 +454,7 @@ char* path_join(const char *root, const char *path, const char *rest) { int path_is_mount_point(const char *t, bool allow_symlink) { - union file_handle_union h = { - .handle.handle_bytes = MAX_HANDLE_SZ - }; - + union file_handle_union h = FILE_HANDLE_INIT; int mount_id = -1, mount_id_parent = -1; _cleanup_free_ char *parent = NULL; struct stat a, b; diff --git a/src/shared/util.h b/src/shared/util.h index 84453713ca..5818fee82e 100644 --- a/src/shared/util.h +++ b/src/shared/util.h @@ -993,6 +993,7 @@ union file_handle_union { struct file_handle handle; char padding[sizeof(struct file_handle) + MAX_HANDLE_SZ]; }; +#define FILE_HANDLE_INIT { .handle.handle_bytes = MAX_HANDLE_SZ } int update_reboot_param_file(const char *param); diff --git a/src/tmpfiles/tmpfiles.c b/src/tmpfiles/tmpfiles.c index ac9a072511..332ddcea76 100644 --- a/src/tmpfiles/tmpfiles.c +++ b/src/tmpfiles/tmpfiles.c @@ -230,10 +230,7 @@ static bool unix_socket_alive(const char *fn) { static int dir_is_mount_point(DIR *d, const char *subdir) { - union file_handle_union h = { - .handle.handle_bytes = MAX_HANDLE_SZ - }; - + union file_handle_union h = FILE_HANDLE_INIT; int mount_id_parent, mount_id; int r_p, r; |