Extend the memparse() routine to allow a caller to use NULL as the
second parameter value if he has no interest in that returned value.
---
there appear to be quite a number of calls to "memparse" which have
no use for the value returned in the second parameter (the current
pointer after the successful parse), but which are still forced to
supply a valid char** address since they have no choice but to accept
that value coming back. in many cases, that value is accepted just
before the end of the calling function, making it clear that the value
is ignored entirely, anyway.
this patch simply allows NULL as a second parameter to show that the
caller has no interest in that returned value, and it makes that
visually more obvious as well. theoretically, this extension is
entirely backwards compatible.
compile-tested on i386. not boot-time tested yet, but i'm just
asking for feedback.
diff --git a/lib/cmdline.c b/lib/cmdline.c
index f596c08..53a668f 100644
--- a/lib/cmdline.c
+++ b/lib/cmdline.c
@@ -128,9 +128,11 @@ char *get_options(const char *str, int nints, int *ints)
unsigned long long memparse (char *ptr, char **retptr)
{
- unsigned long long ret = simple_strtoull (ptr, retptr, 0);
+ char *localptr;
- switch (**retptr) {
+ unsigned long long ret = simple_strtoull (ptr, &localptr, 0);
+
+ switch (*localptr) {
case 'G':
case 'g':
ret <<= 10;
@@ -140,10 +142,15 @@ unsigned long long memparse (char *ptr, char **retptr)
case 'K':
case 'k':
ret <<= 10;
- (*retptr)++;
+ localptr++;
default:
break;
}
+
+ if (retptr) {
+ *retptr = localptr;
+ }
+
return ret;
}
--
========================================================================
Robert P. J. Day
Linux Consulting, Training and Annoying Kernel Pedantry
Waterloo, Ontario, CANADA
http://crashcourse.ca
========================================================================
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[Index of Archives]
[Kernel Newbies]
[Netfilter]
[Bugtraq]
[Photo]
[Stuff]
[Gimp]
[Yosemite News]
[MIPS Linux]
[ARM Linux]
[Linux Security]
[Linux RAID]
[Video 4 Linux]
[Linux for the blind]
[Linux Resources]
