Commit d8fc9b66 authored by Masahiro Yamada's avatar Masahiro Yamada
Browse files

sysctl: use min() helper for namecmp() 



Make it slightly readable by using min().

Signed-off-by: default avatarMasahiro Yamada <masahiroy@kernel.org>
Acked-by: default avatarKees Cook <keescook@chromium.org>
parent c3d7ef37

fs/proc/proc_sysctl.c

+1 −6
Original line number Original line Diff line number Diff line
@@ -94,14 +94,9 @@ static void sysctl_print_dir(struct ctl_dir *dir) 




static int namecmp(const char *name1, int len1, const char *name2, int len2)

static int namecmp(const char *name1, int len1, const char *name2, int len2)

{

{

	int minlen;

	int cmp;

	int cmp;





	minlen = len1;

	cmp = memcmp(name1, name2, min(len1, len2));

	if (minlen > len2)

		minlen = len2;



	cmp = memcmp(name1, name2, minlen);

	if (cmp == 0)

	if (cmp == 0)

		cmp = len1 - len2;

		cmp = len1 - len2;

	return cmp;

	return cmp;