From patchwork Fri Oct 6 11:36:41 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Markus Armbruster X-Patchwork-Id: 729991 Delivered-To: patch@linaro.org Received: by 2002:a5d:4005:0:b0:31d:da82:a3b4 with SMTP id n5csp457745wrp; Fri, 6 Oct 2023 04:42:41 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEeE3CB7F/MJR+5wUxrg/m/RbSSvJMK2jrgaMua3GIvF6VWv+HvLK2BhpuGRtS2/VLOJvTO X-Received: by 2002:a05:6214:3d06:b0:656:5441:a13f with SMTP id ol6-20020a0562143d0600b006565441a13fmr8481085qvb.45.1696592561482; Fri, 06 Oct 2023 04:42:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696592561; cv=none; d=google.com; s=arc-20160816; b=YqP/2JKqQMrnKH4WZkIWCIBi5tmelvKXNDWwe/W7LyNwu6F5VewwGi9nJLorc/0kfS yArueisMW6lqiqogAFqxx+LI5zvUCLmZdLckB/OCsnmGRm8emv/qaJfLJSVTc69LMjWA nEqrObWbIhXyAxkTjOE92t1JkNqrOY+ZmDxHThyNM0qMvmxY2bjjBMlxa7hq0RiZAiGG eKx7XJQk5b+JYAVBvuL2XNhjba1rSAMzk/zP8To+JCUtOvLp93bGPDyyGUVjkWvz6jDF 9N94KgPG0t2CiZiK+hik7JS/RdxUOTDhdV54pGuHv/lZ0I/YN+hhQQUvk2RUmSM+SV+5 CcrA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to: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:dkim-signature; bh=UcknsHua8YgZyyV7nIDQ/TchOkuc6nnQyZPLvod9uD4=; fh=i1pZRuKD5MhOXg6DnHnBvYF8Xhy7p4U+yXFYiz2hjRc=; b=CjtgDcvOZ27vhhIwgxgxjtQx0WTWtdnPdKAHA/0V1rXukN644A5+Vg+NqVVXnulp8/ 0U7hOrb2EAgyktK6zA7hweZCglT+uny0annM+363NJMCs+o4MOOhTpzwQgaj0qdHtNu7 XxdBnNiwE1F6kBhfIxgC1WDLhe3ArOFZ/XtdpZjafERS1qhwjCVLBJ+l5iHABJSmcdp7 GA5WstXzHzQUcFg9Z9yjXF7PsKcjWTNdMbchorl9ZCgrlKjUr4cQ+MXOoHteazzeBMZl 7XQMlaFlkLOD22VRX8InmRnUVq5SyIKgWiHWIIKr5Q37rHhXg61jfB2X+x+rMbeltOmI ymPQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=JB5ZLYv5; 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"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id o8-20020a05620a2a0800b00774383c131dsi2288655qkp.121.2023.10.06.04.42.41 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 06 Oct 2023 04:42:41 -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; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=JB5ZLYv5; 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"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qoj9H-00057K-HI; Fri, 06 Oct 2023 07:37:39 -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 1qoj8w-00051m-CR for qemu-devel@nongnu.org; Fri, 06 Oct 2023 07:37:18 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qoj8t-0000Ao-7L for qemu-devel@nongnu.org; Fri, 06 Oct 2023 07:37:16 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1696592234; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=UcknsHua8YgZyyV7nIDQ/TchOkuc6nnQyZPLvod9uD4=; b=JB5ZLYv5Alzm204ha/9nbCWoM9QKxAQtzOQVMPs6J6cpmThcaCYq4CClM4qxRbk6ywzTJ+ HLjYsrPemA+Q5gqcJzjuIPexBATziJRip9qm+dCr1ECn+acwr++3cLytqbOLSHspDTsD23 xhQsPu4uOyplCZaspJFF9cPVI9RUuCo= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-388-0yn3IVeBMgy__mbPnEaeVw-1; Fri, 06 Oct 2023 07:37:01 -0400 X-MC-Unique: 0yn3IVeBMgy__mbPnEaeVw-1 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id D75E818175A1; Fri, 6 Oct 2023 11:37:00 +0000 (UTC) Received: from blackfin.pond.sub.org (unknown [10.39.192.25]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 957A91054FC0; Fri, 6 Oct 2023 11:37:00 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 835C321E691C; Fri, 6 Oct 2023 13:36:57 +0200 (CEST) From: Markus Armbruster To: qemu-devel@nongnu.org Cc: stefanha@redhat.com, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Eric Blake , Richard Henderson Subject: [PULL 16/32] qemu-io: Clean up global variable shadowing Date: Fri, 6 Oct 2023 13:36:41 +0200 Message-ID: <20231006113657.3803180-17-armbru@redhat.com> In-Reply-To: <20231006113657.3803180-1-armbru@redhat.com> References: <20231006113657.3803180-1-armbru@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.3 Received-SPF: pass client-ip=170.10.133.124; envelope-from=armbru@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-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: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Philippe Mathieu-Daudé Fix: qemu-io.c:478:36: error: declaration shadows a variable in the global scope [-Werror,-Wshadow] static void add_user_command(char *optarg) ^ /Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/usr/include/getopt.h:77:14: note: previous declaration is here extern char *optarg; /* getopt(3) external variables */ ^ Signed-off-by: Philippe Mathieu-Daudé Message-ID: <20231004120019.93101-8-philmd@linaro.org> Reviewed-by: Eric Blake Reviewed-by: Richard Henderson Signed-off-by: Markus Armbruster --- qemu-io.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/qemu-io.c b/qemu-io.c index 2bd7bfb650..050c70835f 100644 --- a/qemu-io.c +++ b/qemu-io.c @@ -475,10 +475,10 @@ static int command_loop(void) return last_error; } -static void add_user_command(char *optarg) +static void add_user_command(char *user_cmd) { cmdline = g_renew(char *, cmdline, ++ncmdline); - cmdline[ncmdline-1] = optarg; + cmdline[ncmdline - 1] = user_cmd; } static void reenable_tty_echo(void)