diff options
author | Joe Perches <joe@perches.com> | 2015-09-11 16:07:48 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-09-11 18:21:34 -0400 |
commit | 6798a8caaf64fa68b9ab2044e070fe4545034e03 (patch) | |
tree | 0703bb5ad58e92d21c00a69359ba962ba4928740 /include | |
parent | c9946c4208a3725e116c05180d93154eb406d451 (diff) |
fs/seq_file: convert int seq_vprint/seq_printf/etc... returns to void
The seq_<foo> function return values were frequently misused.
See: commit 1f33c41c03da ("seq_file: Rename seq_overflow() to
seq_has_overflowed() and make public")
All uses of these return values have been removed, so convert the
return types to void.
Miscellanea:
o Move seq_put_decimal_<type> and seq_escape prototypes closer the
other seq_vprintf prototypes
o Reorder seq_putc and seq_puts to return early on overflow
o Add argument names to seq_vprintf and seq_printf
o Update the seq_escape kernel-doc
o Convert a couple of leading spaces to tabs in seq_escape
Signed-off-by: Joe Perches <joe@perches.com>
Cc: Al Viro <viro@ZenIV.linux.org.uk>
Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: Mark Brown <broonie@kernel.org>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Joerg Roedel <jroedel@suse.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'include')
-rw-r--r-- | include/linux/seq_file.h | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/include/linux/seq_file.h b/include/linux/seq_file.h index adeadbd6d7bf..dde00defbaa5 100644 --- a/include/linux/seq_file.h +++ b/include/linux/seq_file.h | |||
@@ -114,13 +114,18 @@ int seq_open(struct file *, const struct seq_operations *); | |||
114 | ssize_t seq_read(struct file *, char __user *, size_t, loff_t *); | 114 | ssize_t seq_read(struct file *, char __user *, size_t, loff_t *); |
115 | loff_t seq_lseek(struct file *, loff_t, int); | 115 | loff_t seq_lseek(struct file *, loff_t, int); |
116 | int seq_release(struct inode *, struct file *); | 116 | int seq_release(struct inode *, struct file *); |
117 | int seq_escape(struct seq_file *, const char *, const char *); | ||
118 | int seq_putc(struct seq_file *m, char c); | ||
119 | int seq_puts(struct seq_file *m, const char *s); | ||
120 | int seq_write(struct seq_file *seq, const void *data, size_t len); | 117 | int seq_write(struct seq_file *seq, const void *data, size_t len); |
121 | 118 | ||
122 | __printf(2, 3) int seq_printf(struct seq_file *, const char *, ...); | 119 | __printf(2, 0) |
123 | __printf(2, 0) int seq_vprintf(struct seq_file *, const char *, va_list args); | 120 | void seq_vprintf(struct seq_file *m, const char *fmt, va_list args); |
121 | __printf(2, 3) | ||
122 | void seq_printf(struct seq_file *m, const char *fmt, ...); | ||
123 | void seq_putc(struct seq_file *m, char c); | ||
124 | void seq_puts(struct seq_file *m, const char *s); | ||
125 | void seq_put_decimal_ull(struct seq_file *m, char delimiter, | ||
126 | unsigned long long num); | ||
127 | void seq_put_decimal_ll(struct seq_file *m, char delimiter, long long num); | ||
128 | void seq_escape(struct seq_file *m, const char *s, const char *esc); | ||
124 | 129 | ||
125 | void seq_hex_dump(struct seq_file *m, const char *prefix_str, int prefix_type, | 130 | void seq_hex_dump(struct seq_file *m, const char *prefix_str, int prefix_type, |
126 | int rowsize, int groupsize, const void *buf, size_t len, | 131 | int rowsize, int groupsize, const void *buf, size_t len, |
@@ -138,10 +143,6 @@ int single_release(struct inode *, struct file *); | |||
138 | void *__seq_open_private(struct file *, const struct seq_operations *, int); | 143 | void *__seq_open_private(struct file *, const struct seq_operations *, int); |
139 | int seq_open_private(struct file *, const struct seq_operations *, int); | 144 | int seq_open_private(struct file *, const struct seq_operations *, int); |
140 | int seq_release_private(struct inode *, struct file *); | 145 | int seq_release_private(struct inode *, struct file *); |
141 | int seq_put_decimal_ull(struct seq_file *m, char delimiter, | ||
142 | unsigned long long num); | ||
143 | int seq_put_decimal_ll(struct seq_file *m, char delimiter, | ||
144 | long long num); | ||
145 | 146 | ||
146 | static inline struct user_namespace *seq_user_ns(struct seq_file *seq) | 147 | static inline struct user_namespace *seq_user_ns(struct seq_file *seq) |
147 | { | 148 | { |