From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753397AbbFDJjq (ORCPT ); Thu, 4 Jun 2015 05:39:46 -0400 Received: from mail-la0-f45.google.com ([209.85.215.45]:35298 "EHLO mail-la0-f45.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753185AbbFDJhc (ORCPT ); Thu, 4 Jun 2015 05:37:32 -0400 From: Rasmus Villemoes To: Andrew Morton , Greg Kroah-Hartman Cc: Rasmus Villemoes , linux-kernel@vger.kernel.org Subject: [RFC/PATCH 4/8] lib/kobject.c: Use strreplace Date: Thu, 4 Jun 2015 11:37:11 +0200 Message-Id: <1433410636-26812-5-git-send-email-linux@rasmusvillemoes.dk> X-Mailer: git-send-email 2.1.3 In-Reply-To: <1433410636-26812-1-git-send-email-linux@rasmusvillemoes.dk> References: <1433410636-26812-1-git-send-email-linux@rasmusvillemoes.dk> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org There's probably not many slashes in kobj->name, but starting over when we see one feels wrong. Signed-off-by: Rasmus Villemoes --- lib/kobject.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/lib/kobject.c b/lib/kobject.c index 3b841b97fccd..597d962d3d4d 100644 --- a/lib/kobject.c +++ b/lib/kobject.c @@ -258,7 +258,6 @@ 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; @@ -270,8 +269,7 @@ int kobject_set_name_vargs(struct kobject *kobj, const char *fmt, } /* ewww... some of these buggers have '/' in the name ... */ - while ((s = strchr(kobj->name, '/'))) - s[0] = '!'; + strreplace((char *)kobj->name, '/', '!'); kfree(old_name); return 0; -- 2.1.3