]> git.ipfire.org Git - thirdparty/libvirt.git/commitdiff
cfg.mk: Only force _LAST enum on VIR_ENUM_IMPL second line
authorCole Robinson <crobinso@redhat.com>
Sun, 7 Apr 2019 23:04:08 +0000 (19:04 -0400)
committerCole Robinson <crobinso@redhat.com>
Thu, 11 Apr 2019 16:47:29 +0000 (12:47 -0400)
Drop the checking for _LAST optionally on the first line, previous
patch removed all those instances

Signed-off-by: Cole Robinson <crobinso@redhat.com>
cfg.mk

diff --git a/cfg.mk b/cfg.mk
index bb684f381db29ee3455732a0c406559e766e7e1f..b785089910b64d39184dba47d20cd7161862ba35 100644 (file)
--- a/cfg.mk
+++ b/cfg.mk
@@ -809,11 +809,11 @@ sc_prohibit_cross_inclusion:
 sc_require_enum_last_marker:
        @$(VC_LIST_EXCEPT) | xargs \
                $(GREP) -A1 -nE '^[^#]*VIR_ENUM_IMPL *\(' /dev/null \
-          | $(SED) -ne '/VIR_ENUM_IMPL[^,]*,$$/N' \
-            -e '/VIR_ENUM_IMPL[^,]*,[^,]*[^_,][^L,][^A,][^S,][^T,],/p' \
+          | $(SED) -ne '/VIR_ENUM_IMPL.*,$$/N' \
+            -e '/VIR_ENUM_IMPL[^,]*,[^,]*,[^,]*[^_,][^L,][^A,][^S,][^T,],/p' \
             -e '/VIR_ENUM_IMPL[^,]*,[^,]\{0,4\},/p' \
           | $(GREP) . && \
-         { echo '$(ME): enum impl needs to use _LAST marker' 1>&2; \
+         { echo '$(ME): enum impl needs _LAST marker on second line' 1>&2; \
            exit 1; } || :
 
 # In Python files we don't want to end lines with a semicolon like in C