diff options
-rw-r--r-- | libbb/lineedit.c | 13 | ||||
-rw-r--r-- | modutils/lsmod.c | 5 | ||||
-rw-r--r-- | networking/tc.c | 6 | ||||
-rw-r--r-- | networking/udhcp/dhcpd.c | 3 | ||||
-rw-r--r-- | networking/wget.c | 2 | ||||
-rw-r--r-- | util-linux/mount.c | 5 |
6 files changed, 25 insertions, 9 deletions
diff --git a/libbb/lineedit.c b/libbb/lineedit.c index 1d5fef5ee..fbabc6c12 100644 --- a/libbb/lineedit.c +++ b/libbb/lineedit.c | |||
@@ -70,13 +70,20 @@ | |||
70 | #if ENABLE_UNICODE_SUPPORT | 70 | #if ENABLE_UNICODE_SUPPORT |
71 | # define BB_NUL ((wchar_t)0) | 71 | # define BB_NUL ((wchar_t)0) |
72 | # define CHAR_T wchar_t | 72 | # define CHAR_T wchar_t |
73 | static bool BB_isspace(CHAR_T c) { return ((unsigned)c < 256 && isspace(c)); } | 73 | static bool BB_isspace(CHAR_T c) |
74 | { | ||
75 | return ((unsigned)c < 256 && isspace(c)); | ||
76 | } | ||
74 | # if ENABLE_FEATURE_EDITING_VI | 77 | # if ENABLE_FEATURE_EDITING_VI |
75 | static bool BB_isalnum_or_underscore(CHAR_T c) { | 78 | static bool BB_isalnum_or_underscore(CHAR_T c) |
79 | { | ||
76 | return ((unsigned)c < 256 && isalnum(c)) || c == '_'; | 80 | return ((unsigned)c < 256 && isalnum(c)) || c == '_'; |
77 | } | 81 | } |
78 | # endif | 82 | # endif |
79 | static bool BB_ispunct(CHAR_T c) { return ((unsigned)c < 256 && ispunct(c)); } | 83 | static bool BB_ispunct(CHAR_T c) |
84 | { | ||
85 | return ((unsigned)c < 256 && ispunct(c)); | ||
86 | } | ||
80 | # undef isspace | 87 | # undef isspace |
81 | # undef isalnum | 88 | # undef isalnum |
82 | # undef ispunct | 89 | # undef ispunct |
diff --git a/modutils/lsmod.c b/modutils/lsmod.c index 694205fda..39dc8e6b7 100644 --- a/modutils/lsmod.c +++ b/modutils/lsmod.c | |||
@@ -66,7 +66,10 @@ static void check_tainted(void) | |||
66 | } | 66 | } |
67 | } | 67 | } |
68 | #else | 68 | #else |
69 | static void check_tainted(void) { putchar('\n'); } | 69 | static ALWAYS_INLINE void check_tainted(void) |
70 | { | ||
71 | putchar('\n'); | ||
72 | } | ||
70 | #endif | 73 | #endif |
71 | 74 | ||
72 | int lsmod_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; | 75 | int lsmod_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; |
diff --git a/networking/tc.c b/networking/tc.c index 3e9808328..2e1078d31 100644 --- a/networking/tc.c +++ b/networking/tc.c | |||
@@ -124,7 +124,8 @@ static char* print_tc_classid(uint32_t cid) | |||
124 | } | 124 | } |
125 | 125 | ||
126 | /* Get a qdisc handle. Return 0 on success, !0 otherwise. */ | 126 | /* Get a qdisc handle. Return 0 on success, !0 otherwise. */ |
127 | static int get_qdisc_handle(uint32_t *h, const char *str) { | 127 | static int get_qdisc_handle(uint32_t *h, const char *str) |
128 | { | ||
128 | uint32_t maj; | 129 | uint32_t maj; |
129 | char *p; | 130 | char *p; |
130 | 131 | ||
@@ -143,7 +144,8 @@ static int get_qdisc_handle(uint32_t *h, const char *str) { | |||
143 | } | 144 | } |
144 | 145 | ||
145 | /* Get class ID. Return 0 on success, !0 otherwise. */ | 146 | /* Get class ID. Return 0 on success, !0 otherwise. */ |
146 | static int get_tc_classid(uint32_t *h, const char *str) { | 147 | static int get_tc_classid(uint32_t *h, const char *str) |
148 | { | ||
147 | uint32_t maj, min; | 149 | uint32_t maj, min; |
148 | char *p; | 150 | char *p; |
149 | 151 | ||
diff --git a/networking/udhcp/dhcpd.c b/networking/udhcp/dhcpd.c index c46e1721e..0642fc826 100644 --- a/networking/udhcp/dhcpd.c +++ b/networking/udhcp/dhcpd.c | |||
@@ -365,7 +365,8 @@ static int FAST_FUNC read_staticlease(const char *const_line, void *arg) | |||
365 | return 1; | 365 | return 1; |
366 | } | 366 | } |
367 | 367 | ||
368 | static int FAST_FUNC read_optset(const char *line, void *arg) { | 368 | static int FAST_FUNC read_optset(const char *line, void *arg) |
369 | { | ||
369 | return udhcp_str2optset(line, arg, | 370 | return udhcp_str2optset(line, arg, |
370 | dhcp_optflags, dhcp_option_strings, | 371 | dhcp_optflags, dhcp_option_strings, |
371 | /*dhcpv6:*/ 0 | 372 | /*dhcpv6:*/ 0 |
diff --git a/networking/wget.c b/networking/wget.c index fa4d21afd..b6f9d605a 100644 --- a/networking/wget.c +++ b/networking/wget.c | |||
@@ -312,7 +312,7 @@ static void progress_meter(int flag) | |||
312 | } | 312 | } |
313 | } | 313 | } |
314 | #else | 314 | #else |
315 | static ALWAYS_INLINE void progress_meter(int flag UNUSED_PARAM) { } | 315 | static ALWAYS_INLINE void progress_meter(int flag UNUSED_PARAM) {} |
316 | #endif | 316 | #endif |
317 | 317 | ||
318 | 318 | ||
diff --git a/util-linux/mount.c b/util-linux/mount.c index 526b4130c..e6bad7c2c 100644 --- a/util-linux/mount.c +++ b/util-linux/mount.c | |||
@@ -1194,7 +1194,10 @@ static int daemonize(void) | |||
1194 | return 1; | 1194 | return 1; |
1195 | } | 1195 | } |
1196 | #else | 1196 | #else |
1197 | static inline int daemonize(void) { return -ENOSYS; } | 1197 | static inline int daemonize(void) |
1198 | { | ||
1199 | return -ENOSYS; | ||
1200 | } | ||
1198 | #endif | 1201 | #endif |
1199 | 1202 | ||
1200 | /* TODO */ | 1203 | /* TODO */ |