tools: Fix local variable block

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 <andrew.cooper3@citrix.com>
Acked-by: Wei Liu <wl@xen.org>
Release-acked-by: Juergen Gross <jgross@suse.com>

diff --git a/tools/console/daemon/io.c b/tools/console/daemon/io.c
index 8dac279bbb210bcddc340d81efbefa95eb69d5e0..a43c57edad62b371d9a2aa8adaf2c7af64beb28f 100644 (file)
--- a/tools/console/daemon/io.c
+++ b/tools/console/daemon/io.c
@@ -1470,9 +1470,9 @@ void handle_io(void)
 
 /*
  * 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 5d9d55b43091280ecee587363be1576fc39ac2d0..30124a1c19ec90ce955e5b90c19fb69935292afc 100644 (file)
--- a/tools/console/daemon/main.c
+++ b/tools/console/daemon/main.c
@@ -216,9 +216,9 @@ int main(int argc, char **argv)
 
 /*
  * 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/SunOS/evtchn.h
index abc8c600373ba7d10af1976fcc6a593aa224130a..e9d08d9dfc7e9849a999f3323f2abb424c58bac2 100644 (file)
--- a/tools/include/xen-sys/SunOS/evtchn.h
+++ b/tools/include/xen-sys/SunOS/evtchn.h
@@ -85,9 +85,9 @@ struct ioctl_evtchn_notify {
 
 /*
  * 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 26b9a0fb74cc861fd894a936c4b3e2d31fe84e88..44d36061413df486f0aaaca04836e423496385bd 100644 (file)
--- a/tools/python/xen/lowlevel/xc/xc.c
+++ b/tools/python/xen/lowlevel/xc/xc.c
@@ -2661,7 +2661,7 @@ PyMODINIT_FUNC initxc(void)
 
 /*
  * 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 621039d7a7a1d2dda2ed538ddbb7a20984d15fe2..b7d4b6ef5dedc87810cf5c93cb5cb47d2173d99c 100644 (file)
--- a/tools/python/xen/lowlevel/xs/xs.c
+++ b/tools/python/xen/lowlevel/xs/xs.c
@@ -1079,7 +1079,7 @@ PyMODINIT_FUNC initxs(void)
 
 /*
  * 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/xenstore.h
index 42b286646234dc3fb7cb75e2af7c3233d4f8b9f1..254f556a0b06ac0b040723f4fd2ab2671e45a56f 100644 (file)
--- a/tools/xenstore/include/xenstore.h
+++ b/tools/xenstore/include/xenstore.h
@@ -276,9 +276,9 @@ int xs_suspend_evtchn_port(int domid);
 
 /*
  * 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 dc3a0a0f8b4c56e58b4b13ac7e2d22d314bbc428..522c3594a2ba2807a555d3f7d34c8b9d598076de 100644 (file)
--- a/tools/xenstore/utils.h
+++ b/tools/xenstore/utils.h
@@ -52,9 +52,9 @@ static inline long IS_ERR(const void *ptr)
 
 /*
  * 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_core.c
index c8e423700db5a73b3fb6ef5cbc4c961e874c1b50..97ceabf9642d91945dd6e0ded3c5a0bc33764c2d 100644 (file)
--- a/tools/xenstore/xenstored_core.c
+++ b/tools/xenstore/xenstored_core.c
@@ -2151,9 +2151,9 @@ int main(int argc, char *argv[])
 
 /*
  * 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_core.h
index 3d27feb91ae522c1041b23131d1d6868819c2d98..56a279cfbb47dc15a0630978d1f8ec7f9080c82d 100644 (file)
--- 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);
 
 /*
  * 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_domain.c
index c793543bb40b86a35a216212d8a3fc0ac107fa93..1a83097952ab5770d2ee883975cf67fe676ded14 100644 (file)
--- a/tools/xenstore/xenstored_domain.c
+++ b/tools/xenstore/xenstored_domain.c
@@ -979,9 +979,9 @@ void wrl_apply_debit_trans_commit(struct connection *conn)
 
 /*
  * 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/xenstored_transaction.c
index 75816dd2c70d3e5268834c19c2c759a264fe2852..2824f7b359b86ab58c6703e2b7708f5340564384 100644 (file)
--- a/tools/xenstore/xenstored_transaction.c
+++ b/tools/xenstore/xenstored_transaction.c
@@ -612,9 +612,9 @@ nomem:
 
 /*
  * 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_watch.c
index 0dc5a40b99a9408d399417734eb87f74394e15d7..7dedca60dfd6c36a53907432f3b19f8bfe8c1136 100644 (file)
--- a/tools/xenstore/xenstored_watch.c
+++ b/tools/xenstore/xenstored_watch.c
@@ -247,9 +247,9 @@ void conn_delete_all_watches(struct connection *conn)
 
 /*
  * 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 87e43bfe8706ac162685e5889793671c00f6cb2c..f823abe737e252ab4e2275ec31a4926da6def048 100644 (file)
--- 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)
 
 /*
  * Local variables:
+ *  mode: C
  *  c-file-style: "linux"
  *  indent-tabs-mode: t
- *  c-indent-level: 8
  *  c-basic-offset: 8
  *  tab-width: 8
  * End: