threads / patch / 51730

patchtrace2: use warning() directly in tr2_dst_malformed_warning()

Subject: [PATCH] trace2: use warning() directly in tr2_dst_malformed_warning()

## tl;dr

2 messages between Aug 25, 2019 and Sep 4, 2019. Diffs are folded; open one to read it.

replies: 1people: 2as markdown or json

René Scharfe· Aug 25, 2019, 17:44 UTC · lore

Let warning() format the message instead of using an intermediate strbuf for that. This is shorter, easier to read and avoids an allocation.

Signed-off-by: René Scharfe <l.s.r@web.de>
---
 trace2/tr2_dst.c | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

Show changes to trace2/tr2_dst.c +2 −8

diff --git a/trace2/tr2_dst.c b/trace2/tr2_dst.c
index 5dda0ca1cd..c69857515f 100644
--- a/trace2/tr2_dst.c
+++ b/trace2/tr2_dst.c
@@ -215,13 +215,8 @@ static int tr2_dst_try_unix_domain_socket(struct tr2_dst *dst,
 static void tr2_dst_malformed_warning(struct tr2_dst *dst,
 				      const char *tgt_value)
 {
-	struct strbuf buf = STRBUF_INIT;
-
-	strbuf_addf(&buf, "trace2: unknown value for '%s': '%s'",
-		    tr2_sysenv_display_name(dst->sysenv_var), tgt_value);
-	warning("%s", buf.buf);
-
-	strbuf_release(&buf);
+	warning("trace2: unknown value for '%s': '%s'",
+		tr2_sysenv_display_name(dst->sysenv_var), tgt_value);
 }

 int tr2_dst_get_trace_fd(struct tr2_dst *dst)
--
2.23.0

Jeff Hostetler· Sep 4, 2019, 09:14 UTC · re: René Scharfe · lore

Re: [PATCH] trace2: use warning() directly in tr2_dst_malformed_warning()

On 8/25/2019 1:44 PM, René Scharfe wrote:

Show 31 quoted lines

> Let warning() format the message instead of using an intermediate strbuf
> for that.  This is shorter, easier to read and avoids an allocation.
> 
> Signed-off-by: René Scharfe <l.s.r@web.de>
> ---
>   trace2/tr2_dst.c | 9 ++-------
>   1 file changed, 2 insertions(+), 7 deletions(-)
> 
> diff --git a/trace2/tr2_dst.c b/trace2/tr2_dst.c
> index 5dda0ca1cd..c69857515f 100644
> --- a/trace2/tr2_dst.c
> +++ b/trace2/tr2_dst.c
> @@ -215,13 +215,8 @@ static int tr2_dst_try_unix_domain_socket(struct tr2_dst *dst,
>   static void tr2_dst_malformed_warning(struct tr2_dst *dst,
>   				      const char *tgt_value)
>   {
> -	struct strbuf buf = STRBUF_INIT;
> -
> -	strbuf_addf(&buf, "trace2: unknown value for '%s': '%s'",
> -		    tr2_sysenv_display_name(dst->sysenv_var), tgt_value);
> -	warning("%s", buf.buf);
> -
> -	strbuf_release(&buf);
> +	warning("trace2: unknown value for '%s': '%s'",
> +		tr2_sysenv_display_name(dst->sysenv_var), tgt_value);
>   }
> 
>   int tr2_dst_get_trace_fd(struct tr2_dst *dst)
> --
> 2.23.0
>

good catch!  thanks!

Jeff