Remove backslash alignment attempts

Right-aligning backslashes when defining macros or using complex commands in Makefiles looks cute, but as soon as any changes is required to the code you end up with either distractingly broken alignment or unnecessarily big diffs where most of the changes are just pushing all backslashes a few characters to one side. Generated using $ git grep -El '[[:blank:]][[:blank:]]\\$' | \ grep -E '*\.([chx]|am|mk)$$' | \ while read f; do \ sed -Ei 's/[[:blank:]]*[[:blank:]]\\$/ \\/g' "$f"; \ done Signed-off-by: Andrea Bolognani <abologna@redhat.com>
2026-09-03 20:53:04 -05:00 · 2017-11-03 13:24:12 +01:00
parent a92c4f7537
commit 3e7db8d3e8
223 changed files with 6392 additions and 6392 deletions
@@ -33,17 +33,17 @@ CLEANFILES =

 WARN_CFLAGS += $(STRICT_FRAME_LIMIT_CFLAGS)

-DAEMON_GENERATED =			\
-		remote_dispatch.h	\
-		lxc_dispatch.h		\
-		qemu_dispatch.h		\
-		admin_dispatch.h	\
+DAEMON_GENERATED = \
+		remote_dispatch.h \
+		lxc_dispatch.h \
+		qemu_dispatch.h \
+		admin_dispatch.h \
 		$(NULL)

-DAEMON_SOURCES =					\
-		libvirtd.c libvirtd.h			\
-		remote.c remote.h			\
-		stream.c stream.h			\
+DAEMON_SOURCES = \
+		libvirtd.c libvirtd.h \
+		remote.c remote.h \
+		stream.c stream.h \
 		$(DAEMON_GENERATED)

 LIBVIRTD_CONF_SOURCES = libvirtd-config.c libvirtd-config.h
@@ -57,33 +57,33 @@ MANINFILES = \
 	$(NULL)

 DISTCLEANFILES =
-EXTRA_DIST =						\
-	remote_dispatch.h				\
-	lxc_dispatch.h					\
-	qemu_dispatch.h					\
-	admin_dispatch.h				\
-	libvirtd.conf					\
-	libvirtd.init.in				\
-	libvirtd.upstart				\
-	libvirtd.policy.in				\
-	libvirt.rules					\
-	libvirtd.sasl					\
-	libvirtd.service.in				\
-	virt-guest-shutdown.target		\
-	libvirtd.sysconf				\
-	libvirtd.sysctl					\
-	libvirtd.aug                                    \
-	libvirtd.logrotate.in                           \
-	libvirtd.qemu.logrotate.in                      \
-	libvirtd.lxc.logrotate.in                       \
-	libvirtd.libxl.logrotate.in                     \
-	libvirtd.uml.logrotate.in                       \
-	test_libvirtd.aug.in                             \
-	THREADS.txt					\
-	$(PODFILES)					\
-	$(MANINFILES)					\
-	$(DAEMON_SOURCES)				\
-	$(LIBVIRTD_CONF_SOURCES)			\
+EXTRA_DIST = \
+	remote_dispatch.h \
+	lxc_dispatch.h \
+	qemu_dispatch.h \
+	admin_dispatch.h \
+	libvirtd.conf \
+	libvirtd.init.in \
+	libvirtd.upstart \
+	libvirtd.policy.in \
+	libvirt.rules \
+	libvirtd.sasl \
+	libvirtd.service.in \
+	virt-guest-shutdown.target \
+	libvirtd.sysconf \
+	libvirtd.sysctl \
+	libvirtd.aug \
+	libvirtd.logrotate.in \
+	libvirtd.qemu.logrotate.in \
+	libvirtd.lxc.logrotate.in \
+	libvirtd.libxl.logrotate.in \
+	libvirtd.uml.logrotate.in \
+	test_libvirtd.aug.in \
+	THREADS.txt \
+	$(PODFILES) \
+	$(MANINFILES) \
+	$(DAEMON_SOURCES) \
+	$(LIBVIRTD_CONF_SOURCES) \
 	$(NULL)

 BUILT_SOURCES =
@@ -128,11 +128,11 @@ libvirtd_conf_la_CFLAGS = \
 	$(WARN_CFLAGS) $(PIE_CFLAGS) \
 	$(COVERAGE_CFLAGS) \
 	$(NULL)
-libvirtd_conf_la_LDFLAGS =				\
-	$(RELRO_LDFLAGS)				\
-	$(PIE_LDFLAGS)					\
-	$(COVERAGE_LDFLAGS)				\
-	$(NO_INDIRECT_LDFLAGS)				\
+libvirtd_conf_la_LDFLAGS = \
+	$(RELRO_LDFLAGS) \
+	$(PIE_LDFLAGS) \
+	$(COVERAGE_LDFLAGS) \
+	$(NO_INDIRECT_LDFLAGS) \
 	$(NULL)
 libvirtd_conf_la_LIBADD = $(LIBXML_LIBS)

@@ -141,20 +141,20 @@ libvirtd_admin_la_SOURCES = \
 		admin.c admin.h admin_server.c admin_server.h

 libvirtd_admin_la_CFLAGS = \
-		$(AM_CFLAGS)		\
-		$(XDR_CFLAGS)		\
-		$(PIE_CFLAGS)		\
-		$(WARN_CFLAGS)		\
-		$(LIBXML_CFLAGS)	\
-		$(COVERAGE_CFLAGS)	\
+		$(AM_CFLAGS) \
+		$(XDR_CFLAGS) \
+		$(PIE_CFLAGS) \
+		$(WARN_CFLAGS) \
+		$(LIBXML_CFLAGS) \
+		$(COVERAGE_CFLAGS) \
 		$(NULL)
 libvirtd_admin_la_LDFLAGS = \
-		$(PIE_LDFLAGS)		\
-		$(RELRO_LDFLAGS)	\
-		$(COVERAGE_LDFLAGS)	\
-		$(NO_INDIRECT_LDFLAGS)  \
+		$(PIE_LDFLAGS) \
+		$(RELRO_LDFLAGS) \
+		$(COVERAGE_LDFLAGS) \
+		$(NO_INDIRECT_LDFLAGS) \
 		$(NULL)
-libvirtd_admin_la_LIBADD =	\
+libvirtd_admin_la_LIBADD = \
 		../src/libvirt-admin.la

 man8_MANS = libvirtd.8
@@ -182,18 +182,18 @@ libvirtd_CFLAGS = \
 	$(COVERAGE_CFLAGS) \
 	-DQEMUD_PID_FILE="\"$(QEMUD_PID_FILE)\""

-libvirtd_LDFLAGS =					\
-	$(RELRO_LDFLAGS)				\
-	$(PIE_LDFLAGS)					\
-	$(COVERAGE_LDFLAGS)				\
-	$(NO_INDIRECT_LDFLAGS)				\
+libvirtd_LDFLAGS = \
+	$(RELRO_LDFLAGS) \
+	$(PIE_LDFLAGS) \
+	$(COVERAGE_LDFLAGS) \
+	$(NO_INDIRECT_LDFLAGS) \
 	$(NULL)

-libvirtd_LDADD =					\
-	$(LIBXML_LIBS)					\
-	$(GNUTLS_LIBS)					\
-	$(SASL_LIBS)					\
-	$(DBUS_LIBS)					\
+libvirtd_LDADD = \
+	$(LIBXML_LIBS) \
+	$(GNUTLS_LIBS) \
+	$(SASL_LIBS) \
+	$(DBUS_LIBS) \
 	$(LIBNL_LIBS)

 if WITH_DTRACE_PROBES
@@ -279,33 +279,33 @@ LOGROTATE_CONFS = libvirtd.qemu.logrotate libvirtd.lxc.logrotate \
 BUILT_SOURCES += $(LOGROTATE_CONFS)

 libvirtd.logrotate: libvirtd.logrotate.in
-	$(AM_V_GEN)sed						\
-	    -e 's|[@]localstatedir[@]|$(localstatedir)|g'	\
+	$(AM_V_GEN)sed \
+	    -e 's|[@]localstatedir[@]|$(localstatedir)|g' \
 	    < $< > $@-t && \
 	mv $@-t $@

 libvirtd.qemu.logrotate: libvirtd.qemu.logrotate.in
-	$(AM_V_GEN)sed						\
-	    -e 's|[@]localstatedir[@]|$(localstatedir)|g'	\
+	$(AM_V_GEN)sed \
+	    -e 's|[@]localstatedir[@]|$(localstatedir)|g' \
 	    < $< > $@-t && \
 	mv $@-t $@

 libvirtd.lxc.logrotate: libvirtd.lxc.logrotate.in
-	$(AM_V_GEN)sed						\
-	    -e 's|[@]localstatedir[@]|$(localstatedir)|g'	\
-	    < $< > $@-t &&					\
+	$(AM_V_GEN)sed \
+	    -e 's|[@]localstatedir[@]|$(localstatedir)|g' \
+	    < $< > $@-t && \
 	    mv $@-t $@

 libvirtd.libxl.logrotate: libvirtd.libxl.logrotate.in
-	$(AM_V_GEN)sed						\
-	    -e 's|[@]localstatedir[@]|$(localstatedir)|g'	\
-	    < $< > $@-t &&					\
+	$(AM_V_GEN)sed \
+	    -e 's|[@]localstatedir[@]|$(localstatedir)|g' \
+	    < $< > $@-t && \
 	    mv $@-t $@

 libvirtd.uml.logrotate: libvirtd.uml.logrotate.in
-	$(AM_V_GEN)sed						\
-	    -e 's|[@]localstatedir[@]|$(localstatedir)|g'	\
-	    < $< > $@-t &&					\
+	$(AM_V_GEN)sed \
+	    -e 's|[@]localstatedir[@]|$(localstatedir)|g' \
+	    < $< > $@-t && \
 	    mv $@-t $@

 install-logrotate: $(LOGROTATE_CONFS)
@@ -415,20 +415,20 @@ uninstall-init-systemd:
 endif ! LIBVIRT_INIT_SCRIPT_SYSTEMD

 libvirtd.init: libvirtd.init.in $(top_builddir)/config.status
-	$(AM_V_GEN)sed						\
-	    -e 's|[@]localstatedir[@]|$(localstatedir)|g'	\
-	    -e 's|[@]sbindir[@]|$(sbindir)|g'			\
-	    -e 's|[@]sysconfdir[@]|$(sysconfdir)|g'		\
-	    < $< > $@-t &&					\
-	    chmod a+x $@-t &&					\
+	$(AM_V_GEN)sed \
+	    -e 's|[@]localstatedir[@]|$(localstatedir)|g' \
+	    -e 's|[@]sbindir[@]|$(sbindir)|g' \
+	    -e 's|[@]sysconfdir[@]|$(sysconfdir)|g' \
+	    < $< > $@-t && \
+	    chmod a+x $@-t && \
 	    mv $@-t $@

 libvirtd.service: libvirtd.service.in $(top_builddir)/config.status
-	$(AM_V_GEN)sed						\
-	    -e 's|[@]localstatedir[@]|$(localstatedir)|g'	\
-	    -e 's|[@]sbindir[@]|$(sbindir)|g'			\
-	    -e 's|[@]sysconfdir[@]|$(sysconfdir)|g'		\
-	    < $< > $@-t &&					\
+	$(AM_V_GEN)sed \
+	    -e 's|[@]localstatedir[@]|$(localstatedir)|g' \
+	    -e 's|[@]sbindir[@]|$(sbindir)|g' \
+	    -e 's|[@]sysconfdir[@]|$(sysconfdir)|g' \
+	    < $< > $@-t && \
 	    mv $@-t $@


@@ -58,15 +58,15 @@
 VIR_LOG_INIT("daemon.remote");

 #if SIZEOF_LONG < 8
-# define HYPER_TO_TYPE(_type, _to, _from)                               \
-    do {                                                                \
-        if ((_from) != (_type)(_from)) {                                \
-            virReportError(VIR_ERR_OVERFLOW,                            \
+# define HYPER_TO_TYPE(_type, _to, _from) \
+    do { \
+        if ((_from) != (_type)(_from)) { \
+            virReportError(VIR_ERR_OVERFLOW, \
                           _("conversion from hyper to %s overflowed"), \
-                           #_type);                                     \
-            goto cleanup;                                               \
-        }                                                               \
-        (_to) = (_from);                                                \
+                           #_type); \
+            goto cleanup; \
+        } \
+        (_to) = (_from); \
    } while (0)

 # define HYPER_TO_LONG(_to, _from) HYPER_TO_TYPE(long, _to, _from)
@@ -1670,22 +1670,22 @@ void remoteRelayConnectionClosedEvent(virConnectPtr conn ATTRIBUTE_UNUSED, int r
                                  &msg);
 }

-#define DEREG_CB(conn, eventCallbacks, neventCallbacks, deregFcn, name)     \
-    do {                                                                    \
-        size_t i;                                                           \
-        for (i = 0; i < neventCallbacks; i++) {                             \
-            int callbackID = eventCallbacks[i]->callbackID;                 \
-            if (callbackID < 0) {                                           \
+#define DEREG_CB(conn, eventCallbacks, neventCallbacks, deregFcn, name) \
+    do { \
+        size_t i; \
+        for (i = 0; i < neventCallbacks; i++) { \
+            int callbackID = eventCallbacks[i]->callbackID; \
+            if (callbackID < 0) { \
                VIR_WARN("unexpected incomplete %s callback %zu", name, i); \
-                continue;                                                   \
-            }                                                               \
-            VIR_DEBUG("Deregistering remote %s event relay %d",             \
-                      name, callbackID);                                    \
-            eventCallbacks[i]->callbackID = -1;                             \
-            if (deregFcn(conn, callbackID) < 0)                             \
-                VIR_WARN("unexpected %s event deregister failure", name);   \
-        }                                                                   \
-        VIR_FREE(eventCallbacks);                                           \
+                continue; \
+            } \
+            VIR_DEBUG("Deregistering remote %s event relay %d", \
+                      name, callbackID); \
+            eventCallbacks[i]->callbackID = -1; \
+            if (deregFcn(conn, callbackID) < 0) \
+                VIR_WARN("unexpected %s event deregister failure", name); \
+        } \
+        VIR_FREE(eventCallbacks); \
    } while (0);

 /*