Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bc5be182 authored by Rasmus Villemoes's avatar Rasmus Villemoes Committed by Linus Torvalds
Browse files

lib: bitmap: simplify bitmap_parselist 



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: default avatarRasmus Villemoes <linux@rasmusvillemoes.dk>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 154f5e38

lib/bitmap.c

+2 −7
Original line number Diff line number Diff line
@@ -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);

}