Messages in this thread Patch in this message | | | Date | Wed, 8 Apr 2009 15:06:34 GMT | From | Zhaolei <> | Subject | [tip:core/urgent] printk: fix wrong format string iter for printk |
| |
Commit-ID: 022624a758dc9489388a99ad29577b4c8c09237c Gitweb: http://git.kernel.org/tip/022624a758dc9489388a99ad29577b4c8c09237c Author: Zhaolei <zhaolei@cn.fujitsu.com> AuthorDate: Fri, 27 Mar 2009 17:09:10 +0800 Committer: Ingo Molnar <mingo@elte.hu> CommitDate: Wed, 8 Apr 2009 17:03:44 +0200
printk: fix wrong format string iter for printk
printk("%Q");
Output before patch: %QQ Output after patch: %Q
Signed-off-by: Zhao Lei <zhaolei@cn.fujitsu.com> Acked-by: Lai Jiangshan <laijs@cn.fujitsu.com> Acked-by: Frederic Weisbecker <fweisbec@gmail.com> Cc: torvalds@linux-foundation.org Cc: Steven Rostedt <rostedt@goodmis.org> LKML-Reference: <49CC97B6.7040809@cn.fujitsu.com> Signed-off-by: Ingo Molnar <mingo@elte.hu>
--- lib/vsprintf.c | 16 ---------------- 1 files changed, 0 insertions(+), 16 deletions(-)
diff --git a/lib/vsprintf.c b/lib/vsprintf.c index be3001f..7536ace 100644 --- a/lib/vsprintf.c +++ b/lib/vsprintf.c @@ -1051,13 +1051,6 @@ int vsnprintf(char *buf, size_t size, const char *fmt, va_list args) if (str < end) *str = '%'; ++str; - if (*fmt) { - if (str < end) - *str = *fmt; - ++str; - } else { - --fmt; - } break; case FORMAT_TYPE_NRCHARS: { @@ -1339,8 +1332,6 @@ do { \ break; case FORMAT_TYPE_INVALID: - if (!*fmt) - --fmt; break; case FORMAT_TYPE_NRCHARS: { @@ -1523,13 +1514,6 @@ int bstr_printf(char *buf, size_t size, const char *fmt, const u32 *bin_buf) if (str < end) *str = '%'; ++str; - if (*fmt) { - if (str < end) - *str = *fmt; - ++str; - } else { - --fmt; - } break; case FORMAT_TYPE_NRCHARS:
| |