From patchwork Thu Nov 3 16:17:27 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 621070 Delivered-To: patch@linaro.org Received: by 2002:a17:522:c983:b0:460:3032:e3c4 with SMTP id kr3csp440275pvb; Thu, 3 Nov 2022 09:20:37 -0700 (PDT) X-Google-Smtp-Source: AMsMyM503gR42WKGCrJDjEZnexLxTrk5AFEj/t15iJJxF8+QyTs79Ir3yWzg47fOW007dy/2FtnN X-Received: by 2002:a05:622a:591:b0:39c:f3c8:117c with SMTP id c17-20020a05622a059100b0039cf3c8117cmr25421034qtb.270.1667492437477; Thu, 03 Nov 2022 09:20:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1667492437; cv=none; d=google.com; s=arc-20160816; b=QItp/e9+634+f+nzbGG7Z3fi0CRlyii3PVk6wM4BVL5lb5n39oc1yG+xEVwhFdxEm6 vwVyKN5dJnqTqL00oUSb9hk0r/vPiEdYPaRB1bwljGs4Qc03i2Do8nfv0NlqAn2Qhoxy lD96MKFz26Jhc+p/Ru8v3ziUYJv/5KStfHDhYSjNxYbzn3vFjRbPgLtCu3Em4V6kuEyp SMeuU+VDoaVblR+yeEagmeIQDhFPACw8ULTVG2oq6yj8lA8XT0c00B9RL5pn5o5+MWbI 22U3E78LS/uN9s44EJ1REeZcOj7wRqgSIjjOFM9xdf84DGjnd3QrTR432Q6CRpU2f1Fv B3aA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from; bh=C6VQt2v0P1P9scb32kIgndYoV5pRSGmmoThczyepSrg=; b=SuZiBuZVNfcUB/7VA90OhzpsWJkjpPoBWOBNC6tpWmY39gM9AWgwynpXIPc5WhdzeR ItM1tTu2gj2NNiFDX9AYSkDAYi6hlMmVOD7/9m1lEd84yVcg7GZOaiNI1tLFD1B5q8fO VAu2e5tRosfkTF2aFZPLTnXXpYEmeJeVS4gPbgp04yTVZ785egEmQgbg1T/sQyvHSNYX bWeygIhhLyWqcrFFcFGME6tNxkBI6gLok2pD6D7EAorswP0crjLV41Y2USDtsndYrqW1 UlYNgbohuUE5c41OjBWrylzmakB6tHEaP4nYzdCvoTcW15WLeENcV2Dd3R06iFUdWEM2 1aow== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org" Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id 17-20020a370711000000b006fa3ca664a3si844139qkh.738.2022.11.03.09.20.37 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 03 Nov 2022 09:20:37 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org" Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oqcwB-0002up-Jy; Thu, 03 Nov 2022 12:19:28 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oqcuQ-0000m2-Qu; Thu, 03 Nov 2022 12:17:39 -0400 Received: from mout.kundenserver.de ([212.227.126.133]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oqcuO-00085V-QS; Thu, 03 Nov 2022 12:17:38 -0400 Received: from quad ([82.142.8.70]) by mrelayeu.kundenserver.de (mreue009 [212.227.15.167]) with ESMTPSA (Nemesis) id 1MqJuN-1pKRgb1fL1-00nRhV; Thu, 03 Nov 2022 17:17:34 +0100 From: Laurent Vivier To: qemu-devel@nongnu.org Cc: qemu-trivial@nongnu.org, =?utf-8?q?Alex_Benn=C3=A9e?= , =?utf-8?q?Philippe_M?= =?utf-8?q?athieu-Daud=C3=A9?= , Laurent Vivier Subject: [PULL 10/10] tests/unit: simpler variable sequence for test-io-channel Date: Thu, 3 Nov 2022 17:17:27 +0100 Message-Id: <20221103161727.4116147-11-laurent@vivier.eu> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20221103161727.4116147-1-laurent@vivier.eu> References: <20221103161727.4116147-1-laurent@vivier.eu> MIME-Version: 1.0 X-Provags-ID: V03:K1:c/GXiQlgCQTRKFlS7hWkhPX2gAqA09KgnpcFLaMdH187e47V6oD ZGgXEuGej375hBe7kZ/yI309c1Ja/Y/RYCJY/u+Tujg+uRIhCdnwYOmJ5H2S87aE+Xn5prz hVx8a6TVtCbnElour7K0zd+el+Y0Fnl5IpNF9OjZ4H9m0C6f+qbitMf3F9iHdIDceJtYcEw ITeatCIQzuVOxf22Mtegg== X-UI-Out-Filterresults: notjunk:1;V03:K0:T4mLWOp+/RY=:qTX80NiRnnUdDHGm9srG3B J03kqOKIRKfQwXOM1YLO4STSS8O8OdveKoOmGwxNwMtdLpetBASX2NMPKUg9bmpbj0XI6erkC OVYwNadwV1R4N5kGC7yHFAqQs/xVgYCJB0TygROECijucE55pwvgpfY38Bxb9IebR2vRZj85Z 6IjtXHmwIgvoq9oN79W0XnK8KHjKkJTRINlCN8fi9GvzwikyBrBNpWt9VF2tFo79FTcrcTX9+ bQsQZX5kRiSLKfcPdMDy1vJAuEw5KZBSgePSUdtYgKIUSMTJpFNksZdYlyJWwBMd/3laHsjjG 70z9bCK52ZlIfFIZsD/TbJNjMNoCYf8Z329IyO6yYgG4j3SLuYO8n4rOWXx6SAFKEijPO26L8 NNY8LSKzv6MThA3Cfj8WfioPJQHfztaIUfFC7XOfMtqXwKEBp4El0ZfbURUL65BpQ+cHHEpnH dsm62+aqjrphpsh4neVOFTTtQkAp6jZ6/ZRiu/4nRCg2EfDla4XFxMhIWf1YvKbOJl7BP1447 a3ZKXzhQ6SbT7yJ7cf/3N/z0FZLgMTcQdYBKX3Lkg+jsB0URDz/Q6LPsr98OZ9W3tUdHGzUhM 1Ob/KplVvBOWHPtwxMKznfajRruIR3/SRFKyKJY6+ymTg6Mj0TRIUoB3pr9EzpzX1MbE0Wyau FUzJpPqoDW0yGW2npDZrEAy5cHAceZNmxunJxDVv/j7d5vh9FGzze9TUmhne19wvI5O7p3ndi yBc/SBK8EW/gZgOcpfrQWqKTfLWoZelfzbC+H4fSd1DTlQ0eyllgN7NY646Qxkcv3QAS6ghB6 FS7fQbQ Received-SPF: none client-ip=212.227.126.133; envelope-from=laurent@vivier.eu; helo=mout.kundenserver.de X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_NONE=0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "Qemu-devel" Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Alex Bennée This avoids some compilers complaining about a potentially un-initialised [src|dst]argv. In retrospect using GString was overkill for what we are constructing. Signed-off-by: Alex Bennée Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Laurent Vivier Message-Id: <20221103102329.2581508-1-alex.bennee@linaro.org> Signed-off-by: Laurent Vivier --- tests/unit/test-io-channel-command.c | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/tests/unit/test-io-channel-command.c b/tests/unit/test-io-channel-command.c index 43e29c8cfbf4..19f72eab961d 100644 --- a/tests/unit/test-io-channel-command.c +++ b/tests/unit/test-io-channel-command.c @@ -33,19 +33,13 @@ static void test_io_channel_command_fifo(bool async) { g_autofree gchar *tmpdir = g_dir_make_tmp("qemu-test-io-channel.XXXXXX", NULL); g_autofree gchar *fifo = g_strdup_printf("%s/%s", tmpdir, TEST_FIFO); - g_autoptr(GString) srcargs = g_string_new(socat); - g_autoptr(GString) dstargs = g_string_new(socat); - g_auto(GStrv) srcargv; - g_auto(GStrv) dstargv; + g_autofree gchar *srcargs = g_strdup_printf("%s - PIPE:%s,wronly", socat, fifo); + g_autofree gchar *dstargs = g_strdup_printf("%s PIPE:%s,rdonly -", socat, fifo); + g_auto(GStrv) srcargv = g_strsplit(srcargs, " ", -1); + g_auto(GStrv) dstargv = g_strsplit(dstargs, " ", -1); QIOChannel *src, *dst; QIOChannelTest *test; - g_string_append_printf(srcargs, " - PIPE:%s,wronly", fifo); - g_string_append_printf(dstargs, " PIPE:%s,rdonly -", fifo); - - srcargv = g_strsplit(srcargs->str, " ", -1); - dstargv = g_strsplit(dstargs->str, " ", -1); - src = QIO_CHANNEL(qio_channel_command_new_spawn((const char **) srcargv, O_WRONLY, &error_abort));