| Message ID | 20230824143129.1957914-2-rf@opensource.cirrus.com |
|---|---|
| State | Accepted |
| Commit | 5c54c9ebb1f4758a4da7731a809148ff1a3a1844 |
| Headers | show |
| Series | kunit: Add dynamically-extending log | expand |
On Thu, Aug 24, 2023 at 10:32 AM 'Richard Fitzgerald' via KUnit Development <kunit-dev@googlegroups.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@opensource.cirrus.com> This looks good to me! Reviewed-by: Rae Moar <rmoar@google.com> Thanks! -Rae > --- > 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 > > -- > You received this message because you are subscribed to the Google Groups "KUnit Development" group. > To unsubscribe from this group and stop receiving emails from it, send an email to kunit-dev+unsubscribe@googlegroups.com. > To view this discussion on the web visit https://groups.google.com/d/msgid/kunit-dev/20230824143129.1957914-2-rf%40opensource.cirrus.com.
On Thu, 24 Aug 2023 at 22:32, 'Richard Fitzgerald' via KUnit Development <kunit-dev@googlegroups.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@opensource.cirrus.com> > --- Reviewed-by: David Gow <davidgow@google.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 > > -- > You received this message because you are subscribed to the Google Groups "KUnit Development" group. > To unsubscribe from this group and stop receiving emails from it, send an email to kunit-dev+unsubscribe@googlegroups.com. > To view this discussion on the web visit https://groups.google.com/d/msgid/kunit-dev/20230824143129.1957914-2-rf%40opensource.cirrus.com.
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);
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> --- lib/kunit/string-stream.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-)