summaryrefslogtreecommitdiff
path: root/src/basic/parse-util.h
diff options
context:
space:
mode:
authorFrantisek Sumsal <frantisek@sumsal.cz>2022-02-10 17:19:27 +0100
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2022-02-10 21:00:22 +0100
commitda185cd04d56746a5e66bb7c25cf07865aab9869 (patch)
tree0634c4862c0fa299b3b6839ea75b8f09704b6d13 /src/basic/parse-util.h
parent4ba5594390e7cde52455c4a39860a939378ba240 (diff)
downloadsystemd-da185cd04d56746a5e66bb7c25cf07865aab9869.tar.gz
tree-wide: move `unsigned` to the start of type declaration
Even though ISO C11 doesn't mandate in which order the type specifiers should appear, having `unsigned` at the beginning of each type declaration feels more natural and, more importantly, it unbreaks Coccinelle, which has a hard time parsing `long unsigned` and others: ``` init_defs_builtins: /usr/lib64/coccinelle/standard.h init_defs: /home/mrc0mmand/repos/systemd/coccinelle/macros.h HANDLING: src/shared/mount-util.c : 1: strange type1, maybe because of weird order: long unsigned ``` Most of the codebase already "complies", so let's fix the remaining "offenders".
Diffstat (limited to 'src/basic/parse-util.h')
-rw-r--r--src/basic/parse-util.h12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/basic/parse-util.h b/src/basic/parse-util.h
index 3dc5e140c9..8273124626 100644
--- a/src/basic/parse-util.h
+++ b/src/basic/parse-util.h
@@ -65,9 +65,9 @@ static inline int safe_atoi32(const char *s, int32_t *ret_i) {
return safe_atoi(s, (int*) ret_i);
}
-int safe_atollu_full(const char *s, unsigned base, long long unsigned *ret_llu);
+int safe_atollu_full(const char *s, unsigned base, unsigned long long *ret_llu);
-static inline int safe_atollu(const char *s, long long unsigned *ret_llu) {
+static inline int safe_atollu(const char *s, unsigned long long *ret_llu) {
return safe_atollu_full(s, 0, ret_llu);
}
@@ -82,12 +82,12 @@ static inline int safe_atoi64(const char *s, int64_t *ret_i) {
}
static inline int safe_atoux64(const char *s, uint64_t *ret) {
- assert_cc(sizeof(int64_t) == sizeof(long long unsigned));
- return safe_atollu_full(s, 16, (long long unsigned*) ret);
+ assert_cc(sizeof(int64_t) == sizeof(unsigned long long));
+ return safe_atollu_full(s, 16, (unsigned long long*) ret);
}
#if LONG_MAX == INT_MAX
-static inline int safe_atolu_full(const char *s, unsigned base, long unsigned *ret_u) {
+static inline int safe_atolu_full(const char *s, unsigned base, unsigned long *ret_u) {
assert_cc(sizeof(unsigned long) == sizeof(unsigned));
return safe_atou_full(s, base, (unsigned*) ret_u);
}
@@ -117,7 +117,7 @@ static inline int safe_atozu(const char *s, size_t *ret_u) {
}
#else
static inline int safe_atozu(const char *s, size_t *ret_u) {
- assert_cc(sizeof(size_t) == sizeof(long unsigned));
+ assert_cc(sizeof(size_t) == sizeof(unsigned long));
return safe_atolu(s, ret_u);
}
#endif