Revert tab police as it makes merging upstream changes more annoying and messed up indentation in some places.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@28818 a1c6a512-1295-4272-9138-f99709370657

5 files changed, 20 insertions, 20 deletions

diff --git a/apps/codecs/libtremor/codebook.c b/apps/codecs/libtremor/codebook.c
index 2bc4b63875..9413257e2a 100644
--- a/apps/codecs/libtremor/codebook.c
+++ b/apps/codecs/libtremor/codebook.c
@@ -82,15 +82,15 @@ static_codebook *vorbis_staticbook_unpack(oggpack_buffer *opb){
       s->lengthlist=(long *)_ogg_malloc(sizeof(*s->lengthlist)*s->entries);
 
       for(i=0;i<s->entries;){
-        long num=oggpack_read(opb,_ilog(s->entries-i));
-        if(num==-1)goto _eofout;
-        if(length>32 || num>s->entries-i ||
-          (num>0 && (num-1)>>(length>>1)>>((length+1)>>1))>0){
-          goto _errout;
-        }
-    for(j=0;j<num;j++,i++)
-      s->lengthlist[i]=length;
-    length++;
+        long num=oggpack_read(opb,_ilog(s->entries-i));
+        if(num==-1)goto _eofout;
+        if(length>32 || num>s->entries-i ||
+           (num>0 && (num-1)>>(length>>1)>>((length+1)>>1))>0){
+          goto _errout;
+        }
+        for(j=0;j<num;j++,i++)
+          s->lengthlist[i]=length;
+        length++;
       }
     }
     break;
@@ -459,7 +459,7 @@ long vorbis_book_decodev_set(codebook *book,ogg_int32_t *a,
         entry = decode_packed_entry_number(book,b);
         if(entry==-1)return(-1);
         t     = book->valuelist+entry*book->dim;
-        for (j=0;i<n && j<book->dim;){
+        for (j=0;i<n && j<book->dim;){
           a[i++]=t[j++]>>shift;
         }
       }
@@ -469,7 +469,7 @@ long vorbis_book_decodev_set(codebook *book,ogg_int32_t *a,
         entry = decode_packed_entry_number(book,b);
         if(entry==-1)return(-1);
         t     = book->valuelist+entry*book->dim;
-        for (j=0;i<n && j<book->dim;){
+        for (j=0;i<n && j<book->dim;){
           a[i++]=t[j++]<<shift;
         }
       }
diff --git a/apps/codecs/libtremor/floor0.c b/apps/codecs/libtremor/floor0.c
index 76d02ace1a..cd0a9f89f6 100644
--- a/apps/codecs/libtremor/floor0.c
+++ b/apps/codecs/libtremor/floor0.c
@@ -404,7 +404,7 @@ static void *floor0_inverse1(vorbis_block *vb,vorbis_look_floor *i){
             
       if(vorbis_book_decodev_set(b,lsp,&vb->opb,look->m,-24)==-1)goto eop;
       for(j=0;j<look->m;){
-      for(k=0;j<look->m && k<b->dim;k++,j++)lsp[j]+=last;
+        for(k=0;j<look->m && k<b->dim;k++,j++)lsp[j]+=last;
         last=lsp[j-1];
       }
       
diff --git a/apps/codecs/libtremor/floor1.c b/apps/codecs/libtremor/floor1.c
index 8cc20d00d0..65286399d0 100644
--- a/apps/codecs/libtremor/floor1.c
+++ b/apps/codecs/libtremor/floor1.c
@@ -361,7 +361,7 @@ static void *floor1_inverse1(vorbis_block *vb,vorbis_look_floor *in){
           }
         }
 
-        fit_value[i]=(val+predicted)&0x7fff;;
+        fit_value[i]=(val+predicted)&0x7fff;;
         fit_value[look->loneighbor[i-2]]&=0x7fff;
         fit_value[look->hineighbor[i-2]]&=0x7fff;
 
@@ -401,7 +401,7 @@ static int floor1_inverse2(vorbis_block *vb,vorbis_look_floor *in,void *memo,
       int hy=fit_value[current]&0x7fff;
       if(hy==fit_value[current]){
         
-        hx=info->postlist[current];
+        hx=info->postlist[current];
         hy*=info->mult;
         /* guard lookup against out-of-range values */
         hy=(hy<0?0:hy>255?255:hy);
diff --git a/apps/codecs/libtremor/res012.c b/apps/codecs/libtremor/res012.c
index 3bd3eaaf04..79e3c23e15 100644
--- a/apps/codecs/libtremor/res012.c
+++ b/apps/codecs/libtremor/res012.c
@@ -238,8 +238,8 @@ static int _01inverse(vorbis_block *vb,vorbis_look_residue *vl,
           /* fetch the partition word for each channel */
           for(j=0;j<ch;j++){
             int temp=vorbis_book_decode(look->phrasebook,&vb->opb);
-            if(temp==-1 || temp>=info->partvals)goto eopbreak;
-                partword[j][l]=look->decodemap[temp];
+            if(temp==-1 || temp>=info->partvals)goto eopbreak;
+            partword[j][l]=look->decodemap[temp];
             if(partword[j][l]==NULL)goto errout;
           }
         }
@@ -323,8 +323,8 @@ int res2_inverse(vorbis_block *vb,vorbis_look_residue *vl,
         if(s==0){
           /* fetch the partition word */
           int temp=vorbis_book_decode(look->phrasebook,&vb->opb);
-          if(temp==-1 || temp>=info->partvals)goto eopbreak;
-            partword[l]=look->decodemap[temp];
+          if(temp==-1 || temp>=info->partvals)goto eopbreak;
+          partword[l]=look->decodemap[temp];
           if(partword[l]==NULL)goto errout;
         }
         
diff --git a/apps/codecs/libtremor/vorbisfile.c b/apps/codecs/libtremor/vorbisfile.c
index 9ade4f1fa9..5721178b67 100644
--- a/apps/codecs/libtremor/vorbisfile.c
+++ b/apps/codecs/libtremor/vorbisfile.c
@@ -1276,8 +1276,8 @@ int ov_pcm_seek_page(OggVorbis_File *vf,ogg_int64_t pos){
       }else{
         /* take a (pretty decent) guess. */
         bisect=begin + rescale64(target-begintime,
-                                 endtime-begintime,
-                                 end-begin) - CHUNKSIZE;
+                                 endtime-begintime,
+                                 end-begin) - CHUNKSIZE;
         if(bisect<begin+CHUNKSIZE)
           bisect=begin;
       }