[v3,2/2] kobject: drop newline from msg string
diff mbox series

Message ID f03d23a34df36d55274c5cce7d4081d9017668c1.1544175417.git.tsu.yubo@gmail.com
State New
Headers show
Series
  • kobject: trival fix
Related show

Commit Message

YU Bo Dec. 7, 2018, 10:21 a.m. UTC
There is currently a missing terminating newline in non-switch case
match, when msg == NULL.

Signed-off-by: Bo YU <tsu.yubo@gmail.com>
---
Changes in v3:
Improve the commit log,requested by rafael.

Changes in v2:
According to Joe's suggestion,drop newline from msg

 lib/kobject_uevent.c | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

--
2.11.0

Comments

Greg KH Dec. 7, 2018, 12:04 p.m. UTC | #1
On Fri, Dec 07, 2018 at 05:21:49AM -0500, Bo YU wrote:
> There is currently a missing terminating newline in non-switch case
> match, when msg == NULL.
> 
> Signed-off-by: Bo YU <tsu.yubo@gmail.com>
> ---
> Changes in v3:
> Improve the commit log,requested by rafael.
> 
> Changes in v2:
> According to Joe's suggestion,drop newline from msg
> 
>  lib/kobject_uevent.c | 11 ++++++-----
>  1 file changed, 6 insertions(+), 5 deletions(-)
> 
> diff --git a/lib/kobject_uevent.c b/lib/kobject_uevent.c
> index b7c088c902a2..1837765ebf01 100644
> --- a/lib/kobject_uevent.c
> +++ b/lib/kobject_uevent.c
> @@ -195,12 +195,12 @@ int kobject_synth_uevent(struct kobject *kobj, const char *buf, size_t count)
>  	enum kobject_action action;
>  	const char *action_args;
>  	struct kobj_uevent_env *env;
> -	const char *msg = NULL, *devpath;
> +	const char *msg = NULL;

Why did you move the devpath variable from here to lower down?  That
really doesn't do anything :(

thanks,

greg k-h
YU Bo Dec. 7, 2018, 2:43 p.m. UTC | #2
On Fri, Dec 07, 2018 at 01:04:05PM +0100, Greg KH wrote:
>On Fri, Dec 07, 2018 at 05:21:49AM -0500, Bo YU wrote:
>> There is currently a missing terminating newline in non-switch case
>> match, when msg == NULL.
>>
>> Signed-off-by: Bo YU <tsu.yubo@gmail.com>
>> ---
>> Changes in v3:
>> Improve the commit log,requested by rafael.
>>
>> Changes in v2:
>> According to Joe's suggestion,drop newline from msg
>>
>>  lib/kobject_uevent.c | 11 ++++++-----
>>  1 file changed, 6 insertions(+), 5 deletions(-)
>>
>> diff --git a/lib/kobject_uevent.c b/lib/kobject_uevent.c
>> index b7c088c902a2..1837765ebf01 100644
>> --- a/lib/kobject_uevent.c
>> +++ b/lib/kobject_uevent.c
>> @@ -195,12 +195,12 @@ int kobject_synth_uevent(struct kobject *kobj, const char *buf, size_t count)
>>  	enum kobject_action action;
>>  	const char *action_args;
>>  	struct kobj_uevent_env *env;
>> -	const char *msg = NULL, *devpath;
>> +	const char *msg = NULL;
>
>Why did you move the devpath variable from here to lower down?  That
>really doesn't do anything :(
Hm...If i resend the one patch will be ok?
Or whole series?
>
>thanks,
>
>greg k-h

Patch
diff mbox series

diff --git a/lib/kobject_uevent.c b/lib/kobject_uevent.c
index b7c088c902a2..1837765ebf01 100644
--- a/lib/kobject_uevent.c
+++ b/lib/kobject_uevent.c
@@ -195,12 +195,12 @@  int kobject_synth_uevent(struct kobject *kobj, const char *buf, size_t count)
 	enum kobject_action action;
 	const char *action_args;
 	struct kobj_uevent_env *env;
-	const char *msg = NULL, *devpath;
+	const char *msg = NULL;
 	int r;

 	r = kobject_action_type(buf, count, &action, &action_args);
 	if (r) {
-		msg = "unknown uevent action string\n";
+		msg = "unknown uevent action string";
 		goto out;
 	}

@@ -212,7 +212,7 @@  int kobject_synth_uevent(struct kobject *kobj, const char *buf, size_t count)
 	r = kobject_action_args(action_args,
 				count - (action_args - buf), &env);
 	if (r == -EINVAL) {
-		msg = "incorrect uevent action arguments\n";
+		msg = "incorrect uevent action arguments";
 		goto out;
 	}

@@ -223,8 +223,9 @@  int kobject_synth_uevent(struct kobject *kobj, const char *buf, size_t count)
 	kfree(env);
 out:
 	if (r) {
-		devpath = kobject_get_path(kobj, GFP_KERNEL);
-		pr_warn("synth uevent: %s: %s",
+		char *devpath = kobject_get_path(kobj, GFP_KERNEL);
+
+		pr_warn("synth uevent: %s: %s\n",
 		       devpath ?: "unknown device",
 		       msg ?: "failed to send uevent");
 		kfree(devpath);