From: Oleg Nesterov <oleg@redhat.com>
To: Andrew Morton <akpm@linux-foundation.org>
Cc: Andi Kleen <andi@firstfloor.org>,
Colin Walters <walters@verbum.org>,
Denys Vlasenko <vda.linux@googlemail.com>,
Jiri Slaby <jslaby@suse.cz>,
Lennart Poettering <mzxreary@0pointer.de>,
Lucas De Marchi <lucas.de.marchi@gmail.com>,
Neil Horman <nhorman@tuxdriver.com>,
linux-kernel@vger.kernel.org
Subject: [PATCH 2/6] coredump: introduce cn_vprintf()
Date: Wed, 15 May 2013 22:12:22 +0200 [thread overview]
Message-ID: <20130515201222.GA14631@redhat.com> (raw)
In-Reply-To: <20130515201158.GA14606@redhat.com>
Turn cn_printf(...) into cn_vprintf(va_list args), reintroduce
cn_printf() as a trivial wrapper.
This simplifies the next change and cn_vprintf() will have more
callers.
Signed-off-by: Oleg Nesterov <oleg@redhat.com>
---
fs/coredump.c | 20 +++++++++++++-------
1 files changed, 13 insertions(+), 7 deletions(-)
diff --git a/fs/coredump.c b/fs/coredump.c
index 11bc368..c10a43a 100644
--- a/fs/coredump.c
+++ b/fs/coredump.c
@@ -69,17 +69,13 @@ static int expand_corename(struct core_name *cn)
return 0;
}
-static int cn_printf(struct core_name *cn, const char *fmt, ...)
+static int cn_vprintf(struct core_name *cn, const char *fmt, va_list arg)
{
char *cur;
int need;
int ret;
- va_list arg;
- va_start(arg, fmt);
need = vsnprintf(NULL, 0, fmt, arg);
- va_end(arg);
-
if (likely(need < cn->size - cn->used - 1))
goto out_printf;
@@ -89,9 +85,7 @@ static int cn_printf(struct core_name *cn, const char *fmt, ...)
out_printf:
cur = cn->corename + cn->used;
- va_start(arg, fmt);
vsnprintf(cur, need + 1, fmt, arg);
- va_end(arg);
cn->used += need;
return 0;
@@ -99,6 +93,18 @@ expand_fail:
return ret;
}
+static int cn_printf(struct core_name *cn, const char *fmt, ...)
+{
+ va_list arg;
+ int ret;
+
+ va_start(arg, fmt);
+ ret = cn_vprintf(cn, fmt, arg);
+ va_end(arg);
+
+ return ret;
+}
+
static void cn_escape(char *str)
{
for (; *str; str++)
--
1.5.5.1
next prev parent reply other threads:[~2013-05-15 20:16 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-05-15 20:11 [PATCH 0/6] coredump: format_corename() fixes/cleanups Oleg Nesterov
2013-05-15 20:12 ` [PATCH 1/6] coredump: format_corename() can leak cn->corename Oleg Nesterov
2013-05-15 20:12 ` Oleg Nesterov [this message]
2013-05-15 20:12 ` [PATCH 3/6] coredump: cn_vprintf() has no reason to call vsnprintf() twice Oleg Nesterov
2013-05-15 20:12 ` [PATCH 4/6] coredump: kill cn_escape(), introduce cn_esc_printf() Oleg Nesterov
2013-05-15 20:26 ` [PATCH v2 " Oleg Nesterov
2013-05-15 20:12 ` [PATCH 5/6] coredump: kill call_count, add core_name_size Oleg Nesterov
2013-05-24 19:53 ` Andrew Morton
2013-05-27 15:16 ` Oleg Nesterov
2013-05-15 20:12 ` [PATCH 6/6] coredump: '% at the end' shouldn't bypass core_uses_pid logic Oleg Nesterov
2013-05-16 13:28 ` [PATCH 0/6] coredump: format_corename() fixes/cleanups Neil Horman
[not found] ` <20130516154323.GA19060@redhat.com>
2013-05-16 15:43 ` [PATCH 1/1] usermodehelper: check subprocess_info->path != NULL Oleg Nesterov
2013-05-16 16:16 ` Lucas De Marchi
2013-05-16 17:13 ` Oleg Nesterov
[not found] ` <20130516182624.GA29455@redhat.com>
2013-05-16 18:38 ` [PATCH 7/6] coredump: avoid the uninitialized cn->corename if core_pattern is empty Oleg Nesterov
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=20130515201222.GA14631@redhat.com \
--to=oleg@redhat.com \
--cc=akpm@linux-foundation.org \
--cc=andi@firstfloor.org \
--cc=jslaby@suse.cz \
--cc=linux-kernel@vger.kernel.org \
--cc=lucas.de.marchi@gmail.com \
--cc=mzxreary@0pointer.de \
--cc=nhorman@tuxdriver.com \
--cc=vda.linux@googlemail.com \
--cc=walters@verbum.org \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox