diff options
Diffstat (limited to 'include')
-rw-r--r-- | include/platform.h | 2 | ||||
-rw-r--r-- | include/xatonum.h | 60 |
2 files changed, 31 insertions, 31 deletions
diff --git a/include/platform.h b/include/platform.h index 345e9cb7a..a1ec17a7b 100644 --- a/include/platform.h +++ b/include/platform.h | |||
@@ -195,7 +195,7 @@ typedef unsigned long long int uintmax_t; | |||
195 | * out of the tree, so stop saying it should be. */ | 195 | * out of the tree, so stop saying it should be. */ |
196 | #define fdprintf dprintf | 196 | #define fdprintf dprintf |
197 | 197 | ||
198 | /* Don't use lchown with glibc older then 2.1.x ... uC-libc lacks it */ | 198 | /* Don't use lchown with glibc older than 2.1.x ... uC-libc lacks it */ |
199 | #if (defined __GLIBC__ && __GLIBC__ <= 2 && __GLIBC_MINOR__ < 1) || \ | 199 | #if (defined __GLIBC__ && __GLIBC__ <= 2 && __GLIBC_MINOR__ < 1) || \ |
200 | defined __UC_LIBC__ | 200 | defined __UC_LIBC__ |
201 | # define lchown chown | 201 | # define lchown chown |
diff --git a/include/xatonum.h b/include/xatonum.h index 585d84623..cf088a49e 100644 --- a/include/xatonum.h +++ b/include/xatonum.h | |||
@@ -29,50 +29,50 @@ type xato##T(const char *str); \ | |||
29 | DECLARE_STR_CONV(long long, ll, ull) | 29 | DECLARE_STR_CONV(long long, ll, ull) |
30 | 30 | ||
31 | 31 | ||
32 | /* Provides extern inline definitions of functions */ | 32 | /* Provides inline definitions of functions */ |
33 | /* (useful for mapping them to the type of the same width) */ | 33 | /* (useful for mapping them to the type of the same width) */ |
34 | #define DEFINE_EQUIV_STR_CONV(narrow, N, W, UN, UW) \ | 34 | #define DEFINE_EQUIV_STR_CONV(narrow, N, W, UN, UW) \ |
35 | \ | 35 | \ |
36 | extern inline \ | 36 | static ATTRIBUTE_ALWAYS_INLINE \ |
37 | unsigned narrow xstrto##UN##_range_sfx(const char *str, int b, unsigned narrow l, unsigned narrow u, const struct suffix_mult *sfx) \ | 37 | unsigned narrow xstrto##UN##_range_sfx(const char *str, int b, unsigned narrow l, unsigned narrow u, const struct suffix_mult *sfx) \ |
38 | { return xstrto##UW##_range_sfx(str, b, l, u, sfx); } \ | 38 | { return xstrto##UW##_range_sfx(str, b, l, u, sfx); } \ |
39 | extern inline \ | 39 | static ATTRIBUTE_ALWAYS_INLINE \ |
40 | unsigned narrow xstrto##UN##_range(const char *str, int b, unsigned narrow l, unsigned narrow u) \ | 40 | unsigned narrow xstrto##UN##_range(const char *str, int b, unsigned narrow l, unsigned narrow u) \ |
41 | { return xstrto##UW##_range(str, b, l, u); } \ | 41 | { return xstrto##UW##_range(str, b, l, u); } \ |
42 | extern inline \ | 42 | static ATTRIBUTE_ALWAYS_INLINE \ |
43 | unsigned narrow xstrto##UN##_sfx(const char *str, int b, const struct suffix_mult *sfx) \ | 43 | unsigned narrow xstrto##UN##_sfx(const char *str, int b, const struct suffix_mult *sfx) \ |
44 | { return xstrto##UW##_sfx(str, b, sfx); } \ | 44 | { return xstrto##UW##_sfx(str, b, sfx); } \ |
45 | extern inline \ | 45 | static ATTRIBUTE_ALWAYS_INLINE \ |
46 | unsigned narrow xstrto##UN(const char *str, int b) \ | 46 | unsigned narrow xstrto##UN(const char *str, int b) \ |
47 | { return xstrto##UW(str, b); } \ | 47 | { return xstrto##UW(str, b); } \ |
48 | extern inline \ | 48 | static ATTRIBUTE_ALWAYS_INLINE \ |
49 | unsigned narrow xato##UN##_range_sfx(const char *str, unsigned narrow l, unsigned narrow u, const struct suffix_mult *sfx) \ | 49 | unsigned narrow xato##UN##_range_sfx(const char *str, unsigned narrow l, unsigned narrow u, const struct suffix_mult *sfx) \ |
50 | { return xato##UW##_range_sfx(str, l, u, sfx); } \ | 50 | { return xato##UW##_range_sfx(str, l, u, sfx); } \ |
51 | extern inline \ | 51 | static ATTRIBUTE_ALWAYS_INLINE \ |
52 | unsigned narrow xato##UN##_range(const char *str, unsigned narrow l, unsigned narrow u) \ | 52 | unsigned narrow xato##UN##_range(const char *str, unsigned narrow l, unsigned narrow u) \ |
53 | { return xato##UW##_range(str, l, u); } \ | 53 | { return xato##UW##_range(str, l, u); } \ |
54 | extern inline \ | 54 | static ATTRIBUTE_ALWAYS_INLINE \ |
55 | unsigned narrow xato##UN##_sfx(const char *str, const struct suffix_mult *sfx) \ | 55 | unsigned narrow xato##UN##_sfx(const char *str, const struct suffix_mult *sfx) \ |
56 | { return xato##UW##_sfx(str, sfx); } \ | 56 | { return xato##UW##_sfx(str, sfx); } \ |
57 | extern inline \ | 57 | static ATTRIBUTE_ALWAYS_INLINE \ |
58 | unsigned narrow xato##UN(const char *str) \ | 58 | unsigned narrow xato##UN(const char *str) \ |
59 | { return xato##UW(str); } \ | 59 | { return xato##UW(str); } \ |
60 | extern inline \ | 60 | static ATTRIBUTE_ALWAYS_INLINE \ |
61 | narrow xstrto##N##_range_sfx(const char *str, int b, narrow l, narrow u, const struct suffix_mult *sfx) \ | 61 | narrow xstrto##N##_range_sfx(const char *str, int b, narrow l, narrow u, const struct suffix_mult *sfx) \ |
62 | { return xstrto##W##_range_sfx(str, b, l, u, sfx); } \ | 62 | { return xstrto##W##_range_sfx(str, b, l, u, sfx); } \ |
63 | extern inline \ | 63 | static ATTRIBUTE_ALWAYS_INLINE \ |
64 | narrow xstrto##N##_range(const char *str, int b, narrow l, narrow u) \ | 64 | narrow xstrto##N##_range(const char *str, int b, narrow l, narrow u) \ |
65 | { return xstrto##W##_range(str, b, l, u); } \ | 65 | { return xstrto##W##_range(str, b, l, u); } \ |
66 | extern inline \ | 66 | static ATTRIBUTE_ALWAYS_INLINE \ |
67 | narrow xato##N##_range_sfx(const char *str, narrow l, narrow u, const struct suffix_mult *sfx) \ | 67 | narrow xato##N##_range_sfx(const char *str, narrow l, narrow u, const struct suffix_mult *sfx) \ |
68 | { return xato##W##_range_sfx(str, l, u, sfx); } \ | 68 | { return xato##W##_range_sfx(str, l, u, sfx); } \ |
69 | extern inline \ | 69 | static ATTRIBUTE_ALWAYS_INLINE \ |
70 | narrow xato##N##_range(const char *str, narrow l, narrow u) \ | 70 | narrow xato##N##_range(const char *str, narrow l, narrow u) \ |
71 | { return xato##W##_range(str, l, u); } \ | 71 | { return xato##W##_range(str, l, u); } \ |
72 | extern inline \ | 72 | static ATTRIBUTE_ALWAYS_INLINE \ |
73 | narrow xato##N##_sfx(const char *str, const struct suffix_mult *sfx) \ | 73 | narrow xato##N##_sfx(const char *str, const struct suffix_mult *sfx) \ |
74 | { return xato##W##_sfx(str, sfx); } \ | 74 | { return xato##W##_sfx(str, sfx); } \ |
75 | extern inline \ | 75 | static ATTRIBUTE_ALWAYS_INLINE \ |
76 | narrow xato##N(const char *str) \ | 76 | narrow xato##N(const char *str) \ |
77 | { return xato##W(str); } \ | 77 | { return xato##W(str); } \ |
78 | 78 | ||
@@ -96,7 +96,7 @@ DECLARE_STR_CONV(int, i, u) | |||
96 | /* Specialized */ | 96 | /* Specialized */ |
97 | 97 | ||
98 | int BUG_xatou32_unimplemented(void); | 98 | int BUG_xatou32_unimplemented(void); |
99 | extern inline uint32_t xatou32(const char *numstr) | 99 | static ATTRIBUTE_ALWAYS_INLINE uint32_t xatou32(const char *numstr) |
100 | { | 100 | { |
101 | if (UINT_MAX == 0xffffffff) | 101 | if (UINT_MAX == 0xffffffff) |
102 | return xatou(numstr); | 102 | return xatou(numstr); |
@@ -111,11 +111,11 @@ unsigned long long bb_strtoull(const char *arg, char **endp, int base); | |||
111 | long long bb_strtoll(const char *arg, char **endp, int base); | 111 | long long bb_strtoll(const char *arg, char **endp, int base); |
112 | 112 | ||
113 | #if ULONG_MAX == ULLONG_MAX | 113 | #if ULONG_MAX == ULLONG_MAX |
114 | extern inline | 114 | static ATTRIBUTE_ALWAYS_INLINE |
115 | unsigned long bb_strtoul(const char *arg, char **endp, int base) | 115 | unsigned long bb_strtoul(const char *arg, char **endp, int base) |
116 | { return bb_strtoull(arg, endp, base); } | 116 | { return bb_strtoull(arg, endp, base); } |
117 | extern inline | 117 | static ATTRIBUTE_ALWAYS_INLINE |
118 | unsigned long bb_strtol(const char *arg, char **endp, int base) | 118 | long bb_strtol(const char *arg, char **endp, int base) |
119 | { return bb_strtoll(arg, endp, base); } | 119 | { return bb_strtoll(arg, endp, base); } |
120 | #else | 120 | #else |
121 | unsigned long bb_strtoul(const char *arg, char **endp, int base); | 121 | unsigned long bb_strtoul(const char *arg, char **endp, int base); |
@@ -123,26 +123,26 @@ long bb_strtol(const char *arg, char **endp, int base); | |||
123 | #endif | 123 | #endif |
124 | 124 | ||
125 | #if UINT_MAX == ULLONG_MAX | 125 | #if UINT_MAX == ULLONG_MAX |
126 | extern inline | 126 | static ATTRIBUTE_ALWAYS_INLINE |
127 | unsigned long bb_strtou(const char *arg, char **endp, int base) | 127 | unsigned bb_strtou(const char *arg, char **endp, int base) |
128 | { return bb_strtoull(arg, endp, base); } | 128 | { return bb_strtoull(arg, endp, base); } |
129 | extern inline | 129 | static ATTRIBUTE_ALWAYS_INLINE |
130 | unsigned long bb_strtoi(const char *arg, char **endp, int base) | 130 | int bb_strtoi(const char *arg, char **endp, int base) |
131 | { return bb_strtoll(arg, endp, base); } | 131 | { return bb_strtoll(arg, endp, base); } |
132 | #elif UINT_MAX == ULONG_MAX | 132 | #elif UINT_MAX == ULONG_MAX |
133 | extern inline | 133 | static ATTRIBUTE_ALWAYS_INLINE |
134 | unsigned long bb_strtou(const char *arg, char **endp, int base) | 134 | unsigned bb_strtou(const char *arg, char **endp, int base) |
135 | { return bb_strtoul(arg, endp, base); } | 135 | { return bb_strtoul(arg, endp, base); } |
136 | extern inline | 136 | static ATTRIBUTE_ALWAYS_INLINE |
137 | unsigned long bb_strtoi(const char *arg, char **endp, int base) | 137 | int bb_strtoi(const char *arg, char **endp, int base) |
138 | { return bb_strtol(arg, endp, base); } | 138 | { return bb_strtol(arg, endp, base); } |
139 | #else | 139 | #else |
140 | unsigned long bb_strtou(const char *arg, char **endp, int base); | 140 | unsigned bb_strtou(const char *arg, char **endp, int base); |
141 | long bb_strtoi(const char *arg, char **endp, int base); | 141 | int bb_strtoi(const char *arg, char **endp, int base); |
142 | #endif | 142 | #endif |
143 | 143 | ||
144 | int BUG_bb_strtou32_unimplemented(void); | 144 | int BUG_bb_strtou32_unimplemented(void); |
145 | extern inline | 145 | static ATTRIBUTE_ALWAYS_INLINE |
146 | uint32_t bb_strtou32(const char *arg, char **endp, int base) | 146 | uint32_t bb_strtou32(const char *arg, char **endp, int base) |
147 | { | 147 | { |
148 | if (sizeof(uint32_t) == sizeof(unsigned)) | 148 | if (sizeof(uint32_t) == sizeof(unsigned)) |