From: Masahiro Yamada <yamada.masahiro@socionext.com>
Date: Mon, 25 Jul 2016 10:15:27 +0000 (+0900)
Subject: tools: moveconfig: fix cleanup of defines across multiple lines
X-Git-Tag: v2016.09-rc2~125
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=a3a779f7f7b5e48672b4e049beadc0112ff1c342;p=oweals%2Fu-boot.git

tools: moveconfig: fix cleanup of defines across multiple lines

Correct the clean-up of such defines that continue across multiple
lines, like follows:

  #define CONFIG_FOO "this continues to the next line " \
          "this line should be removed too" \
          "this line should be removed as well"

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Reviewed-by: Tom Rini <trini@konsulko.com>
---

diff --git a/tools/moveconfig.py b/tools/moveconfig.py
index 253507999c..a0837140e9 100755
--- a/tools/moveconfig.py
+++ b/tools/moveconfig.py
@@ -408,6 +408,9 @@ def cleanup_one_header(header_path, patterns, options):
 
     matched = []
     for i, line in enumerate(lines):
+        if i - 1 in matched and lines[i - 1][-2:] == '\\\n':
+            matched.append(i)
+            continue
         for pattern in patterns:
             if pattern.search(line):
                 matched.append(i)