diff options
author | Denis Vlasenko <vda.linux@googlemail.com> | 2008-02-19 11:29:46 +0000 |
---|---|---|
committer | Denis Vlasenko <vda.linux@googlemail.com> | 2008-02-19 11:29:46 +0000 |
commit | 53ce7f0d7149beeed71e6dcc857d1cd4431cd550 (patch) | |
tree | d5895fdfa6b3c73632bbf8dca991fcb34001f946 | |
parent | 431a7c9c53b69a7416091721da673bcff7c91a02 (diff) | |
download | busybox-w32-53ce7f0d7149beeed71e6dcc857d1cd4431cd550.tar.gz busybox-w32-53ce7f0d7149beeed71e6dcc857d1cd4431cd550.tar.bz2 busybox-w32-53ce7f0d7149beeed71e6dcc857d1cd4431cd550.zip |
findfs,mount: trivial build fix and whitespace fiexs
-rw-r--r-- | util-linux/findfs.c | 12 | ||||
-rw-r--r-- | util-linux/mount.c | 2 |
2 files changed, 8 insertions, 6 deletions
diff --git a/util-linux/findfs.c b/util-linux/findfs.c index 4f036425c..5b64399ad 100644 --- a/util-linux/findfs.c +++ b/util-linux/findfs.c | |||
@@ -17,7 +17,7 @@ int findfs_main(int argc, char **argv) | |||
17 | char *tmp = NULL; | 17 | char *tmp = NULL; |
18 | 18 | ||
19 | if (argc != 2) | 19 | if (argc != 2) |
20 | bb_show_usage(); | 20 | bb_show_usage(); |
21 | 21 | ||
22 | if (!strncmp(argv[1], "LABEL=", 6)) | 22 | if (!strncmp(argv[1], "LABEL=", 6)) |
23 | tmp = get_devname_from_label(argv[1] + 6); | 23 | tmp = get_devname_from_label(argv[1] + 6); |
@@ -25,14 +25,14 @@ int findfs_main(int argc, char **argv) | |||
25 | tmp = get_devname_from_uuid(argv[1] + 5); | 25 | tmp = get_devname_from_uuid(argv[1] + 5); |
26 | else if (!strncmp(argv[1], "/dev/", 5)) { | 26 | else if (!strncmp(argv[1], "/dev/", 5)) { |
27 | /* Just pass a device name right through. This might aid in some scripts | 27 | /* Just pass a device name right through. This might aid in some scripts |
28 | being able to call this unconditionally */ | 28 | being able to call this unconditionally */ |
29 | tmp = argv[1]; | 29 | tmp = argv[1]; |
30 | } else | 30 | } else |
31 | bb_show_usage(); | 31 | bb_show_usage(); |
32 | 32 | ||
33 | if (tmp) { | 33 | if (tmp) { |
34 | puts(tmp); | 34 | puts(tmp); |
35 | return 0; | 35 | return 0; |
36 | } | 36 | } |
37 | return 1; | 37 | return 1; |
38 | } | 38 | } |
diff --git a/util-linux/mount.c b/util-linux/mount.c index b19c3a3ef..902df34e0 100644 --- a/util-linux/mount.c +++ b/util-linux/mount.c | |||
@@ -248,6 +248,7 @@ static int verbose_mount(const char *source, const char *target, | |||
248 | #define verbose_mount(...) mount(__VA_ARGS__) | 248 | #define verbose_mount(...) mount(__VA_ARGS__) |
249 | #endif | 249 | #endif |
250 | 250 | ||
251 | #if ENABLE_FEATURE_MOUNT_LABEL | ||
251 | static int resolve_mount_spec(char **fsname) | 252 | static int resolve_mount_spec(char **fsname) |
252 | { | 253 | { |
253 | char *tmp = NULL; | 254 | char *tmp = NULL; |
@@ -263,6 +264,7 @@ static int resolve_mount_spec(char **fsname) | |||
263 | } | 264 | } |
264 | return 0; | 265 | return 0; |
265 | } | 266 | } |
267 | #endif | ||
266 | 268 | ||
267 | /* Append mount options to string */ | 269 | /* Append mount options to string */ |
268 | static void append_mount_options(char **oldopts, const char *newopts) | 270 | static void append_mount_options(char **oldopts, const char *newopts) |