lkml.org 
[lkml]   [2018]   [Dec]   [7]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH v3 2/2] kobject: drop newline from msg string
Date
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;
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);
--
2.11.0
\
 
 \ /
  Last update: 2018-12-07 11:22    [W:0.356 / U:0.052 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site