[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-ID: <48F43D68.40300@cn.fujitsu.com>
Date: Tue, 14 Oct 2008 14:34:16 +0800
From: Li Zefan <lizf@...fujitsu.com>
To: Jens Axboe <jens.axboe@...cle.com>
CC: LKML <linux-kernel@...r.kernel.org>
Subject: [PATCH] block: simplify string handling in elv_iosched_store()
strlcpy() guarantees the dest buffer is NULL teminated.
Signed-off-by: Li Zefan <lizf@...fujitsu.com>
---
block/elevator.c | 9 ++-------
1 files changed, 2 insertions(+), 7 deletions(-)
diff --git a/block/elevator.c b/block/elevator.c
index 0451892..9482ffa 100644
--- a/block/elevator.c
+++ b/block/elevator.c
@@ -1166,15 +1166,10 @@ ssize_t elv_iosched_store(struct request_queue *q, const char *name,
size_t count)
{
char elevator_name[ELV_NAME_MAX];
- size_t len;
struct elevator_type *e;
- elevator_name[sizeof(elevator_name) - 1] = '\0';
- strncpy(elevator_name, name, sizeof(elevator_name) - 1);
- len = strlen(elevator_name);
-
- if (len && elevator_name[len - 1] == '\n')
- elevator_name[len - 1] = '\0';
+ strlcpy(elevator_name, name, sizeof(elevator_name));
+ strstrip(elevator_name);
e = elevator_get(elevator_name);
if (!e) {
--
1.5.4.rc3
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists