summaryrefslogtreecommitdiff
path: root/src/shared
diff options
context:
space:
mode:
Diffstat (limited to 'src/shared')
-rw-r--r--src/shared/capability.c2
-rw-r--r--src/shared/install.c12
-rw-r--r--src/shared/util.h2
3 files changed, 8 insertions, 8 deletions
diff --git a/src/shared/capability.c b/src/shared/capability.c
index f34f6ba6f6..72c671cf84 100644
--- a/src/shared/capability.c
+++ b/src/shared/capability.c
@@ -137,7 +137,7 @@ int capability_bounding_set_drop(uint64_t drop, bool right_now) {
r = -errno;
goto finish;
}
- v = i;
+ v = (cap_value_t) i;
/* Also drop it from the inheritable set, so
* that anything we exec() loses the
diff --git a/src/shared/install.c b/src/shared/install.c
index 5001ad43be..233d64b6e9 100644
--- a/src/shared/install.c
+++ b/src/shared/install.c
@@ -1020,9 +1020,9 @@ static int unit_file_load(
return r;
return
- strv_length(info->aliases) +
- strv_length(info->wanted_by) +
- strv_length(info->required_by);
+ (int) strv_length(info->aliases) +
+ (int) strv_length(info->wanted_by) +
+ (int) strv_length(info->required_by);
}
static int unit_file_search(
@@ -1132,9 +1132,9 @@ static int unit_file_can_install(
if (r >= 0)
r =
- strv_length(i->aliases) +
- strv_length(i->wanted_by) +
- strv_length(i->required_by);
+ (int) strv_length(i->aliases) +
+ (int) strv_length(i->wanted_by) +
+ (int) strv_length(i->required_by);
return r;
}
diff --git a/src/shared/util.h b/src/shared/util.h
index 57667ef895..b37072f24a 100644
--- a/src/shared/util.h
+++ b/src/shared/util.h
@@ -712,7 +712,7 @@ static inline void _reset_umask_(struct _umask_struct_ *s) {
_saved_umask_.quit = true)
static inline unsigned u64log2(uint64_t n) {
- return (n > 1) ? __builtin_clzll(n) ^ 63U : 0;
+ return (n > 1) ? (unsigned) __builtin_clzll(n) ^ 63U : 0;
}
static inline bool logind_running(void) {