From: Jan Beulich <jbeulich@suse.com>
To: "xen-devel@lists.xenproject.org" <xen-devel@lists.xenproject.org>
Cc: Andrew Cooper <andrew.cooper3@citrix.com>,
George Dunlap <George.Dunlap@eu.citrix.com>,
Ian Jackson <iwj@xenproject.org>, Julien Grall <julien@xen.org>,
Wei Liu <wl@xen.org>, Stefano Stabellini <sstabellini@kernel.org>
Subject: [PATCH 5/9] lib: move parse_size_and_unit()
Date: Mon, 14 Sep 2020 12:17:20 +0200 [thread overview]
Message-ID: <823c1802-9a61-4059-c6a8-61f5c2fad12c@suse.com> (raw)
In-Reply-To: <aabca463-21ed-3755-0e8d-908069f40d6e@suse.com>
... into its own CU, to build it into an archive.
Signed-off-by: Jan Beulich <jbeulich@suse.com>
---
xen/common/lib.c | 39 ----------------------------------
xen/lib/Makefile | 1 +
xen/lib/parse-size.c | 50 ++++++++++++++++++++++++++++++++++++++++++++
3 files changed, 51 insertions(+), 39 deletions(-)
create mode 100644 xen/lib/parse-size.c
diff --git a/xen/common/lib.c b/xen/common/lib.c
index a224efa8f6e8..6cfa332142a5 100644
--- a/xen/common/lib.c
+++ b/xen/common/lib.c
@@ -423,45 +423,6 @@ uint64_t muldiv64(uint64_t a, uint32_t b, uint32_t c)
#endif
}
-unsigned long long parse_size_and_unit(const char *s, const char **ps)
-{
- unsigned long long ret;
- const char *s1;
-
- ret = simple_strtoull(s, &s1, 0);
-
- switch ( *s1 )
- {
- case 'T': case 't':
- ret <<= 10;
- /* fallthrough */
- case 'G': case 'g':
- ret <<= 10;
- /* fallthrough */
- case 'M': case 'm':
- ret <<= 10;
- /* fallthrough */
- case 'K': case 'k':
- ret <<= 10;
- /* fallthrough */
- case 'B': case 'b':
- s1++;
- break;
- case '%':
- if ( ps )
- break;
- /* fallthrough */
- default:
- ret <<= 10; /* default to kB */
- break;
- }
-
- if ( ps != NULL )
- *ps = s1;
-
- return ret;
-}
-
typedef void (*ctor_func_t)(void);
extern const ctor_func_t __ctors_start[], __ctors_end[];
diff --git a/xen/lib/Makefile b/xen/lib/Makefile
index 764f3624b5f9..99f857540c99 100644
--- a/xen/lib/Makefile
+++ b/xen/lib/Makefile
@@ -2,3 +2,4 @@ obj-$(CONFIG_X86) += x86/
lib-y += ctype.o
lib-y += list-sort.o
+lib-y += parse-size.o
diff --git a/xen/lib/parse-size.c b/xen/lib/parse-size.c
new file mode 100644
index 000000000000..ec980cadfff3
--- /dev/null
+++ b/xen/lib/parse-size.c
@@ -0,0 +1,50 @@
+#include <xen/lib.h>
+
+unsigned long long parse_size_and_unit(const char *s, const char **ps)
+{
+ unsigned long long ret;
+ const char *s1;
+
+ ret = simple_strtoull(s, &s1, 0);
+
+ switch ( *s1 )
+ {
+ case 'T': case 't':
+ ret <<= 10;
+ /* fallthrough */
+ case 'G': case 'g':
+ ret <<= 10;
+ /* fallthrough */
+ case 'M': case 'm':
+ ret <<= 10;
+ /* fallthrough */
+ case 'K': case 'k':
+ ret <<= 10;
+ /* fallthrough */
+ case 'B': case 'b':
+ s1++;
+ break;
+ case '%':
+ if ( ps )
+ break;
+ /* fallthrough */
+ default:
+ ret <<= 10; /* default to kB */
+ break;
+ }
+
+ if ( ps != NULL )
+ *ps = s1;
+
+ return ret;
+}
+
+/*
+ * Local variables:
+ * mode: C
+ * c-file-style: "BSD"
+ * c-basic-offset: 4
+ * tab-width: 4
+ * indent-tabs-mode: nil
+ * End:
+ */
--
2.22.0
next prev parent reply other threads:[~2020-09-14 10:17 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-14 10:12 [PATCH 0/9] xen: beginnings of moving library-like code into an archive Jan Beulich
2020-09-14 10:15 ` [PATCH 1/9] build: use if_changed more consistently (and correctly) for prelink*.o Jan Beulich
2020-09-15 11:56 ` Roger Pau Monné
2020-09-15 12:26 ` Jan Beulich
2020-09-15 13:46 ` Roger Pau Monné
2020-09-15 15:14 ` Jan Beulich
2020-09-21 10:17 ` Ping: " Jan Beulich
2020-09-21 11:39 ` Julien Grall
2020-09-22 8:28 ` Jan Beulich
2020-09-22 9:24 ` Julien Grall
2020-09-22 10:55 ` Jan Beulich
2020-09-22 11:47 ` Julien Grall
2020-09-22 17:40 ` Stefano Stabellini
2020-09-14 10:16 ` [PATCH 2/9] lib: split _ctype[] into its own object, under lib/ Jan Beulich
2020-09-14 10:16 ` [PATCH 3/9] lib: collect library files in an archive Jan Beulich
2020-09-14 10:16 ` [PATCH 4/9] lib: move list sorting code Jan Beulich
2020-09-14 10:17 ` Jan Beulich [this message]
2020-09-22 19:41 ` [PATCH 5/9] lib: move parse_size_and_unit() Andrew Cooper
2020-09-24 7:04 ` Jan Beulich
2020-09-14 10:17 ` [PATCH 6/9] lib: move init_constructors() Jan Beulich
2020-09-14 10:18 ` [PATCH 7/9] lib: move rbtree code Jan Beulich
2020-09-14 10:18 ` [PATCH 8/9] lib: move bsearch code Jan Beulich
2020-09-22 19:34 ` Andrew Cooper
2020-09-24 7:09 ` Jan Beulich
2020-09-14 10:18 ` [PATCH 9/9] lib: move sort code Jan Beulich
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=823c1802-9a61-4059-c6a8-61f5c2fad12c@suse.com \
--to=jbeulich@suse.com \
--cc=George.Dunlap@eu.citrix.com \
--cc=andrew.cooper3@citrix.com \
--cc=iwj@xenproject.org \
--cc=julien@xen.org \
--cc=sstabellini@kernel.org \
--cc=wl@xen.org \
--cc=xen-devel@lists.xenproject.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).