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

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

lib/kobject.c: use strreplace() 



There's probably not many slashes in the name, but starting over when
we see one feels wrong.

Signed-off-by: default avatarRasmus Villemoes <linux@rasmusvillemoes.dk>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent ff14417c

lib/kobject.c

+5 −8
Original line number Diff line number Diff line
@@ -257,23 +257,20 @@ static int kobject_add_internal(struct kobject *kobj) 
int kobject_set_name_vargs(struct kobject *kobj, const char *fmt,

				  va_list vargs)

{

	const char *old_name = kobj->name;

	char *s;



	if (kobj->name && !fmt)

		return 0;



	kobj->name = kvasprintf(GFP_KERNEL, fmt, vargs);

	if (!kobj->name) {

		kobj->name = old_name;

	s = kvasprintf(GFP_KERNEL, fmt, vargs);

	if (!s)

		return -ENOMEM;

	}



	/* ewww... some of these buggers have '/' in the name ... */

	while ((s = strchr(kobj->name, '/')))

		s[0] = '!';

	strreplace(s, '/', '!');

	kfree(kobj->name);

	kobj->name = s;



	kfree(old_name);

	return 0;

}