From aa46922c09159d8315a35b81cacf30dcfb9243a5 Mon Sep 17 00:00:00 2001 From: David Sterba Date: Fri, 11 Apr 2014 13:22:50 +0200 Subject: btrfs-progs: move arg_strtou64 to a separate file for library Linking with libbtrfs fails because arg_strtou64 is not defined and we cannot just add utils.o to library objects because it's not library-clean. Reported-by: Arvin Schnell Reported-by: Anton Farygin Signed-off-by: David Sterba --- utils.c | 33 --------------------------------- 1 file changed, 33 deletions(-) (limited to 'utils.c') diff --git a/utils.c b/utils.c index 29953d9d..e130849c 100644 --- a/utils.c +++ b/utils.c @@ -1538,39 +1538,6 @@ scan_again: return 0; } -/* - * This function should be only used when parsing - * command arg, it won't return error to it's - * caller and rather exit directly just like usage(). - */ -u64 arg_strtou64(const char *str) -{ - u64 value; - char *ptr_parse_end = NULL; - - value = strtoull(str, &ptr_parse_end, 0); - if (ptr_parse_end && *ptr_parse_end != '\0') { - fprintf(stderr, "ERROR: %s is not a valid numeric value.\n", - str); - exit(1); - } - /* - * if we pass a negative number to strtoull, - * it will return an unexpected number to us, - * so let's do the check ourselves. - */ - if (str[0] == '-') { - fprintf(stderr, "ERROR: %s: negative value is invalid.\n", - str); - exit(1); - } - if (value == ULLONG_MAX) { - fprintf(stderr, "ERROR: %s is too large.\n", str); - exit(1); - } - return value; -} - u64 parse_size(char *s) { int i; -- cgit v1.2.3