Remove trailing blanks.

git-svn-id: http://www.fsfla.org/svn/fsfla/software/linux-libre/scripts@6002 559672b5-ba27-0410-b829-e8f1faed8b1b

diff --git a/deblob-2.6.21 b/deblob-2.6.21
index 1c87d8da62f861b2d19d0daa9caf3a57ab9b5688..1ce3bd3e54b68962c73e1ffa057ad952f67041ec 100755 (executable)
--- a/deblob-2.6.21
+++ b/deblob-2.6.21
@@ -383,12 +383,12 @@ patch --no-backup-if-mismatch --batch -p0 <<\EOF || \
 - *    data in hexadecimal or equivalent format, provided this copyright
 - *    notice is accompanying it.
   */
- 
- 
+
+
 EOF
 clean_blob drivers/net/tg3.c -s 9
 if $have_check; then
-  sed -i 's:\(\/\*(DEBLOBBED)\*\/\),:\1:' drivers/net/tg3.c 
+  sed -i 's:\(\/\*(DEBLOBBED)\*\/\),:\1:' drivers/net/tg3.c
 else
   clean_kconfig drivers/net/Kconfig 'TIGON3'
   clean_mk CONFIG_TIGON3 drivers/net/Makefile

diff --git a/deblob-2.6.22 b/deblob-2.6.22
index 079e77aad046d77b8666be0e5a45660a7b745ff9..63fcadc7589f248ee85c6b84da7211b34f415638 100755 (executable)
--- a/deblob-2.6.22
+++ b/deblob-2.6.22
@@ -383,12 +383,12 @@ patch --no-backup-if-mismatch --batch -p0 <<\EOF || \
 - *    data in hexadecimal or equivalent format, provided this copyright
 - *    notice is accompanying it.
   */
- 
- 
+
+
 EOF
 clean_blob drivers/net/tg3.c -s 9
 if $have_check; then
-  sed -i 's:\(\/\*(DEBLOBBED)\*\/\),:\1:' drivers/net/tg3.c 
+  sed -i 's:\(\/\*(DEBLOBBED)\*\/\),:\1:' drivers/net/tg3.c
 else
   clean_kconfig drivers/net/Kconfig 'TIGON3'
   clean_mk CONFIG_TIGON3 drivers/net/Makefile

diff --git a/deblob-2.6.23 b/deblob-2.6.23
index 90200347940dfdc75678080fe793d3f062b965ec..7cf58c49ce1c1e1940f77ff03a478c72ac5d1a1e 100755 (executable)
--- a/deblob-2.6.23
+++ b/deblob-2.6.23
@@ -388,12 +388,12 @@ patch --no-backup-if-mismatch --batch -p0 <<\EOF || \
 - *    data in hexadecimal or equivalent format, provided this copyright
 - *    notice is accompanying it.
   */
- 
- 
+
+
 EOF
 clean_blob drivers/net/tg3.c -s 9
 if $have_check; then
-  sed -i 's:\(\/\*(DEBLOBBED)\*\/\),:\1:' drivers/net/tg3.c 
+  sed -i 's:\(\/\*(DEBLOBBED)\*\/\),:\1:' drivers/net/tg3.c
 else
   clean_kconfig drivers/net/Kconfig 'TIGON3'
   clean_mk CONFIG_TIGON3 drivers/net/Makefile

diff --git a/deblob-2.6.24 b/deblob-2.6.24
index d9e7f6ffde575f4a490bc9ad6bf97a89504f4f78..36dbd97c0c8c803f669e2f28329f3362a507c4c5 100755 (executable)
--- a/deblob-2.6.24
+++ b/deblob-2.6.24
@@ -388,12 +388,12 @@ patch --no-backup-if-mismatch --batch -p0 <<\EOF || \
 - *    data in hexadecimal or equivalent format, provided this copyright
 - *    notice is accompanying it.
   */
- 
- 
+
+
 EOF
 clean_blob drivers/net/tg3.c -s 9
 if $have_check; then
-  sed -i 's:\(\/\*(DEBLOBBED)\*\/\),:\1:' drivers/net/tg3.c 
+  sed -i 's:\(\/\*(DEBLOBBED)\*\/\),:\1:' drivers/net/tg3.c
 else
   clean_kconfig drivers/net/Kconfig 'TIGON3'
   clean_mk CONFIG_TIGON3 drivers/net/Makefile

diff --git a/deblob-2.6.25 b/deblob-2.6.25
index 90558f49c711a72e4095f3425ba4580c9cd0b340..64fa09be0838735da372ad8739bdc539dfa6608e 100755 (executable)
--- a/deblob-2.6.25
+++ b/deblob-2.6.25
@@ -392,12 +392,12 @@ patch --no-backup-if-mismatch --batch -p0 <<\EOF || \
 - *    data in hexadecimal or equivalent format, provided this copyright
 - *    notice is accompanying it.
   */
- 
- 
+
+
 EOF
 clean_blob drivers/net/tg3.c -s 9
 if $have_check; then
-  sed -i 's:\(\/\*(DEBLOBBED)\*\/\),:\1:' drivers/net/tg3.c 
+  sed -i 's:\(\/\*(DEBLOBBED)\*\/\),:\1:' drivers/net/tg3.c
 else
   clean_kconfig drivers/net/Kconfig 'TIGON3'
   clean_mk CONFIG_TIGON3 drivers/net/Makefile

diff --git a/deblob-2.6.27 b/deblob-2.6.27
index cf6187af98f7307472cb8d8e56fd0b4e16c14278..e1f91d088cd283525c9c5c1974149ea5f233be93 100755 (executable)
--- a/deblob-2.6.27
+++ b/deblob-2.6.27
@@ -190,7 +190,7 @@ clean_sed () {
   filetest $2 || return
   sed -e "$1" "$2" > "$2".deblob || {
     die $2: failed: ${3-applied sed script $1} && return 1; }
-  check_changed $2 && echo $2: ${3-applied sed script $1} 
+  check_changed $2 && echo $2: ${3-applied sed script $1}
 }
 
 reject_firmware () {

diff --git a/deblob-2.6.28 b/deblob-2.6.28
index ab30ec0350ad63de5e921b2a553228560c984fd9..7a9717f1790cb6645f40799e74ddefc66f0fa587 100755 (executable)
--- a/deblob-2.6.28
+++ b/deblob-2.6.28
@@ -190,7 +190,7 @@ clean_sed () {
   filetest $2 || return
   sed -e "$1" "$2" > "$2".deblob || {
     die $2: failed: ${3-applied sed script $1} && return 1; }
-  check_changed $2 && echo $2: ${3-applied sed script $1} 
+  check_changed $2 && echo $2: ${3-applied sed script $1}
 }
 
 reject_firmware () {
@@ -1010,7 +1010,7 @@ clean_sed '
   /for (p = PhyUcode/i\
                printk(KERN_ERR KBUILD_MODNAME ": missing Free firmware\\n");\
                return (STATUS_FAILURE);\
-#define PhyUcode NULL          
+#define PhyUcode NULL
 }' drivers/staging/sxg/sxg.c 'report missing Free firmware'
 clean_blob drivers/staging/sxg/sxg.c
 clean_kconfig drivers/staging/sxg/Kconfig 'SXG'

diff --git a/deblob-2.6.29 b/deblob-2.6.29
index e4842b1ac41c3436910e5b10bf8c9879308c4b5b..4fdec795fad4d4c3b34a9976c66636e20c8d9dff 100755 (executable)
--- a/deblob-2.6.29
+++ b/deblob-2.6.29
@@ -190,7 +190,7 @@ clean_sed () {
   filetest $2 || return
   sed -e "$1" "$2" > "$2".deblob || {
     die $2: failed: ${3-applied sed script $1} && return 1; }
-  check_changed $2 && echo $2: ${3-applied sed script $1} 
+  check_changed $2 && echo $2: ${3-applied sed script $1}
 }
 
 reject_firmware () {
@@ -995,7 +995,7 @@ clean_sed '
   /for (p = PhyUcode/i\
                printk(KERN_ERR KBUILD_MODNAME ": missing Free firmware\\n");\
                return (STATUS_FAILURE);\
-#define PhyUcode NULL          
+#define PhyUcode NULL
 }' drivers/staging/sxg/sxg.c 'report missing Free firmware'
 clean_blob drivers/staging/sxg/sxg.c
 clean_kconfig drivers/staging/sxg/Kconfig 'SXG'

diff --git a/deblob-2.6.30 b/deblob-2.6.30
index 6d6fe8b8fb77c796e513d5dbc59ce0fc3b5c37e5..3a61de197f52a9ea2e69ee36dace36368f8a2b2a 100755 (executable)
--- a/deblob-2.6.30
+++ b/deblob-2.6.30
@@ -190,7 +190,7 @@ clean_sed () {
   filetest $2 || return
   sed -e "$1" "$2" > "$2".deblob || {
     die $2: failed: ${3-applied sed script $1} && return 1; }
-  check_changed $2 && echo $2: ${3-applied sed script $1} 
+  check_changed $2 && echo $2: ${3-applied sed script $1}
 }
 
 reject_firmware () {
@@ -1003,7 +1003,7 @@ clean_sed '
   /for (p = PhyUcode/i\
                printk("%s: missing Free firmware\\n", __func__);\
                return (STATUS_FAILURE);\
-#define PhyUcode NULL          
+#define PhyUcode NULL
 }' drivers/staging/sxg/sxg.c 'report missing Free firmware'
 clean_blob drivers/staging/sxg/sxg.c
 clean_kconfig drivers/staging/sxg/Kconfig 'SXG'

diff --git a/deblob-2.6.31 b/deblob-2.6.31
index fdff6525c0895155f91b7469fc4355c58a85a91e..c2aa9edae27fcc0e5622c54f0a953519c46140f5 100755 (executable)
--- a/deblob-2.6.31
+++ b/deblob-2.6.31
@@ -190,7 +190,7 @@ clean_sed () {
   filetest $2 || return
   sed -e "$1" "$2" > "$2".deblob || {
     die $2: failed: ${3-applied sed script $1} && return 1; }
-  check_changed $2 && echo $2: ${3-applied sed script $1} 
+  check_changed $2 && echo $2: ${3-applied sed script $1}
 }
 
 reject_firmware () {
@@ -1024,7 +1024,7 @@ clean_sed '
   /for (p = PhyUcode/i\
                printk("%s: missing Free firmware\\n", __func__);\
                return (STATUS_FAILURE);\
-#define PhyUcode NULL          
+#define PhyUcode NULL
 }' drivers/staging/sxg/sxg.c 'report missing Free firmware'
 clean_blob drivers/staging/sxg/sxg.c
 clean_kconfig drivers/staging/sxg/Kconfig 'SXG'

diff --git a/deblob-2.6.32 b/deblob-2.6.32
index 335a7db603548121476fcb40c0f2a0289ddae5f7..fb5f8fb7def9d94e7624235ba885a73f2063e9b0 100755 (executable)
--- a/deblob-2.6.32
+++ b/deblob-2.6.32
@@ -190,7 +190,7 @@ clean_sed () {
   filetest $2 || return
   sed -e "$1" "$2" > "$2".deblob || {
     die $2: failed: ${3-applied sed script $1} && return 1; }
-  check_changed $2 && echo $2: ${3-applied sed script $1} 
+  check_changed $2 && echo $2: ${3-applied sed script $1}
 }
 
 reject_firmware () {

diff --git a/deblob-2.6.33 b/deblob-2.6.33
index 3c297d7e86fc7fa07798f949a318ca8602238de1..6b1ae3187dca4af40cd35db803f955fa19da7133 100755 (executable)
--- a/deblob-2.6.33
+++ b/deblob-2.6.33
@@ -190,7 +190,7 @@ clean_sed () {
   filetest $2 || return
   sed -e "$1" "$2" > "$2".deblob || {
     die $2: failed: ${3-applied sed script $1} && return 1; }
-  check_changed $2 && echo $2: ${3-applied sed script $1} 
+  check_changed $2 && echo $2: ${3-applied sed script $1}
 }
 
 reject_firmware () {

diff --git a/deblob-check b/deblob-check
index ae2bd5c84e64e8935ee4607f486ac139fb942632..64347e2a7ffe73ec6bc3384d28a06c05c4b505c1 100755 (executable)
--- a/deblob-check
+++ b/deblob-check
@@ -112,7 +112,7 @@
 #              to be blobs, be they known false positives or not.
 
 # -p --mark-false-positives: print the processed input, replacing
-#              sequences that match the blob detector test, even those 
+#              sequences that match the blob detector test, even those
 #              known to be false positives, with /*(DEBLOBBED)*/.
 
 # -P --list-false-positives: list files that contain false positives.
@@ -254,20 +254,20 @@ case ${LANG+set} in set) LANG=C; export LANG;; esac
 rm="rm -f"
 
 for echo in 'echo' 'printf %s\n'; do
-  case `$echo '\nx'` in 
+  case `$echo '\nx'` in
   '\nx') break;;
   esac
 done
-case `$echo '\nx'` in 
+case `$echo '\nx'` in
 '\nx') ;; *) echo Cannot find out what echo to use >&2; exit 1;;
 esac
 
 for echo_n in "echo -n" "printf %s"; do
-  case `$echo_n '\na'; $echo_n '\nb'` in 
+  case `$echo_n '\na'; $echo_n '\nb'` in
   '\na\nb') break;;
   esac
 done
-case `$echo_n a; $echo_n b` in 
+case `$echo_n a; $echo_n b` in
 'ab') ;; *) echo Cannot find out an echo -n equivalent to use >&2; exit 1;;
 esac
 
@@ -300,7 +300,7 @@ i\\
     ;;
   esac
   ;;
-*) 
+*)
   v="# "
   vp="0"
   ;;
@@ -408,7 +408,7 @@ case $1 in
   set_cmd=set_eqscript_cmd;
   set_main_cmd=set_perl_main;
   ;;
-       
+
 --use-awk)
   shift;
   set_cmd=set_eqscript_cmd;
@@ -622,7 +622,7 @@ if $test_mode; then
  allpass=:
  for tool in awk perl python sed; do
   echo testing $tool...
-  
+
   targs="-s 4 -i /deblob-check-testsuite/ --use-$tool"
 
   pass=:
@@ -1343,7 +1343,7 @@ set_except () {
     blobname 'whiteheat\(_loader\(_debug\)\?\)\?\.fw' drivers/usb/serial/whiteheat.c
 
     blob 'static[ ]struct[ ]BA1struct[ ]BA1Struct[ ]=[ ][{][^;]*[}][;]' sound/pci/cs46xx/cs46xx_image.h
-    
+
     blob 'static[ ]u32[ ]cwc\(4630\|async\|snoop\)_\(code\|parameter\)\[\][ ]=[ ][{][^;]*[}][;]' 'sound/pci/cs46xx/imgs/cwc\(4630\|async\|snoop\)\.h'
     # cwcbinhack appears to have been created by hand.
     # cwcdma has sources (not verified) in cwcdma.asp.
@@ -1600,7 +1600,7 @@ set_except () {
     blobname '\([/]etc[/]sound[/]\)\?pss_synth' sound/oss/pss.c
     accept '[  ][$][(]obj[)][/]bin2hex[ ]pss_synth' sound/oss/Makefile
     accept '[  ][ ]*echo[ ][\'"'"']static[ ]\(unsigned[ ]char[ ][*][ ]*\|int[ ]\)pss_synth\(Len\)\?[ ]=[ ]\(NULL\|0\)[;]' sound/oss/Makefile
-    
+
     accept '[  ]\.request_firmware[ ]=[ ]NULL,' drivers/media/dvb/dvb-usb/m920x.c
 
     accept '[   ]*["]request_firmware[ ]\(fatal[ ]error\|unable[ ]to[ ]locate\|:[ ]Failed[ ]to[ ]find\)' drivers/media/video/pvrusb2/pvrusb2-hdw.c
@@ -2927,7 +2927,7 @@ set_except () {
     blobname 'blobeol[^\n]*[\n]'
     ;;
   esac
-}  
+}
 
 # Regular expression that matches a literal constant.
 constx="[0-9][0-9a-fA-FxX]*"
@@ -3586,7 +3586,7 @@ s,\\\([{(|)}?+]\),\1,g
 s,^\([-+]\)\(\^\?\)\(.*\)\(\$\?\)$,\2(?s:\3)\4\1,g
 s,[+]$, { falsepos (); },
 s,[-]$, { blob (); },
-'     
+'
 
   echo '%%' > "$scriptname"
   ${SED-sed} "$adjust_rx" < "$regex_name" >> "$scriptname"
@@ -3656,7 +3656,7 @@ s,^\\(.*\\)\$,falsepos = r'(?P<falsepos>\\1)',;\
 s,^\\(.*\\)\$,blob = r'(?P<blob>\\1)',;\
 "' p;}' >> "$scriptname"
 
-  echo "\\($initblob\\|$defineblob\\|$asmblob\\)" | 
+  echo "\\($initblob\\|$defineblob\\|$asmblob\\)" |
     ${SED-sed} -e "$adjust_rx" \
         -e "s,^\\(.*\\)\$,cblob = r'(?P<cblob>\\1)'," >> "$scriptname"
 
@@ -3697,7 +3697,7 @@ for line in sys.stdin:
         assert filenames != None
         s += line
         continue
-        
+
     if verbose:
             print 'looking for matches'
             sfilenames = filenames
@@ -3740,7 +3740,7 @@ for line in sys.stdin:
                 else:
                     if verbose: print 'match is a false positive'
                     falses += 1
-            
+
                 if blob_p and replace_blob or not blob_p and replace_falsepos:
                     s = s[:match.start(what)] + replacement + s[match.end(what):]
                     p = match.start(what) + len(replacement)
@@ -3859,7 +3859,7 @@ s,^\\(.*\\)\$,\$falsepos = qr'(?<falsepos>\\1)'ms;,;\
 s,^\\(.*\\)\$,my \$blob = qr'(?<blob>\\1)'ms;,;\
 "' p;}' >> "$scriptname"
 
-  echo "\\($initblob\\|$defineblob\\|$asmblob\\)" | 
+  echo "\\($initblob\\|$defineblob\\|$asmblob\\)" |
     ${SED-sed} -e "$adjust_rx" \
         -e "s,^\\(.*\\)\$,my \$cblob = qr'(?<cblob>\\1)'ms if \$with_context;," >> "$scriptname"
 
@@ -3897,7 +3897,7 @@ while (<STDIN>) {
        $s .= $_;
        next;
     }
-       
+
     if ($verbose) {
        print "looking for matches in\n";
        for (my $i = $nfilenames; --$i > 0; ) {
@@ -3994,7 +3994,7 @@ while (<STDIN>) {
     }
 
     print substr ($s, $pp) if $print_nomatch;
-       
+
     print "no further matches\n" if $verbose;
 
     $s = '';
@@ -4031,7 +4031,7 @@ s,\\\([{(|)}?+]\),\1,g;
 
   case " = $@ = " in
   *" = with_context = "*) cblob=`
-    $echo "\\($initblob\\|$defineblob\\|$asmblob\\)" | 
+    $echo "\\($initblob\\|$defineblob\\|$asmblob\\)" |
     ${SED-sed} -e "$adjust_rx"
    `;;
   *) cblob='$.^';;
@@ -4166,7 +4166,7 @@ $eormatch /^[;][/][*]end .*[*][/][;]$eornl$/ {
                        pend = length (s)
                }
            }
-           
+
            if (verbose) print "search until", pend;
 
            if (!(matchfound = match (substr (s, p),
@@ -4227,7 +4227,7 @@ s,\\\([{(|)}?+]\),\1,g
 s,^\([-+]\)\(\^\?\)\(.*\)\(\$\?\)$,\2(?s:\3)\4\1,g
 s,[+]$, { falsepos (); },
 s,[-]$, { blob (); },
-'     
+'
 
   echo '%%' > "$scriptname"
   ${SED-sed} "$adjust_rx" < "$regex_name" >> "$scriptname"
@@ -4444,7 +4444,7 @@ BAD regular expression:
        s,^.*$,;/*begin &*/;\\n;/*&*/;,;
        p;
        d;
-      }        
+      }
       s,^[ !$s],,;"
     cmd='${SED-sed} "$sedpatch"'
     ;;
@@ -4541,7 +4541,7 @@ do
     continue
     ;;
   esac
-  
+
   # If we print anything whatsoever (even a blank line) while
   # processing it, we've failed.
   if check "$file"; then

diff --git a/deblob-main b/deblob-main
index 2d70577076cc8ad40ce77eb5a63fffe2efa1dec5..cb6af7fd2678fd8eaada1bc5de30f40fff838ee7 100755 (executable)
--- a/deblob-main
+++ b/deblob-main
@@ -171,7 +171,7 @@ cp -lR linux-$kver/. linux-$kver-$libre
 
 rm -f linux-$kver-$libre.log linux-$kver-$libre.log.tmp
 echo Deblobbing within linux-$kver-$libre, saving output to linux-$kver-$libre.log
-# We can't just pipe deblob into tee, for then we fail to detect 
+# We can't just pipe deblob into tee, for then we fail to detect
 # error conditions.  Use file renaming to tell whether we succeeded.
 if (cd linux-$kver-$libre && /bin/sh ../$deblob $force) 2>&1; then
   mv linux-$kver-$libre.log.tmp linux-$kver-$libre.log