From nobody Wed Apr 24 19:23:38 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=none (zoho.com: 192.237.175.120 is neither permitted nor denied by domain of lists.xenproject.org) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=fail(p=none dis=none) header.from=citrix.com ARC-Seal: i=1; a=rsa-sha256; t=1572635713; cv=none; d=zoho.com; s=zohoarc; b=LmfJ82yNycUg03NKCI1CosVHupoPJ9tcDa/I3jkAQR+3ucUDCLu4GFTdTTM4mx7EcmkR2ENaEQdUad6u4mQsDB8wYxwd1GgYNs7p1oo2ElGieMJXYA36Y9OHGGnaH+i2T+LeKLCiH5OKFbb1x225EA4J8B95TZtb2EvewyGKBZU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1572635713; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=UCHCBvmFwZLh9ocmuYDTNU+sAK9ryLPElNs9C4mt4H8=; b=HMhGdgp1SGpQzBY8GHA5gSKSiL6ddZgKuXeltgwItsC7KQg+guQKMZ8wu5me9aoFQWrCY7omI6+CndkYv/1GFzUtroFj0lNDmO4t0eD4AlSjMhsNT4T7JgwBwgupr69xY1WoTajUyebrp5BjCInfADOQoo6PdBV32MdJC9Mbv3E= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=fail; spf=none (zoho.com: 192.237.175.120 is neither permitted nor denied by domain of lists.xenproject.org) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1572635713254852.3241479819477; Fri, 1 Nov 2019 12:15:13 -0700 (PDT) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1iQcMy-0002tO-OE; Fri, 01 Nov 2019 19:14:00 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1iQcMx-0002tJ-U0 for xen-devel@lists.xenproject.org; Fri, 01 Nov 2019 19:13:59 +0000 Received: from esa4.hc3370-68.iphmx.com (unknown [216.71.155.144]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id c1304186-fcdb-11e9-93da-bc764e2007e4; Fri, 01 Nov 2019 19:13:58 +0000 (UTC) X-Inumbo-ID: c1304186-fcdb-11e9-93da-bc764e2007e4 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=citrix.com; s=securemail; t=1572635638; h=from:to:cc:subject:date:message-id:mime-version; bh=XBFFgvLzBTnyRLguCv5tD68Uqgw5FM3YxCuOSA4lxV8=; b=AnrmIrarr9ay/C4QXpo8YGoCgZTAdTF8U4dF5hwlnxVSeUaqliipY5j0 DGc26/rSnEcorL3QRZjb1DYYODGewmhH3Fbpp7lrpQY76dbgGrL8dc6zg YvM/F62Zp4a0dU+gFFuPdLPTrEoRIO/UXclPL1XnqAyKrNsp66Nbyg8U6 s=; Authentication-Results: esa4.hc3370-68.iphmx.com; dkim=none (message not signed) header.i=none; spf=None smtp.pra=andrew.cooper3@citrix.com; spf=Pass smtp.mailfrom=Andrew.Cooper3@citrix.com; spf=None smtp.helo=postmaster@mail.citrix.com Received-SPF: none (zoho.com: 192.237.175.120 is neither permitted nor denied by domain of lists.xenproject.org) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Received-SPF: None (esa4.hc3370-68.iphmx.com: no sender authenticity information available from domain of andrew.cooper3@citrix.com) identity=pra; client-ip=162.221.158.21; receiver=esa4.hc3370-68.iphmx.com; envelope-from="Andrew.Cooper3@citrix.com"; x-sender="andrew.cooper3@citrix.com"; x-conformance=sidf_compatible Received-SPF: Pass (esa4.hc3370-68.iphmx.com: domain of Andrew.Cooper3@citrix.com designates 162.221.158.21 as permitted sender) identity=mailfrom; client-ip=162.221.158.21; receiver=esa4.hc3370-68.iphmx.com; envelope-from="Andrew.Cooper3@citrix.com"; x-sender="Andrew.Cooper3@citrix.com"; x-conformance=sidf_compatible; x-record-type="v=spf1"; x-record-text="v=spf1 ip4:209.167.231.154 ip4:178.63.86.133 ip4:195.66.111.40/30 ip4:85.115.9.32/28 ip4:199.102.83.4 ip4:192.28.146.160 ip4:192.28.146.107 ip4:216.52.6.88 ip4:216.52.6.188 ip4:162.221.158.21 ip4:162.221.156.83 ip4:168.245.78.127 ~all" Received-SPF: None (esa4.hc3370-68.iphmx.com: no sender authenticity information available from domain of postmaster@mail.citrix.com) identity=helo; client-ip=162.221.158.21; receiver=esa4.hc3370-68.iphmx.com; envelope-from="Andrew.Cooper3@citrix.com"; x-sender="postmaster@mail.citrix.com"; x-conformance=sidf_compatible IronPort-SDR: Eh2ik1+Xu5Cf3vxH6ntA5ngr2NRTBgoGvqJALEkP0jOX7qPuTgsYzKsVvBzmF9bGrHGOiHJesx 6XGbsjY9g4F6Co6C0BchMAuBlk2AD+dnyeABN2ygXdE0g2z22DuXJSCCZ7xWlj5/nVUg2O69dk +TQHg//2vTJFOJ7g1Povtathz8SrhwFr3VW/GYkMBdZaeBmwP2baqCBvhQfxKXzON7pk3ubJtH eLVY81viIo9xhdG3UMEaUjFZbU6OCs666SvfZNRKTN0nCjn3kLtfDGLa1a6KsneD1DBGqYqD3w frY= X-SBRS: 2.7 X-MesageID: 8230272 X-Ironport-Server: esa4.hc3370-68.iphmx.com X-Remote-IP: 162.221.158.21 X-Policy: $RELAYED X-IronPort-AV: E=Sophos;i="5.68,256,1569297600"; d="scan'208";a="8230272" From: Andrew Cooper To: Xen-devel Date: Fri, 1 Nov 2019 19:13:55 +0000 Message-ID: <20191101191355.32611-1-andrew.cooper3@citrix.com> X-Mailer: git-send-email 2.11.0 MIME-Version: 1.0 Subject: [Xen-devel] [PATCH for-4.13] tools: Fix local variable block X-BeenThere: xen-devel@lists.xenproject.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Cc: Juergen Gross , Andrew Cooper , Wei Liu , Ian Jackson Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) c-indent-level isn't considered a safe variable, and "solaris" isn't a recognised C style. Both cause prompts when opening the files. Fix all blocks up per CODING_STYLE Signed-off-by: Andrew Cooper Acked-by: Wei Liu --- CC: Ian Jackson CC: Wei Liu CC: Juergen Gross This finally irritated me to the point at which I decided to fix it. It wo= uld be nice to get into 4.13, and has 0 risk, as it is only comment changes. --- tools/console/daemon/io.c | 2 +- tools/console/daemon/main.c | 2 +- tools/include/xen-sys/SunOS/evtchn.h | 4 ++-- tools/python/xen/lowlevel/xc/xc.c | 2 +- tools/python/xen/lowlevel/xs/xs.c | 2 +- tools/xenstore/include/xenstore.h | 2 +- tools/xenstore/utils.h | 2 +- tools/xenstore/xenstored_core.c | 2 +- tools/xenstore/xenstored_core.h | 2 +- tools/xenstore/xenstored_domain.c | 2 +- tools/xenstore/xenstored_transaction.c | 2 +- tools/xenstore/xenstored_watch.c | 2 +- tools/xenstore/xs.c | 2 +- 13 files changed, 14 insertions(+), 14 deletions(-) diff --git a/tools/console/daemon/io.c b/tools/console/daemon/io.c index 8dac279bbb..a43c57edad 100644 --- a/tools/console/daemon/io.c +++ b/tools/console/daemon/io.c @@ -1470,9 +1470,9 @@ void handle_io(void) =20 /* * Local variables: + * mode: C * c-file-style: "linux" * indent-tabs-mode: t - * c-indent-level: 8 * c-basic-offset: 8 * tab-width: 8 * End: diff --git a/tools/console/daemon/main.c b/tools/console/daemon/main.c index 5d9d55b430..30124a1c19 100644 --- a/tools/console/daemon/main.c +++ b/tools/console/daemon/main.c @@ -216,9 +216,9 @@ int main(int argc, char **argv) =20 /* * Local variables: + * mode: C * c-file-style: "linux" * indent-tabs-mode: t - * c-indent-level: 8 * c-basic-offset: 8 * tab-width: 8 * End: diff --git a/tools/include/xen-sys/SunOS/evtchn.h b/tools/include/xen-sys/S= unOS/evtchn.h index abc8c60037..e9d08d9dfc 100644 --- a/tools/include/xen-sys/SunOS/evtchn.h +++ b/tools/include/xen-sys/SunOS/evtchn.h @@ -85,9 +85,9 @@ struct ioctl_evtchn_notify { =20 /* * Local variables: - * c-file-style: "solaris" + * mode: C + * c-file-style: "linux" * indent-tabs-mode: t - * c-indent-level: 8 * c-basic-offset: 8 * tab-width: 8 * End: diff --git a/tools/python/xen/lowlevel/xc/xc.c b/tools/python/xen/lowlevel/= xc/xc.c index 26b9a0fb74..44d3606141 100644 --- a/tools/python/xen/lowlevel/xc/xc.c +++ b/tools/python/xen/lowlevel/xc/xc.c @@ -2661,7 +2661,7 @@ PyMODINIT_FUNC initxc(void) =20 /* * Local variables: - * c-indent-level: 4 + * mode: C * c-basic-offset: 4 * End: */ diff --git a/tools/python/xen/lowlevel/xs/xs.c b/tools/python/xen/lowlevel/= xs/xs.c index 621039d7a7..b7d4b6ef5d 100644 --- a/tools/python/xen/lowlevel/xs/xs.c +++ b/tools/python/xen/lowlevel/xs/xs.c @@ -1079,7 +1079,7 @@ PyMODINIT_FUNC initxs(void) =20 /* * Local variables: - * c-indent-level: 4 + * mode: C * c-basic-offset: 4 * End: */ diff --git a/tools/xenstore/include/xenstore.h b/tools/xenstore/include/xen= store.h index 42b2866462..254f556a0b 100644 --- a/tools/xenstore/include/xenstore.h +++ b/tools/xenstore/include/xenstore.h @@ -276,9 +276,9 @@ int xs_suspend_evtchn_port(int domid); =20 /* * Local variables: + * mode: C * c-file-style: "linux" * indent-tabs-mode: t - * c-indent-level: 8 * c-basic-offset: 8 * tab-width: 8 * End: diff --git a/tools/xenstore/utils.h b/tools/xenstore/utils.h index dc3a0a0f8b..522c3594a2 100644 --- a/tools/xenstore/utils.h +++ b/tools/xenstore/utils.h @@ -52,9 +52,9 @@ static inline long IS_ERR(const void *ptr) =20 /* * Local variables: + * mode: C * c-file-style: "linux" * indent-tabs-mode: t - * c-indent-level: 8 * c-basic-offset: 8 * tab-width: 8 * End: diff --git a/tools/xenstore/xenstored_core.c b/tools/xenstore/xenstored_cor= e.c index c8e423700d..97ceabf964 100644 --- a/tools/xenstore/xenstored_core.c +++ b/tools/xenstore/xenstored_core.c @@ -2151,9 +2151,9 @@ int main(int argc, char *argv[]) =20 /* * Local variables: + * mode: C * c-file-style: "linux" * indent-tabs-mode: t - * c-indent-level: 8 * c-basic-offset: 8 * tab-width: 8 * End: diff --git a/tools/xenstore/xenstored_core.h b/tools/xenstore/xenstored_cor= e.h index 3d27feb91a..56a279cfbb 100644 --- a/tools/xenstore/xenstored_core.h +++ b/tools/xenstore/xenstored_core.h @@ -212,9 +212,9 @@ int remember_string(struct hashtable *hash, const char = *str); =20 /* * Local variables: + * mode: C * c-file-style: "linux" * indent-tabs-mode: t - * c-indent-level: 8 * c-basic-offset: 8 * tab-width: 8 * End: diff --git a/tools/xenstore/xenstored_domain.c b/tools/xenstore/xenstored_d= omain.c index c793543bb4..1a83097952 100644 --- a/tools/xenstore/xenstored_domain.c +++ b/tools/xenstore/xenstored_domain.c @@ -979,9 +979,9 @@ void wrl_apply_debit_trans_commit(struct connection *co= nn) =20 /* * Local variables: + * mode: C * c-file-style: "linux" * indent-tabs-mode: t - * c-indent-level: 8 * c-basic-offset: 8 * tab-width: 8 * End: diff --git a/tools/xenstore/xenstored_transaction.c b/tools/xenstore/xensto= red_transaction.c index 75816dd2c7..2824f7b359 100644 --- a/tools/xenstore/xenstored_transaction.c +++ b/tools/xenstore/xenstored_transaction.c @@ -612,9 +612,9 @@ int check_transactions(struct hashtable *hash) =20 /* * Local variables: + * mode: C * c-file-style: "linux" * indent-tabs-mode: t - * c-indent-level: 8 * c-basic-offset: 8 * tab-width: 8 * End: diff --git a/tools/xenstore/xenstored_watch.c b/tools/xenstore/xenstored_wa= tch.c index 0dc5a40b99..7dedca60df 100644 --- a/tools/xenstore/xenstored_watch.c +++ b/tools/xenstore/xenstored_watch.c @@ -247,9 +247,9 @@ void conn_delete_all_watches(struct connection *conn) =20 /* * Local variables: + * mode: C * c-file-style: "linux" * indent-tabs-mode: t - * c-indent-level: 8 * c-basic-offset: 8 * tab-width: 8 * End: diff --git a/tools/xenstore/xs.c b/tools/xenstore/xs.c index 87e43bfe87..f823abe737 100644 --- a/tools/xenstore/xs.c +++ b/tools/xenstore/xs.c @@ -1458,9 +1458,9 @@ void unsanitise_value(char *out, unsigned *out_len_r,= const char *in) =20 /* * Local variables: + * mode: C * c-file-style: "linux" * indent-tabs-mode: t - * c-indent-level: 8 * c-basic-offset: 8 * tab-width: 8 * End: --=20 2.11.0 _______________________________________________ Xen-devel mailing list Xen-devel@lists.xenproject.org https://lists.xenproject.org/mailman/listinfo/xen-devel