From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753619AbbIPOV5 (ORCPT ); Wed, 16 Sep 2015 10:21:57 -0400 Received: from mga02.intel.com ([134.134.136.20]:15239 "EHLO mga02.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752227AbbIPOV4 (ORCPT ); Wed, 16 Sep 2015 10:21:56 -0400 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.17,539,1437462000"; d="scan'208";a="562839982" From: Andy Shevchenko To: Andrew Morton , linux-kernel@vger.kernel.org, Alexander Viro Cc: Andy Shevchenko Subject: [PATCH 1/1] seq_file: re-use string_escape_str() Date: Wed, 16 Sep 2015 17:21:52 +0300 Message-Id: <1442413312-123426-1-git-send-email-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.5.1 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org strint_escape_str() escapes input string by given criteria. In case of seq_escape() the criteria is to convert some characters to their octal representation. While here, convert return type to void like the rest similar functions already do. Signed-off-by: Andy Shevchenko --- fs/seq_file.c | 33 +++++++++++---------------------- include/linux/seq_file.h | 2 +- 2 files changed, 12 insertions(+), 23 deletions(-) diff --git a/fs/seq_file.c b/fs/seq_file.c index a68b160..b9dca58 100644 --- a/fs/seq_file.c +++ b/fs/seq_file.c @@ -12,6 +12,7 @@ #include #include #include +#include #include #include @@ -366,32 +367,20 @@ EXPORT_SYMBOL(seq_release); * @esc: set of characters that need escaping * * Puts string into buffer, replacing each occurrence of character from - * @esc with usual octal escape. Returns 0 in case of success, -1 - in - * case of overflow. + * @esc with usual octal escape. Sets on overflow flag in case of + * overflow. */ -int seq_escape(struct seq_file *m, const char *s, const char *esc) +void seq_escape(struct seq_file *m, const char *s, const char *esc) { - char *end = m->buf + m->size; - char *p; - char c; + char *buf; + size_t size = seq_get_buf(s, &buf); + int ret; - for (p = m->buf + m->count; (c = *s) != '\0' && p < end; s++) { - if (!strchr(esc, c)) { - *p++ = c; - continue; - } - if (p + 3 < end) { - *p++ = '\\'; - *p++ = '0' + ((c & 0300) >> 6); - *p++ = '0' + ((c & 070) >> 3); - *p++ = '0' + (c & 07); - continue; - } + ret = string_escape_str(s, buf, size, ESCAPE_OCTAL, esc); + if (ret < size) + m->count += ret; + else seq_set_overflow(m); - return -1; - } - m->count = p - m->buf; - return 0; } EXPORT_SYMBOL(seq_escape); diff --git a/include/linux/seq_file.h b/include/linux/seq_file.h index 2b36048..4f5c8b9 100644 --- a/include/linux/seq_file.h +++ b/include/linux/seq_file.h @@ -119,7 +119,7 @@ int seq_open(struct file *, const struct seq_operations *); ssize_t seq_read(struct file *, char __user *, size_t, loff_t *); loff_t seq_lseek(struct file *, loff_t, int); int seq_release(struct inode *, struct file *); -int seq_escape(struct seq_file *, const char *, const char *); +void seq_escape(struct seq_file *, const char *, const char *); int seq_putc(struct seq_file *m, char c); int seq_puts(struct seq_file *m, const char *s); int seq_write(struct seq_file *seq, const void *data, size_t len); -- 2.5.1