diff options
Diffstat (limited to 'src/nspawn/nspawn-network.c')
| -rw-r--r-- | src/nspawn/nspawn-network.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/nspawn/nspawn-network.c b/src/nspawn/nspawn-network.c index 90852b9c75..bb30ea6154 100644 --- a/src/nspawn/nspawn-network.c +++ b/src/nspawn/nspawn-network.c @@ -325,7 +325,7 @@ static int create_bridge(sd_netlink *rtnl, const char *bridge_name) { } int setup_bridge(const char *veth_name, const char *bridge_name, bool create) { - _cleanup_release_lock_file_ LockFile bridge_lock = LOCK_FILE_INIT; + _cleanup_(release_lock_file) LockFile bridge_lock = LOCK_FILE_INIT; _cleanup_(sd_netlink_unrefp) sd_netlink *rtnl = NULL; int r, bridge_ifi; unsigned n = 0; @@ -366,7 +366,7 @@ int setup_bridge(const char *veth_name, const char *bridge_name, bool create) { } int remove_bridge(const char *bridge_name) { - _cleanup_release_lock_file_ LockFile bridge_lock = LOCK_FILE_INIT; + _cleanup_(release_lock_file) LockFile bridge_lock = LOCK_FILE_INIT; _cleanup_(sd_netlink_unrefp) sd_netlink *rtnl = NULL; const char *path; int r; @@ -398,7 +398,7 @@ int remove_bridge(const char *bridge_name) { } static int parse_interface(struct udev *udev, const char *name) { - _cleanup_udev_device_unref_ struct udev_device *d = NULL; + _cleanup_(udev_device_unrefp) struct udev_device *d = NULL; char ifi_str[2 + DECIMAL_STR_MAX(int)]; int ifi; @@ -420,7 +420,7 @@ static int parse_interface(struct udev *udev, const char *name) { } int move_network_interfaces(pid_t pid, char **ifaces) { - _cleanup_udev_unref_ struct udev *udev = NULL; + _cleanup_(udev_unrefp) struct udev *udev = NULL; _cleanup_(sd_netlink_unrefp) sd_netlink *rtnl = NULL; char **i; int r; @@ -463,7 +463,7 @@ int move_network_interfaces(pid_t pid, char **ifaces) { } int setup_macvlan(const char *machine_name, pid_t pid, char **ifaces) { - _cleanup_udev_unref_ struct udev *udev = NULL; + _cleanup_(udev_unrefp) struct udev *udev = NULL; _cleanup_(sd_netlink_unrefp) sd_netlink *rtnl = NULL; unsigned idx = 0; char **i; @@ -551,7 +551,7 @@ int setup_macvlan(const char *machine_name, pid_t pid, char **ifaces) { } int setup_ipvlan(const char *machine_name, pid_t pid, char **ifaces) { - _cleanup_udev_unref_ struct udev *udev = NULL; + _cleanup_(udev_unrefp) struct udev *udev = NULL; _cleanup_(sd_netlink_unrefp) sd_netlink *rtnl = NULL; char **i; int r; |