[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <CABVgOSkwxdZTu0YSApC+qZkGT4svqA0U11fNDMVe6zAqzdfykA@mail.gmail.com>
Date: Tue, 15 Aug 2023 17:16:04 +0800
From: David Gow <davidgow@...gle.com>
To: Richard Fitzgerald <rf@...nsource.cirrus.com>
Cc: brendan.higgins@...ux.dev, rmoar@...gle.com,
linux-kselftest@...r.kernel.org, kunit-dev@...glegroups.com,
linux-kernel@...r.kernel.org, patches@...nsource.cirrus.com
Subject: Re: [PATCH v4 02/10] kunit: string-stream: Don't create a fragment
for empty strings
On Mon, 14 Aug 2023 at 21:23, Richard Fitzgerald
<rf@...nsource.cirrus.com> wrote:
>
> 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@...nsource.cirrus.com>
> ---
Nice catch!
Reviewed-by: David Gow <davidgow@...gle.com>
Cheers,
-- David
> 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
>
Download attachment "smime.p7s" of type "application/pkcs7-signature" (4003 bytes)
Powered by blists - more mailing lists