From b52ddefccdb0da84745e4b4da2167cd2cd8d9739 Mon Sep 17 00:00:00 2001 From: Martine Lenders Date: Tue, 19 Jan 2021 14:32:22 +0100 Subject: [PATCH] headerguards: move annotation by offset --- dist/tools/headerguards/check.sh | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/dist/tools/headerguards/check.sh b/dist/tools/headerguards/check.sh index fd710eb8c1..c9d90ebe19 100755 --- a/dist/tools/headerguards/check.sh +++ b/dist/tools/headerguards/check.sh @@ -72,6 +72,16 @@ _headercheck() { DIFF="--- $DIFFFILE\n+++ $DIFFFILE" fi DIFFLINE="$(echo "$line" | sed 's/@@ -\([0-9]\+\).*$/\1/')" + # Parse + # @@ -, ... + DIFFOFFSET="$(echo "$line" | + sed 's/@@ -[0-9]\+\(,\([0-9]\)\+\)\?.*$/\2/')" + if [ -n "$DIFFOFFSET" ]; then + # if there is a DIFFOFFSET, add it to + # DIFFLINE. DIFFLINE starts at 1, so we + # need to subtract 1 to not overshoot. + DIFFLINE=$(( DIFFLINE + DIFFOFFSET - 1 )) + fi fi DIFF="$DIFF\n$(echo "${line}"| sed 's/\\/\\\\/g' )" fi