[7953] Some space and formating cleanups in vmap_extractor_v2 Author: VladimirMangos

--HG--
branch : trunk

5 files changed, 23 insertions, 24 deletions

diff --git a/contrib/vmap_extractor_v2/stormlib/StormPort.h b/contrib/vmap_extractor_v2/stormlib/StormPort.h
index 4cb8d84bd57..6254f84e725 100644
--- a/contrib/vmap_extractor_v2/stormlib/StormPort.h
+++ b/contrib/vmap_extractor_v2/stormlib/StormPort.h
@@ -20,7 +20,7 @@
 /* 12.11.03  1.02  Dan  Macintosh compatibility                              */
 /* 24.07.04  1.03  Sam  Mac OS X compatibility                               */
 /* 22.11.06  1.04  Sam  Mac OS X compatibility (for StormLib 6.0)            */
-/* 31.12.06  1.05  XPinguin  Full GNU/Linux compatibility		     */
+/* 31.12.06  1.05  XPinguin  Full GNU/Linux compatibility                    */
 /*****************************************************************************/
 
 #ifndef __STORMPORT_H__
diff --git a/contrib/vmap_extractor_v2/stormlib/StormPortLinux.cpp b/contrib/vmap_extractor_v2/stormlib/StormPortLinux.cpp
index 0cd827fde9f..afbbd985a7f 100644
--- a/contrib/vmap_extractor_v2/stormlib/StormPortLinux.cpp
+++ b/contrib/vmap_extractor_v2/stormlib/StormPortLinux.cpp
@@ -2,7 +2,7 @@
 *
 * Description:  implementation for StormLib - linux port
 *       intended to be used in GLdiablo
-*       
+*
 *   ---->   StormLib was originally developed for Windows by
 *       Ladislav Zezula (www.zezula.net), and he did
 *       a _great_ job! Thanks Ladislav!
@@ -17,9 +17,9 @@
 *
 * Author: Marko Friedemann <marko.friedemann@bmx-chemnitz.de>
 * Created at: Mon Jan 29 19:01:37 CEST 2001
-* Computer: whiplash.flachland-chemnitz.de 
+* Computer: whiplash.flachland-chemnitz.de
 * System: Linux 2.4.0 on i686
-*    
+*
 * Copyright (c) 2001 BMX-Chemnitz.DE All rights reserved.
 *
 ********************************************************************/
@@ -163,6 +163,6 @@ BOOL DeleteFile(const char *lpFileName)
 BOOL MoveFile(const char *lpExistingFileName, const char *lpNewFileName)
 {
     return rename(lpExistingFileName, lpNewFileName);
-}	
+}
 
 #endif
diff --git a/contrib/vmap_extractor_v2/stormlib/bzip2/blocksort.c b/contrib/vmap_extractor_v2/stormlib/bzip2/blocksort.c
index 33ec9f5dcb0..906124b97e6 100644
--- a/contrib/vmap_extractor_v2/stormlib/bzip2/blocksort.c
+++ b/contrib/vmap_extractor_v2/stormlib/bzip2/blocksort.c
@@ -17,16 +17,16 @@
   1. Redistributions of source code must retain the above copyright
      notice, this list of conditions and the following disclaimer.
 
-  2. The origin of this software must not be misrepresented; you must 
-     not claim that you wrote the original software.  If you use this 
-     software in a product, an acknowledgment in the product 
+  2. The origin of this software must not be misrepresented; you must
+     not claim that you wrote the original software.  If you use this
+     software in a product, an acknowledgment in the product
      documentation would be appreciated but is not required.
 
   3. Altered source versions must be plainly marked as such, and must
      not be misrepresented as being the original software.
 
-  4. The name of the author may not be used to endorse or promote 
-     products derived from this software without specific prior written 
+  4. The name of the author may not be used to endorse or promote
+     products derived from this software without specific prior written
      permission.
 
   THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS
@@ -57,8 +57,8 @@
 
   For more information on these sources, see the manual.
 
-  To get some idea how the block sorting algorithms in this file 
-  work, read my paper 
+  To get some idea how the block sorting algorithms in this file
+  work, read my paper
      On the Performance of BWT Sorting Algorithms
   in Proceedings of the IEEE Data Compression Conference 2000,
   Snowbird, Utah, USA, 27-30 March 2000.  The main sort in this
@@ -321,7 +321,7 @@ void fallbackSort ( UInt32* fmap,
       r = -1;
       while (1) {
 
-	 /*-- find the next non-singleton bucket --*/
+         /*-- find the next non-singleton bucket --*/
          k = r + 1;
          while (ISSET_BH(k) && UNALIGNED_BH(k)) k++;
          if (ISSET_BH(k)) {
diff --git a/contrib/vmap_extractor_v2/stormlib/bzip2/bzlib.c b/contrib/vmap_extractor_v2/stormlib/bzip2/bzlib.c
index 195f51a7840..3d405f9322a 100644
--- a/contrib/vmap_extractor_v2/stormlib/bzip2/bzlib.c
+++ b/contrib/vmap_extractor_v2/stormlib/bzip2/bzlib.c
@@ -471,7 +471,7 @@ int BZ_API(BZ2_bzCompress) ( bz_stream *strm, int action )
             return progress ? BZ_RUN_OK : BZ_PARAM_ERROR;
          } 
          else
-	 if (action == BZ_FLUSH) {
+         if (action == BZ_FLUSH) {
             s->avail_in_expect = strm->avail_in;
             s->mode = BZ_M_FLUSHING;
             goto preswitch;
diff --git a/contrib/vmap_extractor_v2/stormlib/bzip2/compress.c b/contrib/vmap_extractor_v2/stormlib/bzip2/compress.c
index 7e0c29155ab..156056fb376 100644
--- a/contrib/vmap_extractor_v2/stormlib/bzip2/compress.c
+++ b/contrib/vmap_extractor_v2/stormlib/bzip2/compress.c
@@ -373,14 +373,14 @@ void sendMTFValues ( EState* s )
 
       /*---
         Set up an auxiliary length table which is used to fast-track
-	the common case (nGroups == 6). 
+        the common case (nGroups == 6).
       ---*/
       if (nGroups == 6) {
          for (v = 0; v < alphaSize; v++) {
             s->len_pack[v][0] = (s->len[1][v] << 16) | s->len[0][v];
             s->len_pack[v][1] = (s->len[3][v] << 16) | s->len[2][v];
             s->len_pack[v][2] = (s->len[5][v] << 16) | s->len[4][v];
-	 }
+         }
       }
 
       nSelectors = 0;
@@ -429,14 +429,14 @@ void sendMTFValues ( EState* s )
             cost[4] = cost45 & 0xffff; cost[5] = cost45 >> 16;
 
          } else {
-	    /*--- slow version which correctly handles all situations ---*/
-            for (i = gs; i <= ge; i++) { 
+            /*--- slow version which correctly handles all situations ---*/
+            for (i = gs; i <= ge; i++) {
                UInt16 icv = mtfv[i];
                for (t = 0; t < nGroups; t++) cost[t] += s->len[t][icv];
             }
          }
- 
-         /*-- 
+
+         /*--
             Find the coding table which is best for this group,
             and record its identity in the selector table.
          --*/
@@ -470,7 +470,7 @@ void sendMTFValues ( EState* s )
 #           undef BZ_ITUR
 
          } else {
-	    /*--- slow version which correctly handles all situations ---*/
+            /*--- slow version which correctly handles all situations ---*/
             for (i = gs; i <= ge; i++)
                s->rfreq[bt][ mtfv[i] ]++;
          }
@@ -623,15 +623,14 @@ void sendMTFValues ( EState* s )
 #           undef BZ_ITAH
 
       } else {
-	 /*--- slow version which correctly handles all situations ---*/
+         /*--- slow version which correctly handles all situations ---*/
          for (i = gs; i <= ge; i++) {
-            bsW ( s, 
+            bsW ( s,
                   s->len  [s->selector[selCtr]] [mtfv[i]],
                   s->code [s->selector[selCtr]] [mtfv[i]] );
          }
       }
 
-
       gs = ge+1;
       selCtr++;
    }