All of lore.kernel.org
 help / color / mirror / Atom feed
From: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
To: "J. Bruce Fields" <bfields@redhat.com>,
	Andy Shevchenko <andriy.shevchenko@linux.intel.com>,
	linux-kernel@vger.kernel.org, linux-nfs@vger.kernel.org,
	linux-fsdevel@vger.kernel.org
Cc: "J. Bruce Fields" <bfields@fieldses.org>,
	Chuck Lever <chuck.lever@oracle.com>,
	Alexander Viro <viro@zeniv.linux.org.uk>,
	Andy Shevchenko <andy@kernel.org>,
	Andrew Morton <akpm@linux-foundation.org>
Subject: [PATCH v2 14/14] seq_file: Drop unused *_escape_mem_ascii()
Date: Tue,  4 May 2021 13:26:48 +0300	[thread overview]
Message-ID: <20210504102648.88057-15-andriy.shevchenko@linux.intel.com> (raw)
In-Reply-To: <20210504102648.88057-1-andriy.shevchenko@linux.intel.com>

There are no more users of the seq_escape_mem_ascii()
followed by string_escape_mem_ascii().

Remove them for good.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
---
 fs/seq_file.c                  | 11 -----------
 include/linux/seq_file.h       |  2 --
 include/linux/string_helpers.h |  3 ---
 lib/string_helpers.c           | 19 -------------------
 4 files changed, 35 deletions(-)

diff --git a/fs/seq_file.c b/fs/seq_file.c
index d78801403a2f..f8335e5a0ce5 100644
--- a/fs/seq_file.c
+++ b/fs/seq_file.c
@@ -380,17 +380,6 @@ void seq_escape_mem(struct seq_file *m, const char *src, size_t len,
 }
 EXPORT_SYMBOL(seq_escape_mem);
 
-void seq_escape_mem_ascii(struct seq_file *m, const char *src, size_t isz)
-{
-	char *buf;
-	size_t size = seq_get_buf(m, &buf);
-	int ret;
-
-	ret = string_escape_mem_ascii(src, isz, buf, size);
-	seq_commit(m, ret < size ? ret : -1);
-}
-EXPORT_SYMBOL(seq_escape_mem_ascii);
-
 void seq_vprintf(struct seq_file *m, const char *f, va_list args)
 {
 	int len;
diff --git a/include/linux/seq_file.h b/include/linux/seq_file.h
index 0b3a6096bed3..c79fffe0f1e1 100644
--- a/include/linux/seq_file.h
+++ b/include/linux/seq_file.h
@@ -146,8 +146,6 @@ static inline void seq_escape(struct seq_file *m, const char *s, const char *esc
 	seq_escape_mem(m, s, strlen(s), ESCAPE_OCTAL, esc);
 }
 
-void seq_escape_mem_ascii(struct seq_file *m, const char *src, size_t isz);
-
 void seq_hex_dump(struct seq_file *m, const char *prefix_str, int prefix_type,
 		  int rowsize, int groupsize, const void *buf, size_t len,
 		  bool ascii);
diff --git a/include/linux/string_helpers.h b/include/linux/string_helpers.h
index 9b0eca2badf2..68189c4a2eb1 100644
--- a/include/linux/string_helpers.h
+++ b/include/linux/string_helpers.h
@@ -63,9 +63,6 @@ static inline int string_unescape_any_inplace(char *buf)
 int string_escape_mem(const char *src, size_t isz, char *dst, size_t osz,
 		unsigned int flags, const char *only);
 
-int string_escape_mem_ascii(const char *src, size_t isz, char *dst,
-					size_t osz);
-
 static inline int string_escape_mem_any_np(const char *src, size_t isz,
 		char *dst, size_t osz, const char *only)
 {
diff --git a/lib/string_helpers.c b/lib/string_helpers.c
index c15aea7a82e9..5a35c7e16e96 100644
--- a/lib/string_helpers.c
+++ b/lib/string_helpers.c
@@ -582,25 +582,6 @@ int string_escape_mem(const char *src, size_t isz, char *dst, size_t osz,
 }
 EXPORT_SYMBOL(string_escape_mem);
 
-int string_escape_mem_ascii(const char *src, size_t isz, char *dst,
-					size_t osz)
-{
-	char *p = dst;
-	char *end = p + osz;
-
-	while (isz--) {
-		unsigned char c = *src++;
-
-		if (!isprint(c) || !isascii(c) || c == '"' || c == '\\')
-			escape_hex(c, &p, end);
-		else
-			escape_passthrough(c, &p, end);
-	}
-
-	return p - dst;
-}
-EXPORT_SYMBOL(string_escape_mem_ascii);
-
 /*
  * Return an allocated string that has been escaped of special characters
  * and double quotes, making it safe to log in quotes.
-- 
2.30.2


      parent reply	other threads:[~2021-05-04 10:27 UTC|newest]

Thread overview: 24+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-05-04 10:26 [PATCH v2 00/14] lib/string_helpers: get rid of ugly *_escape_mem_ascii() Andy Shevchenko
2021-05-04 10:26 ` [PATCH v2 01/14] lib/string_helpers: Switch to use BIT() macro Andy Shevchenko
2021-05-04 10:26 ` [PATCH v2 02/14] lib/string_helpers: Move ESCAPE_NP check inside 'else' branch in a loop Andy Shevchenko
2021-05-04 10:26 ` [PATCH v2 03/14] lib/string_helpers: Drop indentation level in string_escape_mem() Andy Shevchenko
2021-05-04 10:26 ` [PATCH v2 04/14] lib/string_helpers: Introduce ESCAPE_NA for escaping non-ASCII Andy Shevchenko
2021-05-04 10:26 ` [PATCH v2 05/14] lib/string_helpers: Introduce ESCAPE_NAP to escape non-ASCII and non-printable Andy Shevchenko
2021-05-04 10:26 ` [PATCH v2 06/14] lib/string_helpers: Allow to append additional characters to be escaped Andy Shevchenko
2021-05-04 10:26 ` [PATCH v2 07/14] lib/test-string_helpers: Print flags in hexadecimal format Andy Shevchenko
2021-05-04 10:26 ` [PATCH v2 08/14] lib/test-string_helpers: Get rid of trailing comma in terminators Andy Shevchenko
2021-05-04 10:26 ` [PATCH v2 09/14] lib/test-string_helpers: Add test cases for new features Andy Shevchenko
2021-05-04 10:26 ` [PATCH v2 10/14] MAINTAINERS: Add myself as designated reviewer for generic string library Andy Shevchenko
2021-05-04 10:26 ` [PATCH v2 11/14] seq_file: Introduce seq_escape_mem() Andy Shevchenko
2021-05-04 10:26 ` [PATCH v2 12/14] seq_file: Replace seq_escape() with inliner Andy Shevchenko
2021-05-04 12:41   ` kernel test robot
2021-05-04 12:41     ` kernel test robot
2021-05-04 13:17   ` kernel test robot
2021-05-04 13:17     ` kernel test robot
2021-05-04 13:53     ` Andy Shevchenko
2021-05-04 13:53       ` Andy Shevchenko
2021-05-04 15:54   ` kernel test robot
2021-05-04 15:54     ` kernel test robot
2021-05-04 16:26   ` Andy Shevchenko
2021-05-04 10:26 ` [PATCH v2 13/14] nfsd: Avoid non-flexible API in seq_quote_mem() Andy Shevchenko
2021-05-04 10:26 ` Andy Shevchenko [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20210504102648.88057-15-andriy.shevchenko@linux.intel.com \
    --to=andriy.shevchenko@linux.intel.com \
    --cc=akpm@linux-foundation.org \
    --cc=andy@kernel.org \
    --cc=bfields@fieldses.org \
    --cc=bfields@redhat.com \
    --cc=chuck.lever@oracle.com \
    --cc=linux-fsdevel@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-nfs@vger.kernel.org \
    --cc=viro@zeniv.linux.org.uk \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.