Changeset 69138 in vbox for trunk/src/VBox/Additions/linux/drm

Timestamp:

Oct 20, 2017 8:33:43 AM (7 years ago)

Author:

vboxsync

Message:

Additions/linux/drm: fix source transformation script for DOS line endings.
bugref:8524: Additions/linux: play nicely with distribution-installed

Our script for transforming vboxvideo code from our coding style to the
kernel one matched on end-of-line markers but did not take into account
that there might be DOS-style Ctrl-M characters before them. This change
drops matching end-of-line altogether except in one harmless case.

File:

• trunk/src/VBox/Additions/linux/drm/indent.sed (modified) (2 diffs)

trunk/src/VBox/Additions/linux/drm/indent.sed

@@ -43 +43 @@
 }
 /^\/\* \$Id:.*\*\/$/d
-/^typedef .* HGSMIOFFSET;$/d
-/^typedef .* HGSMISIZE;$/d
-s/^#\( *\)include <\([^/]*\)>$/#\1include "\2"/g
+/^typedef .* HGSMIOFFSET;/d
+/^typedef .* HGSMISIZE;/d
+s/^#\( *\)include <\([^/]*\)>/#\1include "\2"/g
 
 # File names:
@@ -88 +88 @@
 s/\bVBVO_PORT_WRITE_U16\b *( *\(\b[^(),]*\b\) *, *\(\b[^(),]*\b\) *)/outw(\2, \1)/g
 s/\bVBVO_PORT_WRITE_U32\b *( *\(\b[^(),]*\b\) *, *\(\b[^(),]*\b\) *)/outl(\2, \1)/g
+s/\bVBVO_PORT_WRITE_U[0-9]*\b/VBVO_PORT_WRITE_statement_should_be_on_one_line/g
 
 # Macros:
 s/\b_1K\b/1024/g
 s/\b_4M\b/4*1024*1024/g
-s/\bAssert\b\([^;]*\);$/WARN_ON_ONCE(!(\1));/g
+s/\bAssert\b\([^;]*\);/WARN_ON_ONCE(!(\1));/g
 s/\bAssertCompile\b/assert_compile/g
 s/\bAssertCompileSize\b/assert_compile_size/g
-s/\bAssertPtr\b\([^;]*\);$/WARN_ON_ONCE(!(\1));/g
+s/\bAssertPtr\b\([^;]*\);/WARN_ON_ONCE(!(\1));/g
 /AssertPtrNullReturnVoid/d
-s/\bAssertRC\b\([^;]*\);$/WARN_ON_ONCE(RT_FAILURE\1);/g
+s/\bAssertRC\b\([^;]*\);/WARN_ON_ONCE(RT_FAILURE\1);/g
+s/\bAssertRC\b/Assert_RC_statement_should_be_on_one_line/g
 s/\bDECLCALLBACK\b(\([^)]*\))/\1/g
 s/\bDECLCALLBACKMEMBER\b(\([^,)]*\), *\([^,)]*\))/\1 (*\2)/g