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

Commit 5fd637e7 authored by Rastislav Barlik's avatar Rastislav Barlik Committed by Greg Kroah-Hartman
Browse files

samples/kobject: Use kstrtoint instead of sscanf 



Use kstrtoint function instead of sscanf and check for return values.

Signed-off-by: default avatarRastislav Barlik <barlik@zoho.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 1c34203a

samples/kobject/kobject-example.c

+11 −3
Original line number Diff line number Diff line
@@ -36,7 +36,12 @@ static ssize_t foo_show(struct kobject *kobj, struct kobj_attribute *attr, 
static ssize_t foo_store(struct kobject *kobj, struct kobj_attribute *attr,

			 const char *buf, size_t count)

{

	sscanf(buf, "%du", &foo);

	int ret;



	ret = kstrtoint(buf, 10, &foo);

	if (ret < 0)

		return ret;



	return count;

}
@@ -63,9 +68,12 @@ static ssize_t b_show(struct kobject *kobj, struct kobj_attribute *attr, 
static ssize_t b_store(struct kobject *kobj, struct kobj_attribute *attr,

		       const char *buf, size_t count)

{

	int var;

	int var, ret;



	ret = kstrtoint(buf, 10, &var);

	if (ret < 0)

		return ret;



	sscanf(buf, "%du", &var);

	if (strcmp(attr->attr.name, "baz") == 0)

		baz = var;

	else

samples/kobject/kset-example.c

+11 −3
Original line number Diff line number Diff line
@@ -120,7 +120,12 @@ static ssize_t foo_show(struct foo_obj *foo_obj, struct foo_attribute *attr, 
static ssize_t foo_store(struct foo_obj *foo_obj, struct foo_attribute *attr,

			 const char *buf, size_t count)

{

	sscanf(buf, "%du", &foo_obj->foo);

	int ret;



	ret = kstrtoint(buf, 10, &foo_obj->foo);

	if (ret < 0)

		return ret;



	return count;

}
@@ -147,9 +152,12 @@ static ssize_t b_show(struct foo_obj *foo_obj, struct foo_attribute *attr, 
static ssize_t b_store(struct foo_obj *foo_obj, struct foo_attribute *attr,

		       const char *buf, size_t count)

{

	int var;

	int var, ret;



	ret = kstrtoint(buf, 10, &var);

	if (ret < 0)

		return ret;



	sscanf(buf, "%du", &var);

	if (strcmp(attr->attr.name, "baz") == 0)

		foo_obj->baz = var;

	else