From: Yu Watanabe Date: Fri, 20 Feb 2026 07:22:00 +0000 (+0900) Subject: mstack: coding style cleanups X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ecf9f81af4de890010769cd425633dc32da2f06b;p=thirdparty%2Fsystemd.git mstack: coding style cleanups --- diff --git a/src/shared/mstack.c b/src/shared/mstack.c index d1eddda28bb..e5dcd91e525 100644 --- a/src/shared/mstack.c +++ b/src/shared/mstack.c @@ -56,7 +56,7 @@ static void mstack_done(MStack *mstack) { safe_close(mstack->usr_mount_fd); } -MStack *mstack_free(MStack *mstack) { +MStack* mstack_free(MStack *mstack) { if (!mstack) return NULL; @@ -501,7 +501,7 @@ static bool mount_is_ro(MStackMount *m, MStackFlags flags) { IN_SET(m->mount_type, MSTACK_LAYER, MSTACK_ROBIND); } -static const char *mount_name(MStackMount *m) { +static const char* mount_name(MStackMount *m) { assert(m); /* Returns some vaguely useful identifier for this layer, for showing in debug output */ diff --git a/src/shared/mstack.h b/src/shared/mstack.h index b71ff86940b..3a05221e5ea 100644 --- a/src/shared/mstack.h +++ b/src/shared/mstack.h @@ -47,7 +47,7 @@ typedef struct MStack { .usr_mount_fd = -EBADF, \ } -MStack *mstack_free(MStack *mstack); +MStack* mstack_free(MStack *mstack); DEFINE_TRIVIAL_CLEANUP_FUNC(MStack*, mstack_free); int mstack_load(const char *dir, int dir_fd, MStack **ret); @@ -56,7 +56,17 @@ int mstack_make_mounts(MStack *mstack, const char *temp_mount_dir, MStackFlags f int mstack_bind_mounts(MStack *mstack, const char *where, int where_fd, MStackFlags flags, int *ret_root_fd); /* The four calls above in one */ -int mstack_apply(const char *dir, int dir_fd, const char *where, const char *temp_mount_dir, sd_varlink *mountfsd_link, int userns_fd, const ImagePolicy *image_policy, const ImageFilter *image_filter, MStackFlags flags, int *ret_root_fd); +int mstack_apply( + const char *dir, + int dir_fd, + const char *where, + const char *temp_mount_dir, + sd_varlink *mountfsd_link, + int userns_fd, + const ImagePolicy *image_policy, + const ImageFilter *image_filter, + MStackFlags flags, + int *ret_root_fd); int mstack_is_read_only(MStack *mstack); int mstack_is_foreign_uid_owned(MStack *mstack);