Skip to content

Commit

Permalink
seq_file: drop unused *_escape_mem_ascii()
Browse files Browse the repository at this point in the history
There are no more users of the seq_escape_mem_ascii() followed by
string_escape_mem_ascii().

Remove them for good.

Link: https://lkml.kernel.org/r/[email protected]
Signed-off-by: Andy Shevchenko <[email protected]>
Cc: Alexander Viro <[email protected]>
Cc: Chuck Lever <[email protected]>
Cc: "J. Bruce Fields" <[email protected]>
Signed-off-by: Andrew Morton <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>
  • Loading branch information
andy-shev authored and torvalds committed Jul 1, 2021
1 parent c054639 commit cc72181
Show file tree
Hide file tree
Showing 4 changed files with 0 additions and 34 deletions.
11 changes: 0 additions & 11 deletions fs/seq_file.c
Original file line number Diff line number Diff line change
Expand Up @@ -396,17 +396,6 @@ void seq_escape(struct seq_file *m, const char *s, const char *esc)
}
EXPORT_SYMBOL(seq_escape);

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;
Expand Down
1 change: 0 additions & 1 deletion include/linux/seq_file.h
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,6 @@ static inline void seq_escape_str(struct seq_file *m, const char *src,
}

void seq_escape(struct seq_file *m, const char *s, const char *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,
Expand Down
3 changes: 0 additions & 3 deletions include/linux/string_helpers.h
Original file line number Diff line number Diff line change
Expand Up @@ -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)
{
Expand Down
19 changes: 0 additions & 19 deletions lib/string_helpers.c
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down

0 comments on commit cc72181

Please sign in to comment.