diff mbox series

tests/plugin/syscall.c: fix compiler warnings

Message ID 20211128011551.2115468-1-juro.bystricky@intel.com
State New
Headers show
Series tests/plugin/syscall.c: fix compiler warnings | expand

Commit Message

Juro Bystricky Nov. 28, 2021, 1:15 a.m. UTC
Fix compiler warnings. The warnings can result in a broken build.
This patch fixes warnings such as:

In file included from /usr/include/glib-2.0/glib.h:111,
                 from ../tests/plugin/syscall.c:13:
../tests/plugin/syscall.c: In function ‘print_entry’:
/usr/include/glib-2.0/glib/glib-autocleanups.h:28:3: error: ‘out’ may be
       used uninitialized in this function [-Werror=maybe-uninitialized]
   g_free (*pp);
   ^~~~~~~~~~~~
../tests/plugin/syscall.c:82:23: note: ‘out’ was declared here
     g_autofree gchar *out;
                       ^~~
In file included from /usr/include/glib-2.0/glib.h:111,
                 from ../tests/plugin/syscall.c:13:
../tests/plugin/syscall.c: In function ‘vcpu_syscall_ret’:
/usr/include/glib-2.0/glib/glib-autocleanups.h:28:3: error: ‘out’ may be
        used uninitialized in this function [-Werror=maybe-uninitialized]
   g_free (*pp);
   ^~~~~~~~~~~~
../tests/plugin/syscall.c:73:27: note: ‘out’ was declared here
         g_autofree gchar *out;
                           ^~~
cc1: all warnings being treated as errors

Signed-off-by: Juro Bystricky <juro.bystricky@intel.com>
---
 tests/plugin/syscall.c | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

Comments

Alex Bennée Nov. 29, 2021, 12:58 p.m. UTC | #1
Juro Bystricky <juro.bystricky@intel.com> writes:

> Fix compiler warnings. The warnings can result in a broken build.
> This patch fixes warnings such as:

Queued to for-6.2/more-misc-fixes, thanks.
Philippe Mathieu-Daudé Dec. 2, 2021, 10:39 a.m. UTC | #2
On 11/29/21 13:58, Alex Bennée wrote:
> 
> Juro Bystricky <juro.bystricky@intel.com> writes:
> 
>> Fix compiler warnings. The warnings can result in a broken build.
>> This patch fixes warnings such as:
> 
> Queued to for-6.2/more-misc-fixes, thanks.

I wondered if this single patch would justify delaying the 6.2
release by one week, but then I noticed the IDE pull request,
so let it be...

Note, -Werror=maybe-uninitialized forces an ugly alignment style
to the g_autofree + g_strdup_printf() combination.

Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Alex Bennée Dec. 2, 2021, 11:08 a.m. UTC | #3
Philippe Mathieu-Daudé <f4bug@amsat.org> writes:

> On 11/29/21 13:58, Alex Bennée wrote:
>> 
>> Juro Bystricky <juro.bystricky@intel.com> writes:
>> 
>>> Fix compiler warnings. The warnings can result in a broken build.
>>> This patch fixes warnings such as:
>> 
>> Queued to for-6.2/more-misc-fixes, thanks.
>
> I wondered if this single patch would justify delaying the 6.2
> release by one week, but then I noticed the IDE pull request,
> so let it be...

Already in - as I had a PR in flight ;-)

>
> Note, -Werror=maybe-uninitialized forces an ugly alignment style
> to the g_autofree + g_strdup_printf() combination.
>
> Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>

Thanks anyway.
Philippe Mathieu-Daudé Dec. 2, 2021, 5:42 p.m. UTC | #4
On 12/2/21 12:08, Alex Bennée wrote:
> Philippe Mathieu-Daudé <f4bug@amsat.org> writes:
>> On 11/29/21 13:58, Alex Bennée wrote:
>>>
>>> Juro Bystricky <juro.bystricky@intel.com> writes:
>>>
>>>> Fix compiler warnings. The warnings can result in a broken build.
>>>> This patch fixes warnings such as:
>>>
>>> Queued to for-6.2/more-misc-fixes, thanks.
>>
>> I wondered if this single patch would justify delaying the 6.2
>> release by one week, but then I noticed the IDE pull request,
>> so let it be...
> 
> Already in - as I had a PR in flight ;-)

Oops, mails out of sync...
diff mbox series

Patch

diff --git a/tests/plugin/syscall.c b/tests/plugin/syscall.c
index 484b48de49..96040c578f 100644
--- a/tests/plugin/syscall.c
+++ b/tests/plugin/syscall.c
@@ -70,19 +70,17 @@  static void vcpu_syscall_ret(qemu_plugin_id_t id, unsigned int vcpu_idx,
         }
         g_mutex_unlock(&lock);
     } else {
-        g_autofree gchar *out;
-        out = g_strdup_printf("syscall #%" PRIi64 " returned -> %" PRIi64 "\n",
-                num, ret);
+        g_autofree gchar *out = g_strdup_printf(
+             "syscall #%" PRIi64 " returned -> %" PRIi64 "\n", num, ret);
         qemu_plugin_outs(out);
     }
 }
 
 static void print_entry(gpointer val, gpointer user_data)
 {
-    g_autofree gchar *out;
     SyscallStats *entry = (SyscallStats *) val;
     int64_t syscall_num = entry->num;
-    out = g_strdup_printf(
+    g_autofree gchar *out = g_strdup_printf(
         "%-13" PRIi64 "%-6" PRIi64 " %" PRIi64 "\n",
         syscall_num, entry->calls, entry->errors);
     qemu_plugin_outs(out);