Messages in this thread Patch in this message | | | From | Rasmus Villemoes <> | Subject | [PATCH 12/18] lib: bitmap: Simplify bitmap_parselist | Date | Fri, 4 Jul 2014 00:42:58 +0200 |
| |
We want len to be the index of the first '\n', or the length of the string if there is no newline. This is a good example of the usefulness of strchrnul(). Use that instead, thus eliminating a branch and a call to strlen().
Signed-off-by: Rasmus Villemoes <linux@rasmusvillemoes.dk> --- lib/bitmap.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-)
diff --git a/lib/bitmap.c b/lib/bitmap.c index 5d25403..d4b3a6d 100644 --- a/lib/bitmap.c +++ b/lib/bitmap.c @@ -665,13 +665,8 @@ static int __bitmap_parselist(const char *buf, unsigned int buflen, int bitmap_parselist(const char *bp, unsigned long *maskp, int nmaskbits) { - char *nl = strchr(bp, '\n'); - int len; - - if (nl) - len = nl - bp; - else - len = strlen(bp); + char *nl = strchrnul(bp, '\n'); + int len = nl - bp; return __bitmap_parselist(bp, len, 0, maskp, nmaskbits); } -- 1.9.2
| |