From nobody Fri May 10 13:48:54 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) client-ip=170.10.129.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1649232737; cv=none; d=zohomail.com; s=zohoarc; b=USy23OKNhX1F+TQ/JgiGNCv3DMX86iHn5pJplAa9WwyBtakctETh83NTdxzTN8fqd+cqoWmP/ykRdzbqMoRiTtauZn1dTvPQQ45nUmsuE/ySmiWDuqj6RzmwdvKGuR25njIUsAYeAZjD1i5NefnaVZXwXQ1vcgoSMo9h5vacilE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1649232737; h=Content-Type:Content-Transfer-Encoding:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=br97ymwAn8/gaTKSzLk17p1I2ZZdX9ZmF3bajjGBYdQ=; b=eS4BSJ6xaHmWvsF+i7gdF+JQ9/I2R4maKYicS6+4SM6z/OpYUGUsQJ4Ovia7tiCLr2wJSl8GDbtx+NgN4hplS9zxgvJnpTxBLR2XIMzmmZhVcIG7dNtdNbVdJpvsKv4SZcLEq/eByMLkzqg1JzBb5tUxBtphVNj3wcr6FdP1nrI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mx.zohomail.com with SMTPS id 164923273734575.12202682381212; Wed, 6 Apr 2022 01:12:17 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-475--kPdIJvcNPGtXu-lTGnn3A-1; Wed, 06 Apr 2022 04:12:15 -0400 Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id EC87328035EF; Wed, 6 Apr 2022 08:12:12 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id D1188402189; Wed, 6 Apr 2022 08:12:12 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 48C5D1947BBB; Wed, 6 Apr 2022 08:12:11 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 8638A19451F3 for ; Wed, 6 Apr 2022 08:12:10 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 5CEF31415126; Wed, 6 Apr 2022 08:12:10 +0000 (UTC) Received: from maggie.redhat.com (unknown [10.43.2.180]) by smtp.corp.redhat.com (Postfix) with ESMTP id 050B01415125 for ; Wed, 6 Apr 2022 08:11:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1649232736; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=br97ymwAn8/gaTKSzLk17p1I2ZZdX9ZmF3bajjGBYdQ=; b=VwYASRWFKMc5e0simrvgiFxyMYQ+LBU4nkvwfYuwYq3KJ+EbRMOc0fup7/AurQQoi3Qisp fGc/dMwBQkhZabRJr3uTUrmXF75hic3HVeoBhGyEX3ckEC50xSfnfNmiB1loFYy+/Geb2j 1wW0FdhsCqPT4mZ/BQ2YT98J8Kn9PKY= X-MC-Unique: -kPdIJvcNPGtXu-lTGnn3A-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Michal Privoznik To: libvir-list@redhat.com Subject: [PATCH] qemu: Rename @main variable in qemuDomainRemoveLogs() Date: Wed, 6 Apr 2022 10:11:55 +0200 Message-Id: <7901385998f18a32cac233cf3356600ba25e369e.1649232715.git.mprivozn@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.85 on 10.11.54.7 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 2.85 on 10.11.54.9 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1649232739399100003 Content-Type: text/plain; charset="utf-8"; x-default="true" Older GCC fails to understand that 'char *main' is a variable and not main() function. Rename the variable to appease old GCC. Signed-off-by: Michal Privoznik Reviewed-by: Nikolay Shirokovskiy --- src/qemu/qemu_domain.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index c35e5c09a3..a4334de158 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -11828,7 +11828,7 @@ qemuDomainRemoveLogs(virQEMUDriver *driver, { g_autoptr(virQEMUDriverConfig) cfg =3D NULL; g_autofree char *format =3D NULL; - g_autofree char *main =3D NULL; + g_autofree char *main_log =3D NULL; g_autoptr(DIR) dir =3D NULL; struct dirent *entry; int rc; @@ -11840,13 +11840,13 @@ qemuDomainRemoveLogs(virQEMUDriver *driver, if (virDirOpen(&dir, cfg->logDir) < 0) return -1; =20 - main =3D g_strdup_printf("%s.log", name); + main_log =3D g_strdup_printf("%s.log", name); format =3D g_strdup_printf("%s.log.%%u", name); =20 while ((rc =3D virDirRead(dir, &entry, cfg->logDir)) > 0) { unsigned int u; =20 - if (STREQ(entry->d_name, main) || + if (STREQ(entry->d_name, main_log) || sscanf(entry->d_name, format, &u) =3D=3D 1) { g_autofree char *path =3D NULL; =20 --=20 2.35.1