seq_file: re-use string_escape_str()
PATCH 1/1 seq_file: re-use string_escape_str()
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 <[email protected]>
--- fs/seq_file.c | 33 +++++++++++---------------------- include/linux/seq_file.h | 2 +- 2 files changed, 12 insertions(+), 23 deletions(-)
fs/seq_file.c +11 -22
@@ -12,6 +12,7 @@#include <linux/slab.h> #include <linux/cred.h> #include <linux/mm.h> +#include <linux/string_helpers.h> #include <asm/uaccess.h> #include <asm/page.h>
@@ -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);
include/linux/seq_file.h +1 -1
@@ -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);
Signature · 1 line
2.5.1