Mailing List Archive

ChangeSet 1.1466.1.2, 2005/05/19 22:11:51+01:00, kaf24@firebug.cl.cam.ac.uk

Rename memparse() to parse_size_and_unit(). A more general-purpose
name, and avoids unecessary clash with Linux function name.
Signed-off-by: Keir Fraser <keir@xensource.com>



arch/x86/domain_build.c | 2 +-
arch/x86/e820.c | 2 +-
common/lib.c | 2 +-
include/xen/lib.h | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)


diff -Nru a/xen/arch/x86/domain_build.c b/xen/arch/x86/domain_build.c
--- a/xen/arch/x86/domain_build.c 2005-05-19 18:03:56 -04:00
+++ b/xen/arch/x86/domain_build.c 2005-05-19 18:03:56 -04:00
@@ -26,7 +26,7 @@
static unsigned int opt_dom0_mem;
static void parse_dom0_mem(char *s)
{
- unsigned long long bytes = memparse(s);
+ unsigned long long bytes = parse_size_and_unit(s);
/* If no unit is specified we default to kB units, not bytes. */
if ( isdigit(s[strlen(s)-1]) )
opt_dom0_mem = (unsigned int)bytes;
diff -Nru a/xen/arch/x86/e820.c b/xen/arch/x86/e820.c
--- a/xen/arch/x86/e820.c 2005-05-19 18:03:56 -04:00
+++ b/xen/arch/x86/e820.c 2005-05-19 18:03:56 -04:00
@@ -5,7 +5,7 @@

/* opt_mem: Limit of physical RAM. Any RAM beyond this point is ignored. */
unsigned long long opt_mem;
-static void parse_mem(char *s) { opt_mem = memparse(s); }
+static void parse_mem(char *s) { opt_mem = parse_size_and_unit(s); }
custom_param("mem", parse_mem);

struct e820map e820;
diff -Nru a/xen/common/lib.c b/xen/common/lib.c
--- a/xen/common/lib.c 2005-05-19 18:03:56 -04:00
+++ b/xen/common/lib.c 2005-05-19 18:03:56 -04:00
@@ -441,7 +441,7 @@

#endif /* BITS_PER_LONG == 32 */

-unsigned long long memparse(char *s)
+unsigned long long parse_size_and_unit(char *s)
{
unsigned long long ret = simple_strtoull(s, &s, 0);

diff -Nru a/xen/include/xen/lib.h b/xen/include/xen/lib.h
--- a/xen/include/xen/lib.h 2005-05-19 18:03:56 -04:00
+++ b/xen/include/xen/lib.h 2005-05-19 18:03:56 -04:00
@@ -66,6 +66,6 @@
unsigned long long simple_strtoull(
const char *cp,char **endp, unsigned int base);

-unsigned long long memparse(char *s);
+unsigned long long parse_size_and_unit(char *s);

#endif /* __LIB_H__ */

_______________________________________________
Xen-changelog mailing list
Xen-changelog@lists.xensource.com
http://lists.xensource.com/xen-changelog