aboutsummaryrefslogtreecommitdiff
path: root/applets
diff options
context:
space:
mode:
authorRob Landley <rob@landley.net>2006-06-18 20:20:07 +0000
committerRob Landley <rob@landley.net>2006-06-18 20:20:07 +0000
commitea224be6aa8fed5486376d3021a4cb911e935106 (patch)
tree38d6c5d2d53841e3f4e2702521e3b03235c51017 /applets
parent14d7065ef1eb836d20e13bc25d1b13f0e76185ac (diff)
downloadbusybox-w32-ea224be6aa8fed5486376d3021a4cb911e935106.tar.gz
busybox-w32-ea224be6aa8fed5486376d3021a4cb911e935106.tar.bz2
busybox-w32-ea224be6aa8fed5486376d3021a4cb911e935106.zip
skip_whitespace() shouldn't claim its return value is const, it doesn't know
that and callers wind up typecasting it back.
Diffstat (limited to 'applets')
-rw-r--r--applets/applets.c9
1 files changed, 3 insertions, 6 deletions
diff --git a/applets/applets.c b/applets/applets.c
index aea116add..27becfd68 100644
--- a/applets/applets.c
+++ b/applets/applets.c
@@ -14,8 +14,6 @@
14 14
15#include "busybox.h" 15#include "busybox.h"
16#include <unistd.h> 16#include <unistd.h>
17#include <stdio.h>
18#include <stdlib.h>
19#include <string.h> 17#include <string.h>
20#include <assert.h> 18#include <assert.h>
21 19
@@ -43,7 +41,6 @@ const size_t NUM_APPLETS = (sizeof (applets) / sizeof (struct BB_applet) - 1);
43 41
44#ifdef CONFIG_FEATURE_SUID_CONFIG 42#ifdef CONFIG_FEATURE_SUID_CONFIG
45 43
46#include <sys/stat.h>
47#include <ctype.h> 44#include <ctype.h>
48#include "pwd_.h" 45#include "pwd_.h"
49#include "grp_.h" 46#include "grp_.h"
@@ -99,7 +96,7 @@ static char *get_trimmed_slice(char *s, char *e)
99 96
100 /* Next, advance past all leading space and return a ptr to the 97 /* Next, advance past all leading space and return a ptr to the
101 * first non-space char; possibly the terminating nul. */ 98 * first non-space char; possibly the terminating nul. */
102 return (char *) bb_skip_whitespace(s); 99 return skip_whitespace(s);
103} 100}
104 101
105 102
@@ -240,7 +237,7 @@ static void parse_config_file(void)
240 237
241 /* Get the specified mode. */ 238 /* Get the specified mode. */
242 239
243 e = (char *) bb_skip_whitespace(e+1); 240 e = skip_whitespace(e+1);
244 241
245 for (i=0 ; i < 3 ; i++) { 242 for (i=0 ; i < 3 ; i++) {
246 const char *q; 243 const char *q;
@@ -253,7 +250,7 @@ static void parse_config_file(void)
253 250
254 /* Now get the the user/group info. */ 251 /* Now get the the user/group info. */
255 252
256 s = (char *) bb_skip_whitespace(e); 253 s = skip_whitespace(e);
257 254
258 /* Note: We require whitespace between the mode and the 255 /* Note: We require whitespace between the mode and the
259 * user/group info. */ 256 * user/group info. */