From ac9d377b90d6b6638c1e5e626d8da047b5c1274a Mon Sep 17 00:00:00 2001
From: Antony Pavlov <antonynpavlov@gmail.com>
Date: Mon, 15 Jan 2018 00:22:49 +0300
Subject: move parseopt to lib/

Signed-off-by: Antony Pavlov <antonynpavlov@gmail.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
 fs/Makefile   |  2 +-
 fs/fs.c       |  3 +--
 fs/nfs.c      |  3 +--
 fs/parseopt.c | 60 -----------------------------------------------------------
 fs/parseopt.h |  2 --
 5 files changed, 3 insertions(+), 67 deletions(-)
 delete mode 100644 fs/parseopt.c
 delete mode 100644 fs/parseopt.h

(limited to 'fs')

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
diff --git a/fs/fs.c b/fs/fs.c
index f61ee091b5..ccb4943669 100644
--- a/fs/fs.c
+++ b/fs/fs.c
@@ -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)
 {
diff --git a/fs/nfs.c b/fs/nfs.c
index 97f01cfb34..75cd127eeb 100644
--- a/fs/nfs.c
+++ b/fs/nfs.c
@@ -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);
-- 
cgit v1.2.3