From: Lennart Poettering Date: Fri, 27 Apr 2018 20:01:54 +0000 (+0200) Subject: nspawn: size_t more stuff X-Git-Tag: v239~305^2~8 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=88614c8a28a9dea6d87a74319fef1b0f2903aa1a;p=thirdparty%2Fsystemd.git nspawn: size_t more stuff A follow-up for #8840 --- diff --git a/src/nspawn/nspawn-mount.c b/src/nspawn/nspawn-mount.c index 1cc4a2da6b8..984fe2dc401 100644 --- a/src/nspawn/nspawn-mount.c +++ b/src/nspawn/nspawn-mount.c @@ -27,7 +27,7 @@ #include "user-util.h" #include "util.h" -CustomMount* custom_mount_add(CustomMount **l, unsigned *n, CustomMountType t) { +CustomMount* custom_mount_add(CustomMount **l, size_t *n, CustomMountType t) { CustomMount *c, *ret; assert(l); @@ -48,8 +48,8 @@ CustomMount* custom_mount_add(CustomMount **l, unsigned *n, CustomMountType t) { return ret; } -void custom_mount_free_all(CustomMount *l, unsigned n) { - unsigned i; +void custom_mount_free_all(CustomMount *l, size_t n) { + size_t i; for (i = 0; i < n; i++) { CustomMount *m = l + i; @@ -110,8 +110,8 @@ static char *resolve_source_path(const char *dest, const char *source) { return strdup(source); } -int custom_mount_prepare_all(const char *dest, CustomMount *l, unsigned n) { - unsigned i; +int custom_mount_prepare_all(const char *dest, CustomMount *l, size_t n) { + size_t i; int r; /* Prepare all custom mounts. This will make source we know all temporary directories. This is called in the @@ -193,7 +193,7 @@ int custom_mount_prepare_all(const char *dest, CustomMount *l, unsigned n) { return 0; } -int bind_mount_parse(CustomMount **l, unsigned *n, const char *s, bool read_only) { +int bind_mount_parse(CustomMount **l, size_t *n, const char *s, bool read_only) { _cleanup_free_ char *source = NULL, *destination = NULL, *opts = NULL; const char *p = s; CustomMount *m; @@ -239,7 +239,7 @@ int bind_mount_parse(CustomMount **l, unsigned *n, const char *s, bool read_only return 0; } -int tmpfs_mount_parse(CustomMount **l, unsigned *n, const char *s) { +int tmpfs_mount_parse(CustomMount **l, size_t *n, const char *s) { _cleanup_free_ char *path = NULL, *opts = NULL; const char *p = s; CustomMount *m; @@ -275,7 +275,7 @@ int tmpfs_mount_parse(CustomMount **l, unsigned *n, const char *s) { return 0; } -int overlay_mount_parse(CustomMount **l, unsigned *n, const char *s, bool read_only) { +int overlay_mount_parse(CustomMount **l, size_t *n, const char *s, bool read_only) { _cleanup_free_ char *upper = NULL, *destination = NULL; _cleanup_strv_free_ char **lower = NULL; CustomMount *m; @@ -544,12 +544,12 @@ int mount_all(const char *dest, #endif }; - unsigned k; - int r; + size_t k; bool use_userns = (mount_settings & MOUNT_USE_USERNS); bool netns = (mount_settings & MOUNT_APPLY_APIVFS_NETNS); bool ro = (mount_settings & MOUNT_APPLY_APIVFS_RO); bool in_userns = (mount_settings & MOUNT_IN_USERNS); + int r; for (k = 0; k < ELEMENTSOF(mount_table); k++) { _cleanup_free_ char *where = NULL, *options = NULL; @@ -766,11 +766,11 @@ static int mount_overlay(const char *dest, CustomMount *m) { int mount_custom( const char *dest, - CustomMount *mounts, unsigned n, + CustomMount *mounts, size_t n, bool userns, uid_t uid_shift, uid_t uid_range, const char *selinux_apifs_context) { - unsigned i; + size_t i; int r; assert(dest); diff --git a/src/nspawn/nspawn-mount.h b/src/nspawn/nspawn-mount.h index 6d3aca76a08..c34b9646caf 100644 --- a/src/nspawn/nspawn-mount.h +++ b/src/nspawn/nspawn-mount.h @@ -40,13 +40,13 @@ typedef struct CustomMount { char *rm_rf_tmpdir; } CustomMount; -CustomMount* custom_mount_add(CustomMount **l, unsigned *n, CustomMountType t); -void custom_mount_free_all(CustomMount *l, unsigned n); -int custom_mount_prepare_all(const char *dest, CustomMount *l, unsigned n); +CustomMount* custom_mount_add(CustomMount **l, size_t *n, CustomMountType t); +void custom_mount_free_all(CustomMount *l, size_t n); +int custom_mount_prepare_all(const char *dest, CustomMount *l, size_t n); -int bind_mount_parse(CustomMount **l, unsigned *n, const char *s, bool read_only); -int tmpfs_mount_parse(CustomMount **l, unsigned *n, const char *s); -int overlay_mount_parse(CustomMount **l, unsigned *n, const char *s, bool read_only); +int bind_mount_parse(CustomMount **l, size_t *n, const char *s, bool read_only); +int tmpfs_mount_parse(CustomMount **l, size_t *n, const char *s); +int overlay_mount_parse(CustomMount **l, size_t *n, const char *s, bool read_only); int mount_all(const char *dest, MountSettingsMask mount_settings, uid_t uid_shift, uid_t uid_range, const char *selinux_apifs_context); int mount_sysfs(const char *dest, MountSettingsMask mount_settings); @@ -54,7 +54,7 @@ int mount_sysfs(const char *dest, MountSettingsMask mount_settings); int mount_cgroups(const char *dest, CGroupUnified unified_requested, bool userns, uid_t uid_shift, uid_t uid_range, const char *selinux_apifs_context, bool use_cgns); int mount_systemd_cgroup_writable(const char *dest, CGroupUnified unified_requested); -int mount_custom(const char *dest, CustomMount *mounts, unsigned n, bool userns, uid_t uid_shift, uid_t uid_range, const char *selinux_apifs_context); +int mount_custom(const char *dest, CustomMount *mounts, size_t n, bool userns, uid_t uid_shift, uid_t uid_range, const char *selinux_apifs_context); int setup_volatile(const char *directory, VolatileMode mode, bool userns, uid_t uid_shift, uid_t uid_range, const char *selinux_apifs_context); int setup_volatile_state(const char *directory, VolatileMode mode, bool userns, uid_t uid_shift, uid_t uid_range, const char *selinux_apifs_context); diff --git a/src/nspawn/nspawn-settings.h b/src/nspawn/nspawn-settings.h index bee7e9f5303..731db872606 100644 --- a/src/nspawn/nspawn-settings.h +++ b/src/nspawn/nspawn-settings.h @@ -76,7 +76,7 @@ typedef struct Settings { int read_only; VolatileMode volatile_mode; CustomMount *custom_mounts; - unsigned n_custom_mounts; + size_t n_custom_mounts; int userns_chown; /* [Network] */ diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c index 23bc9402a8a..47ceb0c6342 100644 --- a/src/nspawn/nspawn.c +++ b/src/nspawn/nspawn.c @@ -165,7 +165,7 @@ static uint64_t arg_caps_retain = (1ULL << CAP_SYS_RESOURCE) | (1ULL << CAP_SYS_TTY_CONFIG); static CustomMount *arg_custom_mounts = NULL; -static unsigned arg_n_custom_mounts = 0; +static size_t arg_n_custom_mounts = 0; static char **arg_setenv = NULL; static bool arg_quiet = false; static bool arg_register = true; @@ -291,7 +291,7 @@ static void help(void) { } static int custom_mount_check_all(void) { - unsigned i; + size_t i; for (i = 0; i < arg_n_custom_mounts; i++) { CustomMount *m = &arg_custom_mounts[i]; @@ -2265,7 +2265,7 @@ static int inner_child( _cleanup_free_ char *home = NULL; char as_uuid[37]; - unsigned n_env = 1; + size_t n_env = 1; const char *envp[] = { "PATH=" DEFAULT_PATH_COMPAT, NULL, /* container */