From: DaanDeMeyer Date: Tue, 23 Dec 2025 11:43:51 +0000 (+0100) Subject: dissect-image: Make make_image_name() public X-Git-Tag: v260-rc1~340^2~8 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b525c1d9e96b09a60c29d1cea19bce358016dc87;p=thirdparty%2Fsystemd.git dissect-image: Make make_image_name() public --- diff --git a/src/shared/dissect-image.c b/src/shared/dissect-image.c index 27c93198ab8..27262814a3f 100644 --- a/src/shared/dissect-image.c +++ b/src/shared/dissect-image.c @@ -633,7 +633,7 @@ static void check_partition_flags( } #endif -static int make_image_name(const char *path, char **ret) { +int dissected_image_name_from_path(const char *path, char **ret) { int r; assert(path); @@ -668,7 +668,7 @@ static int dissected_image_new(const char *path, DissectedImage **ret) { assert(ret); if (path) { - r = make_image_name(path, &name); + r = dissected_image_name_from_path(path, &name); if (r < 0) return r; } @@ -5310,7 +5310,7 @@ int mountfsd_mount_image( return r; if (!di->image_name) { - r = make_image_name(path, &di->image_name); + r = dissected_image_name_from_path(path, &di->image_name); if (r < 0) return r; } diff --git a/src/shared/dissect-image.h b/src/shared/dissect-image.h index dfafa623f9c..aa8c6a2737b 100644 --- a/src/shared/dissect-image.h +++ b/src/shared/dissect-image.h @@ -177,6 +177,7 @@ int dissected_image_mount(DissectedImage *m, const char *where, uid_t uid_shift, int dissected_image_mount_and_warn(DissectedImage *m, const char *where, uid_t uid_shift, uid_t uid_range, int userns_fd, DissectImageFlags flags); int dissected_image_acquire_metadata(DissectedImage *m, int userns_fd, DissectImageFlags extra_flags); +int dissected_image_name_from_path(const char *path, char **ret); Architecture dissected_image_architecture(DissectedImage *m);