[libvirt] [PATCH 1/2] maint: Replace tabs with spaces in all source files in repo

Ján Tomko jtomko at redhat.com
Wed Oct 18 11:10:46 UTC 2017


On Tue, Oct 17, 2017 at 05:24:30PM +0200, Erik Skultety wrote:
>So we have a syntax-check rule to catch all tab indents but it naturally
>can't catch tab spacing, i.e. as a delimiter. This patch is a result of
>running 'vim -en +retab +wq'
>(using tabstop=8 softtabstop=4 shiftwidth=4 expandtab) on each file from
>a list generated by the following:
>find . -regextype gnu-awk \
>         -regex ".*\.(rng|syms|html|s?[ch]|py|pl|php(\.code)?)(\.in)?" \
>         | xargs git grep -lP "\t"
>
>Signed-off-by: Erik Skultety <eskultet at redhat.com>
>---
> docs/search.php.code.in     | 350 ++++++++++++++++++++++----------------------
> include/libvirt/virterror.h | 278 +++++++++++++++++------------------
> src/bhyve/bhyve_monitor.c   |   2 +-
> src/bhyve/bhyve_process.c   |   2 +-
> src/conf/node_device_conf.h |  52 +++----
> src/conf/nwfilter_conf.h    |   2 +-
> src/conf/virnodedeviceobj.c |   2 +-
> src/conf/virnodedeviceobj.h |   4 +-
> src/qemu/qemu_domain.h      |   8 +-
> src/qemu/qemu_monitor.h     |   2 +-
> src/util/viraudit.h         |   4 +-
> src/util/virconf.c          |  38 ++---
> src/util/virconf.h          |  10 +-
> src/util/virerror.h         |   6 +-
> src/util/virsysinfo.c       |   2 +-
> src/util/virxml.c           |   8 +-
> src/xen/xen_driver.h        |   2 +-
> src/xen/xen_hypervisor.c    | 168 ++++++++++-----------
> src/xen/xen_hypervisor.h    |   2 +-
> src/xen/xend_internal.c     |  12 +-
> src/xen/xend_internal.h     |   8 +-
> src/xen/xs_internal.c       |  20 +--
> src/xen/xs_internal.h       |  14 +-
> 23 files changed, 498 insertions(+), 498 deletions(-)
>

There is no point in replacing tabs with spaces in the comments just to
delete them.

NACK to the following hunks:

>diff --git a/src/util/virconf.c b/src/util/virconf.c
>index e505848f1..a88cc9901 100644
>--- a/src/util/virconf.c
>+++ b/src/util/virconf.c
>@@ -45,9 +45,9 @@
> VIR_LOG_INIT("util.conf");
>
> /************************************************************************
>- *									*
>- *	Structures and macros used by the mini parser			*
>- *									*
>+ *                                                                      *
>+ *      Structures and macros used by the mini parser                   *
>+ *                                                                      *
>  ************************************************************************/
>
> typedef struct _virConfParserCtxt virConfParserCtxt;
>@@ -69,16 +69,16 @@ struct _virConfParserCtxt {
>
> #define SKIP_BLANKS_AND_EOL                                             \
>   do { while ((ctxt->cur < ctxt->end) && (c_isblank(CUR) || IS_EOL(CUR))) { \
>-         if (CUR == '\n') ctxt->line++;	                                \
>+         if (CUR == '\n') ctxt->line++;                                 \
>          ctxt->cur++; } } while (0)

... with the exception of this line ^^

ACK to the rest.

Jan

> #define SKIP_BLANKS                                                     \
>   do { while ((ctxt->cur < ctxt->end) && (c_isblank(CUR)))              \
>           ctxt->cur++; } while (0)
>
> /************************************************************************
>- *									*
>- *		Structures used by configuration data			*
>- *									*
>+ *                                                                      *
>+ *              Structures used by configuration data                   *
>+ *                                                                      *
>  ************************************************************************/
>
> VIR_ENUM_IMPL(virConf, VIR_CONF_LAST,
>@@ -134,9 +134,9 @@ virConfErrorHelper(const char *file, const char *func, size_t line,
>
>
> /************************************************************************
>- *									*
>- *		Structures allocations and deallocations		*
>- *									*
>+ *                                                                      *
>+ *              Structures allocations and deallocations                *
>+ *                                                                      *
>  ************************************************************************/
>
> /**
>@@ -261,9 +261,9 @@ virConfAddEntry(virConfPtr conf, char *name, virConfValuePtr value, char *comm)
> }
>
> /************************************************************************
>- *									*
>- *			Serialization					*
>- *									*
>+ *                                                                      *
>+ *                      Serialization                                   *
>+ *                                                                      *
>  ************************************************************************/
>
> /**
>@@ -354,9 +354,9 @@ virConfSaveEntry(virBufferPtr buf, virConfEntryPtr cur)
> }
>
> /************************************************************************
>- *									*
>- *			The parser core					*
>- *									*
>+ *                                                                      *
>+ *                      The parser core                                 *
>+ *                                                                      *
>  ************************************************************************/
>
> /**
>@@ -755,9 +755,9 @@ virConfParse(const char *filename, const char *content, int len,
> }
>
> /************************************************************************
>- *									*
>- *			The module entry points				*
>- *									*
>+ *                                                                      *
>+ *                      The module entry points                         *
>+ *                                                                      *
>  ************************************************************************/
>
> /* 10 MB limit on config file size as a sanity check */
>diff --git a/src/util/virerror.h b/src/util/virerror.h
>index 54530d081..054f50fd7 100644
>--- a/src/util/virerror.h
>+++ b/src/util/virerror.h
>@@ -28,9 +28,9 @@ extern virErrorFunc virErrorHandler;
> extern void *virUserData;
>
> /************************************************************************
>- *									*
>- *		API for error handling					*
>- *									*
>+ *                                                                      *
>+ *              API for error handling                                  *
>+ *                                                                      *
>  ************************************************************************/
> int virErrorInitialize(void);
> void virRaiseErrorFull(const char *filename,
>diff --git a/src/util/virxml.c b/src/util/virxml.c
>index 885f59bce..a7c28b1e3 100644
>--- a/src/util/virxml.c
>+++ b/src/util/virxml.c
>@@ -51,9 +51,9 @@ struct virParserData {
>
>
> /************************************************************************
>- *									*
>- * Wrappers around libxml2 XPath specific functions			*
>- *									*
>+ *                                                                      *
>+ * Wrappers around libxml2 XPath specific functions                     *
>+ *                                                                      *
>  ************************************************************************/
>
> /**
>diff --git a/src/xen/xs_internal.c b/src/xen/xs_internal.c
>index 7c82a3444..60d35ebcd 100644
>--- a/src/xen/xs_internal.c
>+++ b/src/xen/xs_internal.c
>@@ -60,9 +60,9 @@ static void xenStoreWatchEvent(int watch, int fd, int events, void *data);
> static void xenStoreWatchListFree(xenStoreWatchListPtr list);
>
> /************************************************************************
>- *									*
>- *		Helper internal APIs					*
>- *									*
>+ *                                                                      *
>+ *              Helper internal APIs                                    *
>+ *                                                                      *
>  ************************************************************************/
>
> /**
>@@ -92,9 +92,9 @@ virDomainDoStoreQuery(virConnectPtr conn, int domid, const char *path)
> }
>
> /************************************************************************
>- *									*
>- *		Canonical internal APIs					*
>- *									*
>+ *                                                                      *
>+ *              Canonical internal APIs                                 *
>+ *                                                                      *
>  ************************************************************************/
> /**
>  * xenStoreOpen:
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: Digital signature
URL: <http://listman.redhat.com/archives/libvir-list/attachments/20171018/b466abe1/attachment-0001.sig>


More information about the libvir-list mailing list