diff options
Diffstat (limited to 'util-linux')
-rw-r--r-- | util-linux/fbset.c | 4 | ||||
-rw-r--r-- | util-linux/mdev.c | 3 | ||||
-rw-r--r-- | util-linux/switch_root.c | 2 |
3 files changed, 5 insertions, 4 deletions
diff --git a/util-linux/fbset.c b/util-linux/fbset.c index 7ae010163..94d04b12a 100644 --- a/util-linux/fbset.c +++ b/util-linux/fbset.c | |||
@@ -314,8 +314,8 @@ int fbset_main(int argc, char **argv) | |||
314 | { | 314 | { |
315 | struct fb_var_screeninfo var, varset; | 315 | struct fb_var_screeninfo var, varset; |
316 | int fh, i; | 316 | int fh, i; |
317 | char *fbdev = DEFAULTFBDEV; | 317 | const char *fbdev = DEFAULTFBDEV; |
318 | char *modefile = DEFAULTFBMODE; | 318 | const char *modefile = DEFAULTFBMODE; |
319 | char *thisarg, *mode = NULL; | 319 | char *thisarg, *mode = NULL; |
320 | 320 | ||
321 | memset(&varset, 0xFF, sizeof(varset)); | 321 | memset(&varset, 0xFF, sizeof(varset)); |
diff --git a/util-linux/mdev.c b/util-linux/mdev.c index 957316d52..4a0e9f9fd 100644 --- a/util-linux/mdev.c +++ b/util-linux/mdev.c | |||
@@ -141,7 +141,8 @@ static void make_device(char *path, int delete) | |||
141 | } | 141 | } |
142 | if (ENABLE_FEATURE_MDEV_EXEC && field == 3) { | 142 | if (ENABLE_FEATURE_MDEV_EXEC && field == 3) { |
143 | // Command to run | 143 | // Command to run |
144 | char *s = "@$*", *s2; | 144 | const char *s = "@$*"; |
145 | const char *s2; | ||
145 | s2 = strchr(s, *pos++); | 146 | s2 = strchr(s, *pos++); |
146 | if (!s2) { | 147 | if (!s2) { |
147 | // Force error | 148 | // Force error |
diff --git a/util-linux/switch_root.c b/util-linux/switch_root.c index 4c23f69da..007083bef 100644 --- a/util-linux/switch_root.c +++ b/util-linux/switch_root.c | |||
@@ -28,7 +28,7 @@ dev_t rootdev; | |||
28 | 28 | ||
29 | // Recursively delete contents of rootfs. | 29 | // Recursively delete contents of rootfs. |
30 | 30 | ||
31 | static void delete_contents(char *directory) | 31 | static void delete_contents(const char *directory) |
32 | { | 32 | { |
33 | DIR *dir; | 33 | DIR *dir; |
34 | struct dirent *d; | 34 | struct dirent *d; |