From patchwork Mon Jan 2 11:47:42 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Finucane X-Patchwork-Id: 710136 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from mail.linuxfoundation.org (mail.linuxfoundation.org [140.211.169.12]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3tsb2Q31WCz9t0v for ; Mon, 2 Jan 2017 22:49:02 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="key not found in DNS" (0-bit key; unprotected) header.d=that.guru header.i=@that.guru header.b="eI41E9u4"; dkim-atps=neutral Received: from mail.linux-foundation.org (localhost [127.0.0.1]) by mail.linuxfoundation.org (Postfix) with ESMTP id 559A1959; Mon, 2 Jan 2017 11:48:05 +0000 (UTC) X-Original-To: dev@openvswitch.org Delivered-To: ovs-dev@mail.linuxfoundation.org Received: from smtp1.linuxfoundation.org (smtp1.linux-foundation.org [172.17.192.35]) by mail.linuxfoundation.org (Postfix) with ESMTPS id 5433D480 for ; Mon, 2 Jan 2017 11:48:03 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from brown.birch.relay.mailchannels.net (brown.birch.relay.mailchannels.net [23.83.209.23]) by smtp1.linuxfoundation.org (Postfix) with ESMTPS id 4BBB2138 for ; Mon, 2 Jan 2017 11:48:02 +0000 (UTC) X-Sender-Id: mxroute|x-authuser|stephen@that.guru Received: from relay.mailchannels.net (localhost [127.0.0.1]) by relay.mailchannels.net (Postfix) with ESMTP id 751C1100E45 for ; Mon, 2 Jan 2017 11:48:01 +0000 (UTC) Received: from one.mxroute.com (ip-10-27-139-41.us-west-2.compute.internal [10.27.139.41]) by relay.mailchannels.net (Postfix) with ESMTPA id E6669101323 for ; Mon, 2 Jan 2017 11:48:00 +0000 (UTC) X-Sender-Id: mxroute|x-authuser|stephen@that.guru Received: from one.mxroute.com ([UNAVAILABLE]. [10.236.29.11]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384) by 0.0.0.0:2500 (trex/5.7.8); Mon, 02 Jan 2017 11:48:01 +0000 X-MC-Relay: Neutral X-MailChannels-SenderId: mxroute|x-authuser|stephen@that.guru X-MailChannels-Auth-Id: mxroute X-MC-Loop-Signature: 1483357681242:734000729 X-MC-Ingress-Time: 1483357681242 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=that.guru; s=default; h=References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From: Sender:Reply-To:MIME-Version:Content-Type:Content-Transfer-Encoding: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=LMDgh2qrxsGT/zT6H6J39db7/kNV7FUXAAfkzQP0D8Q=; b=eI41E9u4QT/brsvA+tJt+IHuWS wMZPf7rtZlbcSMGPcu6n2875tRaAZZme92Re1m8fNEZiuO8+imzYoQIkuYnHXmKsM5sYUaFKmeKso cjolJVW5VMtl7RSZL9HN6vqUcLYiSk5MIAE+VQ9TMexSJPDCkfKIis/H2jKa/YrKCfF7li2QSp1x4 AZ8+t7pi6dnvJ3Kxrbs3X70gsJOHXPgW1ICXpgv7k2lGgQ+HVrqZHwt5gUErL8voDOpu0PRNKy9GE 7PYti/r9/Q1k4uewnsfcl+xzX31/6pJor68N3/Th7I5T+eJ2Vek0mKuxPaFYBktBpGa3uukYJWr9r M+RCV7Pw==; From: Stephen Finucane To: dev@openvswitch.org Date: Mon, 2 Jan 2017 11:47:42 +0000 Message-Id: <20170102114742.13949-5-stephen@that.guru> X-Mailer: git-send-email 2.9.3 In-Reply-To: <20170102114742.13949-1-stephen@that.guru> References: <20170102114742.13949-1-stephen@that.guru> X-AuthUser: stephen@that.guru X-Spam-Status: No, score=-1.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_NONE, T_DKIM_INVALID, WEIRD_QUOTING autolearn=no version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on smtp1.linux-foundation.org Subject: [ovs-dev] [PATCH v2 5/5] make: Standardize indentation X-BeenThere: ovs-dev@openvswitch.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: ovs-dev-bounces@openvswitch.org Errors-To: ovs-dev-bounces@openvswitch.org If we're going to mix tabs and spaces, let's do it consistently. Signed-off-by: Stephen Finucane --- Makefile.am | 178 ++++++++++++++++++++++++++++++------------------------------ 1 file changed, 89 insertions(+), 89 deletions(-) diff --git a/Makefile.am b/Makefile.am index 7969fd1..96917c5 100644 --- a/Makefile.am +++ b/Makefile.am @@ -138,44 +138,44 @@ ro_shell = printf '\043 Generated automatically -- do not modify! -*- buffer- SUFFIXES += .in .in: $(AM_V_GEN)$(PERL) $(srcdir)/build-aux/soexpand.pl -I$(srcdir) < $< | \ - sed \ - -e 's,[@]PKIDIR[@],$(PKIDIR),g' \ - -e 's,[@]LOGDIR[@],$(LOGDIR),g' \ - -e 's,[@]DBDIR[@],$(DBDIR),g' \ - -e 's,[@]PERL[@],$(PERL),g' \ - -e 's,[@]PYTHON[@],$(PYTHON),g' \ - -e 's,[@]RUNDIR[@],$(RUNDIR),g' \ - -e 's,[@]VERSION[@],$(VERSION),g' \ - -e 's,[@]localstatedir[@],$(localstatedir),g' \ - -e 's,[@]pkgdatadir[@],$(pkgdatadir),g' \ - -e 's,[@]sysconfdir[@],$(sysconfdir),g' \ - -e 's,[@]bindir[@],$(bindir),g' \ - -e 's,[@]sbindir[@],$(sbindir),g' \ - -e 's,[@]abs_builddir[@],$(abs_builddir),g' \ - -e 's,[@]abs_top_srcdir[@],$(abs_top_srcdir),g' \ - > $@.tmp + sed \ + -e 's,[@]PKIDIR[@],$(PKIDIR),g' \ + -e 's,[@]LOGDIR[@],$(LOGDIR),g' \ + -e 's,[@]DBDIR[@],$(DBDIR),g' \ + -e 's,[@]PERL[@],$(PERL),g' \ + -e 's,[@]PYTHON[@],$(PYTHON),g' \ + -e 's,[@]RUNDIR[@],$(RUNDIR),g' \ + -e 's,[@]VERSION[@],$(VERSION),g' \ + -e 's,[@]localstatedir[@],$(localstatedir),g' \ + -e 's,[@]pkgdatadir[@],$(pkgdatadir),g' \ + -e 's,[@]sysconfdir[@],$(sysconfdir),g' \ + -e 's,[@]bindir[@],$(bindir),g' \ + -e 's,[@]sbindir[@],$(sbindir),g' \ + -e 's,[@]abs_builddir[@],$(abs_builddir),g' \ + -e 's,[@]abs_top_srcdir[@],$(abs_top_srcdir),g' \ + > $@.tmp @if head -n 1 $@.tmp | grep '#!' > /dev/null; then \ - chmod +x $@.tmp; \ + chmod +x $@.tmp; \ fi $(AM_V_at) mv $@.tmp $@ SUFFIXES += .xml %: %.xml $(AM_V_GEN)$(run_python) $(srcdir)/build-aux/xml2nroff $< > $@.tmp \ - -I $(srcdir) \ - --version=$(VERSION) \ - PKIDIR='$(PKIDIR)' \ - LOGDIR='$(LOGDIR)' \ - DBDIR='$(DBDIR)' \ - PERL='$(PERL)' \ - PYTHON='$(PYTHON)' \ - RUNDIR='$(RUNDIR)' \ - VERSION='$(VERSION)' \ - localstatedir='$(localstatedir)' \ - pkgdatadir='$(pkgdatadir)' \ - sysconfdir='$(sysconfdir)' \ - bindir='$(bindir)' \ - sbindir='$(sbindir)' + -I $(srcdir) \ + --version=$(VERSION) \ + PKIDIR='$(PKIDIR)' \ + LOGDIR='$(LOGDIR)' \ + DBDIR='$(DBDIR)' \ + PERL='$(PERL)' \ + PYTHON='$(PYTHON)' \ + RUNDIR='$(RUNDIR)' \ + VERSION='$(VERSION)' \ + localstatedir='$(localstatedir)' \ + pkgdatadir='$(pkgdatadir)' \ + sysconfdir='$(sysconfdir)' \ + bindir='$(bindir)' \ + sbindir='$(sbindir)' $(AM_v_at)mv $@.tmp $@ clean-pycov: @@ -193,17 +193,17 @@ if GNU_MAKE ALL_LOCAL += dist-hook-git dist-hook-git: distfiles @if test -e $(srcdir)/.git && (git --version) >/dev/null 2>&1; then \ - (cd datapath && $(MAKE) distfiles); \ - (cat distfiles; sed 's|^|datapath/|' datapath/distfiles) | \ - LC_ALL=C sort -u > all-distfiles; \ - (cd $(srcdir) && git ls-files) | grep -v '\.gitignore$$' | \ - LC_ALL=C sort -u > all-gitfiles; \ + (cd datapath && $(MAKE) distfiles); \ + (cat distfiles; sed 's|^|datapath/|' datapath/distfiles) | \ + LC_ALL=C sort -u > all-distfiles; \ + (cd $(srcdir) && git ls-files) | grep -v '\.gitignore$$' | \ + LC_ALL=C sort -u > all-gitfiles; \ LC_ALL=C comm -1 -3 all-distfiles all-gitfiles > missing-distfiles; \ - if test -s missing-distfiles; then \ + if test -s missing-distfiles; then \ echo "The following files are in git but not the distribution:"; \ - cat missing-distfiles; \ - exit 1; \ - fi; \ + cat missing-distfiles; \ + exit 1; \ + fi; \ fi CLEANFILES += all-distfiles all-gitfiles missing-distfiles # The following is based on commands for the Automake "distdir" target. @@ -214,7 +214,7 @@ distfiles: Makefile for file in $$list; do echo $$file; done | \ sed -e "s|^$$srcdirstrip/||;t" \ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t" | \ - LC_ALL=C sort -u > $@ + LC_ALL=C sort -u > $@ CLEANFILES += distfiles endif .PHONY: dist-hook-git @@ -224,12 +224,12 @@ ALL_LOCAL += config-h-check config-h-check: @cd $(srcdir); \ if test -e .git && (git --version) >/dev/null 2>&1 && \ - git --no-pager grep -L '#include ' `git ls-files | grep '\.c$$' | \ - grep -vE '^datapath|^lib/sflow|^third-party|^datapath-windows|^python'`; \ + git --no-pager grep -L '#include ' `git ls-files | grep '\.c$$' | \ + grep -vE '^datapath|^lib/sflow|^third-party|^datapath-windows|^python'`; \ then \ - echo "See above for list of violations of the rule that"; \ - echo "every C source file must #include ."; \ - exit 1; \ + echo "See above for list of violations of the rule that"; \ + echo "every C source file must #include ."; \ + exit 1; \ fi .PHONY: config-h-check @@ -238,13 +238,13 @@ ALL_LOCAL += printf-check printf-check: @cd $(srcdir); \ if test -e .git && (git --version) >/dev/null 2>&1 && \ - git --no-pager grep -n -E -e '%[-+ #0-9.*]*([ztj]|hh)' --and --not -e 'ovs_scan' `git ls-files | grep '\.[ch]$$' | \ - grep -vE '^datapath|^lib/sflow|^third-party'`; \ + git --no-pager grep -n -E -e '%[-+ #0-9.*]*([ztj]|hh)' --and --not -e 'ovs_scan' `git ls-files | grep '\.[ch]$$' | \ + grep -vE '^datapath|^lib/sflow|^third-party'`; \ then \ - echo "See above for list of violations of the rule that"; \ - echo "'z', 't', 'j', 'hh' printf() type modifiers are"; \ - echo "forbidden. See CodingStyle.rst for replacements."; \ - exit 1; \ + echo "See above for list of violations of the rule that"; \ + echo "'z', 't', 'j', 'hh' printf() type modifiers are"; \ + echo "forbidden. See CodingStyle.rst for replacements."; \ + exit 1; \ fi .PHONY: printf-check @@ -252,25 +252,25 @@ printf-check: ALL_LOCAL += static-check static-check: @if test -e $(srcdir)/.git && (git --version) >/dev/null 2>&1 && \ - git --no-pager grep -n -E '^[ ]+(struct vlog_rate_limit|pthread_once_t|struct ovsthread_once).*=' $(srcdir); \ - then \ - echo "See above for list of violations of the rule that "; \ - echo "certain data structures must always be 'static'"; \ - exit 1; \ - fi + git --no-pager grep -n -E '^[ ]+(struct vlog_rate_limit|pthread_once_t|struct ovsthread_once).*=' $(srcdir); \ + then \ + echo "See above for list of violations of the rule that "; \ + echo "certain data structures must always be 'static'"; \ + exit 1; \ + fi .PHONY: static-check # Check that assert.h is not used outside a whitelist of files. ALL_LOCAL += check-assert-h-usage check-assert-h-usage: @if test -e $(srcdir)/.git && (git --version) >/dev/null 2>&1 && \ - (cd $(srcdir) && git --no-pager grep -l -E '[<]assert.h[>]') | \ - $(EGREP) -v '^lib/(sflow_receiver|vlog).c$$|^tests/'; \ - then \ - echo "Files listed above unexpectedly #include <""assert.h"">."; \ - echo "Please use ovs_assert (from util.h) instead of assert."; \ - exit 1; \ - fi + (cd $(srcdir) && git --no-pager grep -l -E '[<]assert.h[>]') | \ + $(EGREP) -v '^lib/(sflow_receiver|vlog).c$$|^tests/'; \ + then \ + echo "Files listed above unexpectedly #include <""assert.h"">."; \ + echo "Please use ovs_assert (from util.h) instead of assert."; \ + exit 1; \ + fi .PHONY: check-assert-h-usage # Check that LITTLE_ENDIAN and BIG_ENDIAN are not used unless BYTE_ORDER is @@ -280,28 +280,28 @@ check-assert-h-usage: ALL_LOCAL += check-endian check-endian: @if test -e $(srcdir)/.git && (git --version) >/dev/null 2>&1 && \ - (cd $(srcdir) && git --no-pager grep -l -E \ - -e 'BIG_ENDIAN|LITTLE_ENDIAN' --and --not -e 'BYTE_ORDER' | \ - $(EGREP) -v '^datapath/'); \ - then \ - echo "See above for list of files that misuse LITTLE""_ENDIAN"; \ - echo "or BIG""_ENDIAN. Please use WORDS_BIGENDIAN instead."; \ - exit 1; \ - fi + (cd $(srcdir) && git --no-pager grep -l -E \ + -e 'BIG_ENDIAN|LITTLE_ENDIAN' --and --not -e 'BYTE_ORDER' | \ + $(EGREP) -v '^datapath/'); \ + then \ + echo "See above for list of files that misuse LITTLE""_ENDIAN"; \ + echo "or BIG""_ENDIAN. Please use WORDS_BIGENDIAN instead."; \ + exit 1; \ + fi .PHONY: check-endian ALL_LOCAL += thread-safety-check thread-safety-check: @cd $(srcdir); \ if test -e .git && (git --version) >/dev/null 2>&1 && \ - grep -n -f build-aux/thread-safety-blacklist \ - `git ls-files | grep '\.[ch]$$' \ - | $(EGREP) -v '^datapath|^lib/sflow|^third-party'` /dev/null \ - | $(EGREP) -v ':[ ]*/?\*'; \ + grep -n -f build-aux/thread-safety-blacklist \ + `git ls-files | grep '\.[ch]$$' \ + | $(EGREP) -v '^datapath|^lib/sflow|^third-party'` /dev/null \ + | $(EGREP) -v ':[ ]*/?\*'; \ then \ - echo "See above for list of calls to functions that are"; \ - echo "blacklisted due to thread safety issues"; \ - exit 1; \ + echo "See above for list of calls to functions that are"; \ + echo "blacklisted due to thread safety issues"; \ + exit 1; \ fi EXTRA_DIST += build-aux/thread-safety-blacklist .PHONY: thread-safety-check @@ -311,9 +311,9 @@ ALL_LOCAL += manpage-check manpage-check: $(man_MANS) $(dist_man_MANS) $(noinst_man_MANS) @error=false; \ for manpage in $?; do \ - LANG=en_US.UTF-8 groff -w mac -w delim -w escape -w input -w missing -w tab -T utf8 -man -p -z $$manpage >$@.tmp 2>&1; \ - if grep warning: $@.tmp; then error=:; fi; \ - rm -f $@.tmp; \ + LANG=en_US.UTF-8 groff -w mac -w delim -w escape -w input -w missing -w tab -T utf8 -man -p -z $$manpage >$@.tmp 2>&1; \ + if grep warning: $@.tmp; then error=:; fi; \ + rm -f $@.tmp; \ done; \ if $$error; then exit 1; else touch $@; fi $(AM_V_GEN) touch -c $@ @@ -345,8 +345,8 @@ ALL_LOCAL += flake8-check flake8-check: $(FLAKE8_PYFILES) if HAVE_FLAKE8 $(AM_V_GEN) if flake8 $^ --select=H231,H232,H233,H238 ${FLAKE8_FLAGS} && \ - flake8 $^ --ignore=E121,E123,E125,E126,E127,E128,E129,E131,W503,F811,D,H ${FLAKE8_FLAGS}; then \ - touch $@; else exit 1; fi + flake8 $^ --ignore=E121,E123,E125,E126,E127,E128,E129,E131,W503,F811,D,H ${FLAKE8_FLAGS}; then \ + touch $@; else exit 1; fi else $(srcdir)/build-aux/check-file-changes "python/" "flake8" endif @@ -356,10 +356,10 @@ include $(srcdir)/manpages.mk $(srcdir)/manpages.mk: $(MAN_ROOTS) build-aux/sodepends.pl @$(PERL) $(srcdir)/build-aux/sodepends.pl -I. -I$(srcdir) $(MAN_ROOTS) >$(@F).tmp @if cmp -s $(@F).tmp $@; then \ - touch $@; \ - rm -f $(@F).tmp; \ + touch $@; \ + rm -f $(@F).tmp; \ else \ - mv $(@F).tmp $@; \ + mv $(@F).tmp $@; \ fi CLEANFILES += manpage-dep-check @@ -378,7 +378,7 @@ endif clang-analyze: clean @which clang scan-build >/dev/null 2>&1 || \ - (echo "Unable to find clang/scan-build, Install clang,clang-analyzer packages"; exit 1) + (echo "Unable to find clang/scan-build, Install clang,clang-analyzer packages"; exit 1) @$(MKDIR_P) "$(srcdir)/tests/clang-analyzer-results" @scan-build -o $(srcdir)/tests/clang-analyzer-results --use-cc=$(CC) $(MAKE) .PHONY: clang-analyze