diff options
| author | Antony Pavlov <antonynpavlov@gmail.com> | 2018-01-15 00:22:49 +0300 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2018-01-17 10:44:30 +0100 |
| commit | ac9d377b90d6b6638c1e5e626d8da047b5c1274a (patch) | |
| tree | 629f259c982f30c43c928f9f46393e9e3d03f1c8 /fs | |
| parent | 76759ec94eb3a32d71c32550b6b50965125afd92 (diff) | |
| download | barebox-ac9d377b90d6b6638c1e5e626d8da047b5c1274a.tar.gz barebox-ac9d377b90d6b6638c1e5e626d8da047b5c1274a.tar.xz | |
move parseopt to lib/
Signed-off-by: Antony Pavlov <antonynpavlov@gmail.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/Makefile | 2 | ||||
| -rw-r--r-- | fs/fs.c | 3 | ||||
| -rw-r--r-- | fs/nfs.c | 3 | ||||
| -rw-r--r-- | fs/parseopt.c | 60 | ||||
| -rw-r--r-- | fs/parseopt.h | 2 |
5 files changed, 3 insertions, 67 deletions
diff --git a/fs/Makefile b/fs/Makefile index b3f929f506..8e3fd78e92 100644 --- a/fs/Makefile +++ b/fs/Makefile @@ -4,7 +4,7 @@ obj-$(CONFIG_FS_RAMFS) += ramfs.o obj-y += devfs-core.o obj-$(CONFIG_FS_DEVFS) += devfs.o obj-$(CONFIG_FS_FAT) += fat/ -obj-y += fs.o parseopt.o +obj-y += fs.o obj-$(CONFIG_FS_UBIFS) += ubifs/ obj-$(CONFIG_FS_TFTP) += tftp.o obj-$(CONFIG_FS_OMAP4_USBBOOT) += omap4_usbbootfs.o @@ -35,8 +35,7 @@ #include <libgen.h> #include <block.h> #include <libfile.h> - -#include "parseopt.h" +#include <parseopt.h> char *mkmodestr(unsigned long mode, char *str) { @@ -36,8 +36,7 @@ #include <linux/sizes.h> #include <byteorder.h> #include <globalvar.h> - -#include "parseopt.h" +#include <parseopt.h> #define SUNRPC_PORT 111 diff --git a/fs/parseopt.c b/fs/parseopt.c deleted file mode 100644 index 8ff83019a7..0000000000 --- a/fs/parseopt.c +++ /dev/null @@ -1,60 +0,0 @@ -#include <common.h> - -#include "parseopt.h" - -void parseopt_b(const char *options, const char *opt, bool *val) -{ - const char *start; - size_t optlen = strlen(opt); - -again: - start = strstr(options, opt); - - if (!start) { - *val = false; - return; - } - - if (start > options && start[-1] != ',') { - options = start; - goto again; - } - - if (start[optlen] != ',' && start[optlen] != '\0') { - options = start; - goto again; - } - - *val = true; -} - -void parseopt_hu(const char *options, const char *opt, unsigned short *val) -{ - const char *start; - size_t optlen = strlen(opt); - ulong v; - char *endp; - -again: - start = strstr(options, opt); - - if (!start) - return; - - if (start > options && start[-1] != ',') { - options = start; - goto again; - } - - if (start[optlen] != '=') { - options = start; - goto again; - } - - v = simple_strtoul(start + optlen + 1, &endp, 0); - if (v > USHRT_MAX) - return; - - if (*endp == ',' || *endp == '\0') - *val = v; -} diff --git a/fs/parseopt.h b/fs/parseopt.h deleted file mode 100644 index abf3be3f35..0000000000 --- a/fs/parseopt.h +++ /dev/null @@ -1,2 +0,0 @@ -void parseopt_b(const char *options, const char *opt, bool *val); -void parseopt_hu(const char *options, const char *opt, unsigned short *val); |