public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: Richard Fitzgerald <rf@opensource.cirrus.com>
To: <brendan.higgins@linux.dev>, <davidgow@google.com>, <rmoar@google.com>
Cc: <linux-kselftest@vger.kernel.org>, <kunit-dev@googlegroups.com>,
	<linux-kernel@vger.kernel.org>, <patches@opensource.cirrus.com>,
	"Richard Fitzgerald" <rf@opensource.cirrus.com>
Subject: [PATCH v6 01/10] kunit: string-stream: Don't create a fragment for empty strings
Date: Mon, 28 Aug 2023 11:41:02 +0100	[thread overview]
Message-ID: <20230828104111.2394344-2-rf@opensource.cirrus.com> (raw)
In-Reply-To: <20230828104111.2394344-1-rf@opensource.cirrus.com>

If the result of the formatted string is an empty string just return
instead of creating an empty fragment.

Signed-off-by: Richard Fitzgerald <rf@opensource.cirrus.com>
Reviewed-by: Rae Moar <rmoar@google.com>
Reviewed-by: David Gow <davidgow@google.com>
---
 lib/kunit/string-stream.c | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/lib/kunit/string-stream.c b/lib/kunit/string-stream.c
index cc32743c1171..ed24d86af9f5 100644
--- a/lib/kunit/string-stream.c
+++ b/lib/kunit/string-stream.c
@@ -50,11 +50,17 @@ int string_stream_vadd(struct string_stream *stream,
 	/* Make a copy because `vsnprintf` could change it */
 	va_copy(args_for_counting, args);
 
-	/* Need space for null byte. */
-	len = vsnprintf(NULL, 0, fmt, args_for_counting) + 1;
+	/* Evaluate length of formatted string */
+	len = vsnprintf(NULL, 0, fmt, args_for_counting);
 
 	va_end(args_for_counting);
 
+	if (len == 0)
+		return 0;
+
+	/* Need space for null byte. */
+	len++;
+
 	frag_container = alloc_string_stream_fragment(stream->test,
 						      len,
 						      stream->gfp);
-- 
2.30.2


  reply	other threads:[~2023-08-28 10:42 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-08-28 10:41 [PATCH v6 00/10] kunit: Add dynamically-extending log Richard Fitzgerald
2023-08-28 10:41 ` Richard Fitzgerald [this message]
2023-08-28 10:41 ` [PATCH v6 02/10] kunit: string-stream: Improve testing of string_stream Richard Fitzgerald
2023-08-28 10:41 ` [PATCH v6 03/10] kunit: string-stream: Add option to make all lines end with newline Richard Fitzgerald
2023-08-28 10:41 ` [PATCH v6 04/10] kunit: string-stream-test: Add cases for string_stream newline appending Richard Fitzgerald
2023-08-28 10:41 ` [PATCH v6 05/10] kunit: Don't use a managed alloc in is_literal() Richard Fitzgerald
2023-08-28 10:41 ` [PATCH v6 06/10] kunit: string-stream: Add kunit_alloc_string_stream() Richard Fitzgerald
2023-08-28 10:41 ` [PATCH v6 07/10] kunit: string-stream: Decouple string_stream from kunit Richard Fitzgerald
2023-08-28 10:41 ` [PATCH v6 08/10] kunit: string-stream: Add tests for freeing resource-managed string_stream Richard Fitzgerald
2023-09-02  8:24   ` David Gow
2023-08-28 10:41 ` [PATCH v6 09/10] kunit: Use string_stream for test log Richard Fitzgerald
2023-08-28 10:41 ` [PATCH v6 10/10] kunit: string-stream: Test performance of string_stream Richard Fitzgerald

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=20230828104111.2394344-2-rf@opensource.cirrus.com \
    --to=rf@opensource.cirrus.com \
    --cc=brendan.higgins@linux.dev \
    --cc=davidgow@google.com \
    --cc=kunit-dev@googlegroups.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-kselftest@vger.kernel.org \
    --cc=patches@opensource.cirrus.com \
    --cc=rmoar@google.com \
    /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