From 765ff502c72b49b8d89452d5f5dd5b128b344eb7 Mon Sep 17 00:00:00 2001
From: Josh Coalson <jcoalson@users.sourceforce.net>
Date: Tue, 27 Aug 2002 05:46:11 +0000
Subject: [PATCH] minor formatting

---
 doc/html/ru/documentation.html         | 20 +++---
 doc/html/ru/format.html                |  4 +-
 include/FLAC++/metadata.h              | 12 ++--
 include/FLAC/file_decoder.h            | 16 ++---
 include/FLAC/file_encoder.h            |  2 +-
 include/FLAC/format.h                  |  2 +-
 include/FLAC/seekable_stream_decoder.h |  8 +--
 include/FLAC/seekable_stream_encoder.h |  4 +-
 include/FLAC/stream_decoder.h          |  8 +--
 include/OggFLAC/stream_decoder.h       |  6 +-
 src/libFLAC++/Makefile.am              |  2 +-
 src/libFLAC++/metadata.cc              |  2 +-
 src/libFLAC/bitbuffer.c                |  4 +-
 src/libFLAC/format.c                   |  2 +-
 src/libFLAC/lpc.c                      |  2 +-
 src/libFLAC/metadata_iterators.c       |  2 +-
 src/libFLAC/seekable_stream_encoder.c  |  4 +-
 src/libOggFLAC++/Makefile.am           |  2 +-
 src/libOggFLAC/stream_decoder.c        | 20 +++---
 src/libOggFLAC/stream_encoder.c        |  2 +-
 src/test_libFLAC++/decoders.cc         | 92 ++++++++++++-------------
 src/test_libFLAC++/encoders.cc         | 52 +++++++-------
 src/test_libFLAC++/metadata_manip.cc   |  6 +-
 src/test_libFLAC++/metadata_object.cc  | 56 +++++++--------
 src/test_libFLAC/decoders.c            | 92 ++++++++++++-------------
 src/test_libFLAC/encoders.c            | 52 +++++++-------
 src/test_libFLAC/metadata_manip.c      |  6 +-
 src/test_libFLAC/metadata_object.c     | 16 ++---
 src/test_libFLAC/metadata_utils.c      | 34 +++++-----
 src/test_libOggFLAC++/decoders.cc      | 92 ++++++++++++-------------
 src/test_libOggFLAC++/encoders.cc      | 52 +++++++-------
 src/test_libOggFLAC/decoders.c         | 94 +++++++++++++-------------
 src/test_libOggFLAC/encoders.c         | 52 +++++++-------
 src/test_libOggFLAC/metadata_utils.c   | 34 +++++-----
 strip_fPIC.sh                          | 12 ++--
 35 files changed, 433 insertions(+), 433 deletions(-)

diff --git a/doc/html/ru/documentation.html b/doc/html/ru/documentation.html
index 57ee8ecc..7913d10e 100644
--- a/doc/html/ru/documentation.html
+++ b/doc/html/ru/documentation.html
@@ -278,7 +278,7 @@
 что их длины будут кратны размеру сектора CD-Audio (равны 1/75 секундам или 588 сэмплам). Это осуществляется переносом части сектора в конце каждого WAVE файла в начало следующего. Последний поток будет дополнен до границы выравнивания нулями.</P>
 <P>Использование этой опции не приведет ни к чему, если файлы уже выровнены (например, если правильно скопированы с аудио-CD). <TT><B>flac</B></TT> может выровнять только несколько файлов за один вызов.</P>
 
-<P><B>ВНИМАНИЕ</B>: Порядок файлов имеет значение! Если вы сделаете следующий вызов '<TT>flac --sector-align *.wav</TT>', командный процессор может обработать шаблон не в том порядке, в каком вы рассчитываете. Поэтому лучше всего вызывать программу, явно указав список файлов, например, '<TT>flac --sector-align 8.wav 9.wav 10.wav</TT>'. 
+<P><B>ВНИМАНИЕ</B>: Порядок файлов имеет значение! Если вы сделаете следующий вызов '<TT>flac --sector-align *.wav</TT>', командный процессор может обработать шаблон не в том порядке, в каком вы рассчитываете. Поэтому лучше всего вызывать программу, явно указав список файлов, например, '<TT>flac --sector-align 8.wav 9.wav 10.wav</TT>'.
 </TD></TR>
 
 <TR><TD><TT>-S {#|X|#x}</TT></TD>
@@ -286,9 +286,9 @@
 
 <UL>
     <LI><TT>#&nbsp;</TT> : создается точка поиска для сэмпла с определенным номером.</LI>
-    
+
     <LI><TT>X&nbsp;</TT> : резервируемые точки (всегда помещаются в конце <TT>SEEKTABLE</TT>).</LI>
-    
+
     <LI><TT>#x</TT> : # равномерно распределенных точек поиска, первая соответствует 0 сэмплу.</LI>
 </UL>
 
@@ -435,15 +435,15 @@
 
 <OL>
 	<LI>Программа создает экземпляр кодера или декодера с помощью функций <TT>*_new()</TT>.</LI>
-	
+
 	<LI>Программа устанавливает параметры экземпляра и предоставляет ему обратные вызовы для чтения, записи, сообщения об ошибках и работы с метаданными с помощью функций <TT>*_set_*()</TT>.</LI>
-	
+
 	<LI>Программа инициализирует экземпляр, проверяет параметры и готовится к кодированию/декодированию, используя функции <TT>*_init()</TT>.</LI>
-	
+
 	<LI>Программа вызывает функции <TT>*_process_*()</TT> для кодирования или декодирования данных, которые в свою очередь делают обратные вызовы.</LI>
-	
+
 	<LI>Программа завершает работу экземпляра функцией <TT>*_finish()</TT>, которая сбрасывает буферы ввода и вывода.</LI>
-	
+
 	<LI>Экземпляр может быть использован снова либо удален функцией <TT>*_delete()</TT>.</LI>
 
 </OL>
@@ -458,7 +458,7 @@
 
 
 <P><B>ДЕКОДЕР ПОТОКОВ</B></P>
- 
+
 <P>Сначала обсудим декодер потоков. Тип его экземпляра <TT>FLAC__StreamDecoder</TT>. Обычно в программе экземпляр создается вызовом <TT>FLAC__stream_decoder_new()</TT>, затем вызывает функции <TT>FLAC__stream_decoder_set_*()</TT> для установки обратных вызовов и пользовательских данных и инициализируется функцией <TT>FLAC__stream_decoder_init()</TT>. Необходимые обратные вызовы:</P>
 
 <UL>
@@ -477,7 +477,7 @@
 	<LI><B><TT>FLAC__stream_decoder_process_whole_stream()</TT></B> - Декодер начинает работу и продолжает обрабатывать поток пока функция обратного вызова чтения не передаст код <TT>FLAC__STREAM_DECODER_READ_END_OF_STREAM</TT> или <TT>FLAC__STREAM_DECODER_READ_ABORT</TT>.</LI>
 
 	<LI><B><TT>FLAC__stream_decoder_process_metadata()</TT></B> - Декодер обрабатывает поток до первого аудио фрейма.</LI>
-	
+
 	<LI><B><TT>FLAC__stream_decoder_process_one_frame()</TT></B> - Декодеровать только один фрейм. Перед вызовом этой функции все метаданные должны быть обработаны.</LI>
 
 	<LI><B><TT>FLAC__stream_decoder_process_remaining_frames()</TT></B> - Декодировать все оставшиеся фреймы.  Перед вызовом этой функции все метаданные должны быть обработаны. Перед вызовом этой фунции также может вызываться <TT>FLAC__stream_decoder_process_one_frame()</TT>.</LI>
diff --git a/doc/html/ru/format.html b/doc/html/ru/format.html
index b517779e..e5f6f0b4 100644
--- a/doc/html/ru/format.html
+++ b/doc/html/ru/format.html
@@ -238,9 +238,9 @@
 
     <UL>
         <LI>Значение битов, отвечающих за размер блока, должно быть в пределах 0001-0101 или 1000-1111. Поток должен состоять из блоков одинакового размера (за исключением последнего), а в блоке метаданных <TT>STREAMINFO</TT> должны быть указаны равные значения для минимального и максимального размера блока.</LI>
-  
+
         <LI>Количество бит на сэмпл в заголовке фрейма должно описываться следующим диапазоном битов 001-110.</LI>
-   
+
         <LI>Частота дискретизации в заголовке фрейма должна описываться следующим диапазоном битов 0001-1011.</LI>
     </UL>
 </BLOCKQUOTE></P>
diff --git a/include/FLAC++/metadata.h b/include/FLAC++/metadata.h
index 842b8e89..6b34e2d7 100644
--- a/include/FLAC++/metadata.h
+++ b/include/FLAC++/metadata.h
@@ -192,22 +192,22 @@ namespace FLAC {
 			inline void set_reference(bool x) { is_reference_ = x; }
 		};
 
-		inline bool Prototype::operator==(const Prototype &object) const 
+		inline bool Prototype::operator==(const Prototype &object) const
 		{ return (bool)::FLAC__metadata_object_is_equal(object_, object.object_); }
 
-		inline bool Prototype::operator==(const ::FLAC__StreamMetadata &object) const 
+		inline bool Prototype::operator==(const ::FLAC__StreamMetadata &object) const
 		{ return (bool)::FLAC__metadata_object_is_equal(object_, &object); }
 
-		inline bool Prototype::operator==(const ::FLAC__StreamMetadata *object) const 
+		inline bool Prototype::operator==(const ::FLAC__StreamMetadata *object) const
 		{ return (bool)::FLAC__metadata_object_is_equal(object_, object); }
 
-		inline bool Prototype::operator!=(const Prototype &object) const 
+		inline bool Prototype::operator!=(const Prototype &object) const
 		{ return !operator==(object); }
 
-		inline bool Prototype::operator!=(const ::FLAC__StreamMetadata &object) const 
+		inline bool Prototype::operator!=(const ::FLAC__StreamMetadata &object) const
 		{ return !operator==(object); }
 
-		inline bool Prototype::operator!=(const ::FLAC__StreamMetadata *object) const 
+		inline bool Prototype::operator!=(const ::FLAC__StreamMetadata *object) const
 		{ return !operator==(object); }
 
 		inline bool Prototype::is_valid() const
diff --git a/include/FLAC/file_decoder.h b/include/FLAC/file_decoder.h
index f6a44437..2d1f2e26 100644
--- a/include/FLAC/file_decoder.h
+++ b/include/FLAC/file_decoder.h
@@ -81,7 +81,7 @@ extern "C" {
  * automatically turned off if there is no signature in the STREAMINFO
  * block or when a seek is attempted.
  *
- * Make sure to read the detailed descriptions of the 
+ * Make sure to read the detailed descriptions of the
  * \link flac_seekable_stream_decoder seekable stream decoder module \endlink
  * and \link flac_stream_decoder stream decoder module \endlink
  * since the file decoder inherits much of its behavior from them.
@@ -107,16 +107,16 @@ extern "C" {
  */
 typedef enum {
 
-    FLAC__FILE_DECODER_OK = 0,
+	FLAC__FILE_DECODER_OK = 0,
 	/**< The decoder is in the normal OK state. */
 
 	FLAC__FILE_DECODER_END_OF_FILE,
 	/**< The decoder has reached the end of the file. */
 
-    FLAC__FILE_DECODER_ERROR_OPENING_FILE,
+	FLAC__FILE_DECODER_ERROR_OPENING_FILE,
 	/**< An error occurred opening the input file. */
 
-    FLAC__FILE_DECODER_MEMORY_ALLOCATION_ERROR,
+	FLAC__FILE_DECODER_MEMORY_ALLOCATION_ERROR,
 	/**< An error occurred allocating memory. */
 
 	FLAC__FILE_DECODER_SEEK_ERROR,
@@ -125,18 +125,18 @@ typedef enum {
 	FLAC__FILE_DECODER_SEEKABLE_STREAM_DECODER_ERROR,
 	/**< An error occurred in the underlying seekable stream decoder. */
 
-    FLAC__FILE_DECODER_ALREADY_INITIALIZED,
+	FLAC__FILE_DECODER_ALREADY_INITIALIZED,
 	/**< FLAC__file_decoder_init() was called when the decoder was already
 	 * initialized, usually because FLAC__file_decoder_finish() was not
-     * called.
+	 * called.
 	 */
 
-    FLAC__FILE_DECODER_INVALID_CALLBACK,
+	FLAC__FILE_DECODER_INVALID_CALLBACK,
 	/**< FLAC__file_decoder_init() was called without all callbacks
 	 * being set.
 	 */
 
-    FLAC__FILE_DECODER_UNINITIALIZED
+	FLAC__FILE_DECODER_UNINITIALIZED
 	/**< The decoder is in the uninitialized state. */
 
 } FLAC__FileDecoderState;
diff --git a/include/FLAC/file_encoder.h b/include/FLAC/file_encoder.h
index a5b017ce..e8fd4779 100644
--- a/include/FLAC/file_encoder.h
+++ b/include/FLAC/file_encoder.h
@@ -107,7 +107,7 @@ typedef enum {
 	FLAC__FILE_ENCODER_FATAL_ERROR_WHILE_WRITING,
 	/**< A fatal error occurred while writing to the encoded file. */
 
-    FLAC__FILE_ENCODER_ERROR_OPENING_FILE,
+	FLAC__FILE_ENCODER_ERROR_OPENING_FILE,
 	/**< An error occurred opening the output file for writing. */
 
 	FLAC__FILE_ENCODER_MEMORY_ALLOCATION_ERROR,
diff --git a/include/FLAC/format.h b/include/FLAC/format.h
index 0ac6e3b3..7e639b8e 100644
--- a/include/FLAC/format.h
+++ b/include/FLAC/format.h
@@ -172,7 +172,7 @@ extern const unsigned FLAC__STREAM_SYNC_LEN; /* = 32 bits */
 typedef enum {
 	FLAC__ENTROPY_CODING_METHOD_PARTITIONED_RICE = 0
 	/**< Residual is coded by partitioning into contexts, each with it's own
-     * Rice parameter. */
+	 * Rice parameter. */
 } FLAC__EntropyCodingMethodType;
 
 /** Maps a FLAC__EntropyCodingMethodType to a C string.
diff --git a/include/FLAC/seekable_stream_decoder.h b/include/FLAC/seekable_stream_decoder.h
index 5624512d..a91a4a39 100644
--- a/include/FLAC/seekable_stream_decoder.h
+++ b/include/FLAC/seekable_stream_decoder.h
@@ -118,7 +118,7 @@ extern "C" {
  */
 typedef enum {
 
-    FLAC__SEEKABLE_STREAM_DECODER_OK = 0,
+	FLAC__SEEKABLE_STREAM_DECODER_OK = 0,
 	/**< The decoder is in the normal OK state. */
 
 	FLAC__SEEKABLE_STREAM_DECODER_SEEKING,
@@ -141,18 +141,18 @@ typedef enum {
 	 * callback returned an error.
 	 */
 
-    FLAC__SEEKABLE_STREAM_DECODER_ALREADY_INITIALIZED,
+	FLAC__SEEKABLE_STREAM_DECODER_ALREADY_INITIALIZED,
 	/**< FLAC__seekable_stream_decoder_init() was called when the
 	 * decoder was already initialized, usually because
 	 * FLAC__seekable_stream_decoder_finish() was not called.
 	 */
 
-    FLAC__SEEKABLE_STREAM_DECODER_INVALID_CALLBACK,
+	FLAC__SEEKABLE_STREAM_DECODER_INVALID_CALLBACK,
 	/**< FLAC__seekable_stream_decoder_init() was called without all
 	 * callbacks being set.
 	 */
 
-    FLAC__SEEKABLE_STREAM_DECODER_UNINITIALIZED
+	FLAC__SEEKABLE_STREAM_DECODER_UNINITIALIZED
 	/**< The decoder is in the uninitialized state. */
 
 } FLAC__SeekableStreamDecoderState;
diff --git a/include/FLAC/seekable_stream_encoder.h b/include/FLAC/seekable_stream_encoder.h
index 1751817e..50caa595 100644
--- a/include/FLAC/seekable_stream_encoder.h
+++ b/include/FLAC/seekable_stream_encoder.h
@@ -100,12 +100,12 @@ typedef enum {
 	 * FLAC__seekable_stream_encoder_finish() was not called.
 	 */
 
-    FLAC__SEEKABLE_STREAM_ENCODER_INVALID_CALLBACK,
+	FLAC__SEEKABLE_STREAM_ENCODER_INVALID_CALLBACK,
 	/**< FLAC__seekable_stream_encoder_init() was called without all
 	 * callbacks being set.
 	 */
 
-    FLAC__SEEKABLE_STREAM_ENCODER_INVALID_SEEKTABLE,
+	FLAC__SEEKABLE_STREAM_ENCODER_INVALID_SEEKTABLE,
 	/**< An invalid seek table was passed is the metadata to
 	 * FLAC__seekable_stream_encoder_set_metadata().
 	 */
diff --git a/include/FLAC/stream_decoder.h b/include/FLAC/stream_decoder.h
index 9ab781b9..cc089b7e 100644
--- a/include/FLAC/stream_decoder.h
+++ b/include/FLAC/stream_decoder.h
@@ -154,7 +154,7 @@ extern "C" {
  * blocks to return.  Remember that some metadata blocks can be big so
  * filtering out the ones you don't use can reduce the memory requirements
  * of the decoder.  Also note the special forms
- * FLAC__stream_decoder_respond_application(id) and 
+ * FLAC__stream_decoder_respond_application(id) and
  * FLAC__stream_decoder_ignore_application(id) for filtering APPLICATION
  * blocks based on the application ID.
  *
@@ -726,7 +726,7 @@ FLAC__bool FLAC__stream_decoder_reset(FLAC__StreamDecoder *decoder);
  *  called with the decoded metadata block or audio frame, unless an error
  *  occurred.  If the decoder loses sync it will call the error callback
  *  instead.
- * 
+ *
  * \param  decoder  An initialized decoder instance in the state
  *                  \c FLAC__STREAM_DECODER_SEARCH_FOR_FRAME_SYNC.
  * \assert
@@ -751,7 +751,7 @@ FLAC__bool FLAC__stream_decoder_process_single(FLAC__StreamDecoder *decoder);
  *  As each metadata block is decoded, the metadata callback will be called
  *  with the decoded metadata.  If the decoder loses sync it will call the
  *  error callback.
- * 
+ *
  * \param  decoder  An initialized decoder instance in the state
  *                  \c FLAC__STREAM_DECODER_SEARCH_FOR_METADATA.
  * \assert
@@ -776,7 +776,7 @@ FLAC__bool FLAC__stream_decoder_process_until_end_of_metadata(FLAC__StreamDecode
  *  As each metadata block and frame is decoded, the metadata or write
  *  callback will be called with the decoded metadata or frame.  If the
  *  decoder loses sync it will call the error callback.
- * 
+ *
  * \param  decoder  An initialized decoder instance in the state
  *                  \c FLAC__STREAM_DECODER_SEARCH_FOR_METADATA.
  * \assert
diff --git a/include/OggFLAC/stream_decoder.h b/include/OggFLAC/stream_decoder.h
index 6de28972..6c271165 100644
--- a/include/OggFLAC/stream_decoder.h
+++ b/include/OggFLAC/stream_decoder.h
@@ -506,7 +506,7 @@ FLAC__bool OggFLAC__stream_decoder_reset(OggFLAC__StreamDecoder *decoder);
 
 /** Decode one metadata block or audio frame.
  *  This is inherited from FLAC__StreamDecoder; see FLAC__stream_decoder_process_single()
- * 
+ *
  * \param  decoder  An initialized decoder instance in the state
  *                  \c OggFLAC__STREAM_DECODER_OK.
  * \assert
@@ -523,7 +523,7 @@ FLAC__bool OggFLAC__stream_decoder_process_single(OggFLAC__StreamDecoder *decode
 
 /** Decode until the end of the metadata.
  *  This is inherited from FLAC__StreamDecoder; see FLAC__stream_decoder_process_until_end_of_metadata()
- * 
+ *
  * \param  decoder  An initialized decoder instance in the state
  *                  \c OggFLAC__STREAM_DECODER_OK.
  * \assert
@@ -540,7 +540,7 @@ FLAC__bool OggFLAC__stream_decoder_process_until_end_of_metadata(OggFLAC__Stream
 
 /** Decode until the end of the stream.
  *  This is inherited from FLAC__StreamDecoder; see FLAC__stream_decoder_process_until_end_of_stream()
- * 
+ *
  * \param  decoder  An initialized decoder instance in the state
  *                  \c OggFLAC__STREAM_DECODER_OK.
  * \assert
diff --git a/src/libFLAC++/Makefile.am b/src/libFLAC++/Makefile.am
index 99886794..91d8f25d 100644
--- a/src/libFLAC++/Makefile.am
+++ b/src/libFLAC++/Makefile.am
@@ -37,4 +37,4 @@ libFLAC___la_SOURCES = \
 	seekable_stream_decoder.cc \
 	seekable_stream_encoder.cc \
 	stream_decoder.cc \
-	stream_encoder.cc 
+	stream_encoder.cc
diff --git a/src/libFLAC++/metadata.cc b/src/libFLAC++/metadata.cc
index b6fbb6e2..e2abf818 100644
--- a/src/libFLAC++/metadata.cc
+++ b/src/libFLAC++/metadata.cc
@@ -950,7 +950,7 @@ namespace FLAC {
 			return (bool)::FLAC__metadata_iterator_prev(iterator_);
 		}
 
-		::FLAC__MetadataType Iterator::get_block_type() const 
+		::FLAC__MetadataType Iterator::get_block_type() const
 		{
 			FLAC__ASSERT(is_valid());
 			return ::FLAC__metadata_iterator_get_block_type(iterator_);
diff --git a/src/libFLAC/bitbuffer.c b/src/libFLAC/bitbuffer.c
index c0e0078d..5220c6d8 100644
--- a/src/libFLAC/bitbuffer.c
+++ b/src/libFLAC/bitbuffer.c
@@ -2081,7 +2081,7 @@ FLAC__bool FLAC__bitbuffer_read_rice_signed_block(FLAC__BitBuffer *bb, int vals[
 						CRC16_UPDATE_BLURB(bb, save_blurb, bb->read_crc16);
 						break;
 					}
-				}	
+				}
 				else {
 					msbs += FLAC__BITS_PER_BLURB - cbits;
 					cbits = 0;
@@ -2171,7 +2171,7 @@ FLAC__bool FLAC__bitbuffer_read_rice_signed_block(FLAC__BitBuffer *bb, int vals[
 							CRC16_UPDATE_BLURB(bb, save_blurb, bb->read_crc16);
 							break;
 						}
-					}	
+					}
 					else {
 						msbs += FLAC__BITS_PER_BLURB - cbits;
 						cbits = 0;
diff --git a/src/libFLAC/format.c b/src/libFLAC/format.c
index cf933cf9..4e35c43e 100644
--- a/src/libFLAC/format.c
+++ b/src/libFLAC/format.c
@@ -126,7 +126,7 @@ FLAC__bool FLAC__format_sample_rate_is_valid(unsigned sample_rate)
 		sample_rate == 0 ||
 		sample_rate > FLAC__MAX_SAMPLE_RATE ||
 		(
-			sample_rate >= (1u << 16) && 
+			sample_rate >= (1u << 16) &&
 			!(sample_rate % 1000 == 0 || sample_rate % 10 == 0)
 		)
 	) {
diff --git a/src/libFLAC/lpc.c b/src/libFLAC/lpc.c
index b9935991..88c9a6c0 100644
--- a/src/libFLAC/lpc.c
+++ b/src/libFLAC/lpc.c
@@ -147,7 +147,7 @@ redo_it:
 	else {
 		int log2cmax;
 
-		(void)frexp(cmax, &log2cmax);	
+		(void)frexp(cmax, &log2cmax);
 		log2cmax--;
 		*shift = (int)precision - log2cmax - 1;
 
diff --git a/src/libFLAC/metadata_iterators.c b/src/libFLAC/metadata_iterators.c
index 636db104..70d78b31 100644
--- a/src/libFLAC/metadata_iterators.c
+++ b/src/libFLAC/metadata_iterators.c
@@ -1619,7 +1619,7 @@ FLAC__Metadata_SimpleIteratorStatus write_metadata_block_data_padding_(FILE *fil
 			return FLAC__METADATA_SIMPLE_ITERATOR_STATUS_WRITE_ERROR;
 
 	n %= 1024;
-	
+
 	if(fwrite(buffer, 1, n, file) != n)
 		return FLAC__METADATA_SIMPLE_ITERATOR_STATUS_WRITE_ERROR;
 
diff --git a/src/libFLAC/seekable_stream_encoder.c b/src/libFLAC/seekable_stream_encoder.c
index d36b6a33..320ad8de 100644
--- a/src/libFLAC/seekable_stream_encoder.c
+++ b/src/libFLAC/seekable_stream_encoder.c
@@ -186,7 +186,7 @@ FLAC__SeekableStreamEncoderState FLAC__seekable_stream_encoder_init(FLAC__Seekab
 	 * Initializing the stream encoder writes all the metadata, so we
 	 * save the stream offset now.
 	 */
-	encoder->private_->stream_offset = encoder->private_->bytes_written; 
+	encoder->private_->stream_offset = encoder->private_->bytes_written;
 
 	return encoder->protected_->state = FLAC__SEEKABLE_STREAM_ENCODER_OK;
 }
@@ -407,7 +407,7 @@ FLAC__bool FLAC__seekable_stream_encoder_set_metadata(FLAC__SeekableStreamEncode
 	if(0 != metadata && num_blocks > 0) {
 		unsigned i;
 		for(i = 0; i < num_blocks; i++) {
-			if(0 != metadata[i] && metadata[i]->type == FLAC__METADATA_TYPE_SEEKTABLE) {	
+			if(0 != metadata[i] && metadata[i]->type == FLAC__METADATA_TYPE_SEEKTABLE) {
 				encoder->private_->seek_table = &metadata[i]->data.seek_table;
 				break; /* take only the first one */
 			}
diff --git a/src/libOggFLAC++/Makefile.am b/src/libOggFLAC++/Makefile.am
index 1d8f1cab..b2af48b2 100644
--- a/src/libOggFLAC++/Makefile.am
+++ b/src/libOggFLAC++/Makefile.am
@@ -32,4 +32,4 @@ libOggFLAC___la_LDFLAGS = -version-info 0:0:0
 
 libOggFLAC___la_SOURCES = \
 	stream_decoder.cc \
-	stream_encoder.cc 
+	stream_encoder.cc
diff --git a/src/libOggFLAC/stream_decoder.c b/src/libOggFLAC/stream_decoder.c
index 958f9f47..41e68037 100644
--- a/src/libOggFLAC/stream_decoder.c
+++ b/src/libOggFLAC/stream_decoder.c
@@ -132,7 +132,7 @@ void OggFLAC__stream_decoder_delete(OggFLAC__StreamDecoder *decoder)
 
 	OggFLAC__stream_decoder_finish(decoder);
 
-    FLAC__stream_decoder_delete(decoder->private_->FLAC_stream_decoder);
+	FLAC__stream_decoder_delete(decoder->private_->FLAC_stream_decoder);
 
 	free(decoder->private_);
 	free(decoder->protected_);
@@ -161,14 +161,14 @@ OggFLAC__StreamDecoderState OggFLAC__stream_decoder_init(OggFLAC__StreamDecoder
 	if(ogg_sync_init(&decoder->private_->ogg.sync_state) != 0)
 		return decoder->protected_->state = OggFLAC__STREAM_DECODER_OGG_ERROR;
 
-    FLAC__stream_decoder_set_read_callback(decoder->private_->FLAC_stream_decoder, read_callback_);
-    FLAC__stream_decoder_set_write_callback(decoder->private_->FLAC_stream_decoder, write_callback_);
-    FLAC__stream_decoder_set_metadata_callback(decoder->private_->FLAC_stream_decoder, metadata_callback_);
-    FLAC__stream_decoder_set_error_callback(decoder->private_->FLAC_stream_decoder, error_callback_);
-    FLAC__stream_decoder_set_client_data(decoder->private_->FLAC_stream_decoder, decoder);
+	FLAC__stream_decoder_set_read_callback(decoder->private_->FLAC_stream_decoder, read_callback_);
+	FLAC__stream_decoder_set_write_callback(decoder->private_->FLAC_stream_decoder, write_callback_);
+	FLAC__stream_decoder_set_metadata_callback(decoder->private_->FLAC_stream_decoder, metadata_callback_);
+	FLAC__stream_decoder_set_error_callback(decoder->private_->FLAC_stream_decoder, error_callback_);
+	FLAC__stream_decoder_set_client_data(decoder->private_->FLAC_stream_decoder, decoder);
 
-    if(FLAC__stream_decoder_init(decoder->private_->FLAC_stream_decoder) != FLAC__STREAM_DECODER_SEARCH_FOR_METADATA)
-        return decoder->protected_->state = OggFLAC__STREAM_DECODER_FLAC_STREAM_DECODER_ERROR;
+	if(FLAC__stream_decoder_init(decoder->private_->FLAC_stream_decoder) != FLAC__STREAM_DECODER_SEARCH_FOR_METADATA)
+		return decoder->protected_->state = OggFLAC__STREAM_DECODER_FLAC_STREAM_DECODER_ERROR;
 
 	return decoder->protected_->state = OggFLAC__STREAM_DECODER_OK;
 }
@@ -448,7 +448,7 @@ FLAC__StreamDecoderReadStatus read_callback_(const FLAC__StreamDecoder *unused,
 	 * We have to be careful not to read in more than the
 	 * FLAC__StreamDecoder says it has room for.  We know
 	 * that the size of the decoded data must be no more
-	 * than the encoded data we will read.	
+	 * than the encoded data we will read.
 	 */
 	ogg_bytes_to_read = min(*bytes, OGG_BYTES_CHUNK);
 	oggbuf = ogg_sync_buffer(&decoder->private_->ogg.sync_state, ogg_bytes_to_read);
@@ -456,7 +456,7 @@ FLAC__StreamDecoderReadStatus read_callback_(const FLAC__StreamDecoder *unused,
 	if(decoder->private_->read_callback(decoder, oggbuf, &ogg_bytes_to_read, decoder->private_->client_data) != FLAC__STREAM_DECODER_READ_STATUS_CONTINUE) {
 		decoder->protected_->state = OggFLAC__STREAM_DECODER_READ_ERROR;
 		return FLAC__STREAM_DECODER_READ_STATUS_ABORT;
-	}   
+	}
 	ogg_bytes_read = ogg_bytes_to_read;
 
 	if(ogg_sync_wrote(&decoder->private_->ogg.sync_state, ogg_bytes_read) < 0) {
diff --git a/src/libOggFLAC/stream_encoder.c b/src/libOggFLAC/stream_encoder.c
index d1ca5473..f949acec 100644
--- a/src/libOggFLAC/stream_encoder.c
+++ b/src/libOggFLAC/stream_encoder.c
@@ -126,7 +126,7 @@ void OggFLAC__stream_encoder_delete(OggFLAC__StreamEncoder *encoder)
 	FLAC__ASSERT(0 != encoder->private_->FLAC_stream_encoder);
 
 	(void)OggFLAC__stream_encoder_finish(encoder);
- 
+
 	FLAC__stream_encoder_delete(encoder->private_->FLAC_stream_encoder);
 
 	free(encoder->private_);
diff --git a/src/test_libFLAC++/decoders.cc b/src/test_libFLAC++/decoders.cc
index 5402a780..48876bea 100644
--- a/src/test_libFLAC++/decoders.cc
+++ b/src/test_libFLAC++/decoders.cc
@@ -61,27 +61,27 @@ static void init_metadata_blocks_()
 	*/
 
 	/* min/max_framesize and md5sum don't get written at first, so we have to leave them 0 */
-    streaminfo_.is_last = false;
-    streaminfo_.type = ::FLAC__METADATA_TYPE_STREAMINFO;
-    streaminfo_.length = FLAC__STREAM_METADATA_STREAMINFO_LENGTH;
-    streaminfo_.data.stream_info.min_blocksize = 576;
-    streaminfo_.data.stream_info.max_blocksize = 576;
-    streaminfo_.data.stream_info.min_framesize = 0;
-    streaminfo_.data.stream_info.max_framesize = 0;
-    streaminfo_.data.stream_info.sample_rate = 44100;
-    streaminfo_.data.stream_info.channels = 1;
-    streaminfo_.data.stream_info.bits_per_sample = 8;
-    streaminfo_.data.stream_info.total_samples = 0;
+	streaminfo_.is_last = false;
+	streaminfo_.type = ::FLAC__METADATA_TYPE_STREAMINFO;
+	streaminfo_.length = FLAC__STREAM_METADATA_STREAMINFO_LENGTH;
+	streaminfo_.data.stream_info.min_blocksize = 576;
+	streaminfo_.data.stream_info.max_blocksize = 576;
+	streaminfo_.data.stream_info.min_framesize = 0;
+	streaminfo_.data.stream_info.max_framesize = 0;
+	streaminfo_.data.stream_info.sample_rate = 44100;
+	streaminfo_.data.stream_info.channels = 1;
+	streaminfo_.data.stream_info.bits_per_sample = 8;
+	streaminfo_.data.stream_info.total_samples = 0;
 	memset(streaminfo_.data.stream_info.md5sum, 0, 16);
 
-    padding_.is_last = false;
-    padding_.type = ::FLAC__METADATA_TYPE_PADDING;
-    padding_.length = 1234;
+	padding_.is_last = false;
+	padding_.type = ::FLAC__METADATA_TYPE_PADDING;
+	padding_.length = 1234;
 
-    seektable_.is_last = false;
-    seektable_.type = ::FLAC__METADATA_TYPE_SEEKTABLE;
+	seektable_.is_last = false;
+	seektable_.type = ::FLAC__METADATA_TYPE_SEEKTABLE;
 	seektable_.data.seek_table.num_points = 2;
-    seektable_.length = seektable_.data.seek_table.num_points * FLAC__STREAM_METADATA_SEEKPOINT_LENGTH;
+	seektable_.length = seektable_.data.seek_table.num_points * FLAC__STREAM_METADATA_SEEKPOINT_LENGTH;
 	seektable_.data.seek_table.points = (::FLAC__StreamMetadata_SeekPoint*)malloc_or_die_(seektable_.data.seek_table.num_points * sizeof(::FLAC__StreamMetadata_SeekPoint));
 	seektable_.data.seek_table.points[0].sample_number = 0;
 	seektable_.data.seek_table.points[0].stream_offset = 0;
@@ -90,16 +90,16 @@ static void init_metadata_blocks_()
 	seektable_.data.seek_table.points[1].stream_offset = 1000;
 	seektable_.data.seek_table.points[1].frame_samples = streaminfo_.data.stream_info.min_blocksize;
 
-    application1_.is_last = false;
-    application1_.type = ::FLAC__METADATA_TYPE_APPLICATION;
-    application1_.length = 8;
+	application1_.is_last = false;
+	application1_.type = ::FLAC__METADATA_TYPE_APPLICATION;
+	application1_.length = 8;
 	memcpy(application1_.data.application.id, "\xfe\xdc\xba\x98", 4);
 	application1_.data.application.data = (FLAC__byte*)malloc_or_die_(4);
 	memcpy(application1_.data.application.data, "\xf0\xe1\xd2\xc3", 4);
 
-    application2_.is_last = false;
-    application2_.type = ::FLAC__METADATA_TYPE_APPLICATION;
-    application2_.length = 4;
+	application2_.is_last = false;
+	application2_.type = ::FLAC__METADATA_TYPE_APPLICATION;
+	application2_.length = 4;
 	memcpy(application2_.data.application.id, "\x76\x54\x32\x10", 4);
 	application2_.data.application.data = 0;
 
@@ -142,7 +142,7 @@ static bool generate_file_()
 	num_expected_ = 5;
 
 	if(!file_utils__generate_flacfile(flacfilename_, &flacfilesize_, 512 * 1024, &streaminfo_, expected_metadata_sequence_, num_expected_))
-		return die_("creating the encoded file"); 
+		return die_("creating the encoded file");
 
 	return true;
 }
@@ -169,21 +169,21 @@ public:
 
 	if(feof(file_))
 		return ::FLAC__STREAM_DECODER_READ_STATUS_END_OF_STREAM;
-    else if(*bytes > 0) {
-        unsigned bytes_read = ::fread(buffer, 1, *bytes, file_);
-        if(bytes_read == 0) {
-            if(feof(file_))
-                return ::FLAC__STREAM_DECODER_READ_STATUS_END_OF_STREAM;
-            else
-                return ::FLAC__STREAM_DECODER_READ_STATUS_CONTINUE;
-        }
-        else {
-            *bytes = bytes_read;
-            return ::FLAC__STREAM_DECODER_READ_STATUS_CONTINUE;
-        }
-    }
-    else
-        return ::FLAC__STREAM_DECODER_READ_STATUS_ABORT; /* abort to avoid a deadlock */
+	else if(*bytes > 0) {
+		unsigned bytes_read = ::fread(buffer, 1, *bytes, file_);
+		if(bytes_read == 0) {
+			if(feof(file_))
+				return ::FLAC__STREAM_DECODER_READ_STATUS_END_OF_STREAM;
+			else
+				return ::FLAC__STREAM_DECODER_READ_STATUS_CONTINUE;
+		}
+		else {
+			*bytes = bytes_read;
+			return ::FLAC__STREAM_DECODER_READ_STATUS_CONTINUE;
+		}
+	}
+	else
+		return ::FLAC__STREAM_DECODER_READ_STATUS_ABORT; /* abort to avoid a deadlock */
 }
 
 ::FLAC__StreamDecoderWriteStatus DecoderCommon::common_write_callback_(const ::FLAC__Frame *frame)
@@ -191,13 +191,13 @@ public:
 	if(error_occurred_)
 		return ::FLAC__STREAM_DECODER_WRITE_STATUS_ABORT;
 
-    if(
-        (frame->header.number_type == ::FLAC__FRAME_NUMBER_TYPE_FRAME_NUMBER && frame->header.number.frame_number == 0) ||
-        (frame->header.number_type == ::FLAC__FRAME_NUMBER_TYPE_SAMPLE_NUMBER && frame->header.number.sample_number == 0)
-    ) {
-        printf("content... ");
-        fflush(stdout);
-    }
+	if(
+		(frame->header.number_type == ::FLAC__FRAME_NUMBER_TYPE_FRAME_NUMBER && frame->header.number.frame_number == 0) ||
+		(frame->header.number_type == ::FLAC__FRAME_NUMBER_TYPE_SAMPLE_NUMBER && frame->header.number.sample_number == 0)
+	) {
+		printf("content... ");
+		fflush(stdout);
+	}
 
 	return ::FLAC__STREAM_DECODER_WRITE_STATUS_CONTINUE;
 }
diff --git a/src/test_libFLAC++/encoders.cc b/src/test_libFLAC++/encoders.cc
index 7b876104..15183ca3 100644
--- a/src/test_libFLAC++/encoders.cc
+++ b/src/test_libFLAC++/encoders.cc
@@ -52,27 +52,27 @@ static void init_metadata_blocks_()
 	*/
 
 	/* min/max_framesize and md5sum don't get written at first, so we have to leave them 0 */
-    streaminfo_.is_last = false;
-    streaminfo_.type = ::FLAC__METADATA_TYPE_STREAMINFO;
-    streaminfo_.length = FLAC__STREAM_METADATA_STREAMINFO_LENGTH;
-    streaminfo_.data.stream_info.min_blocksize = 576;
-    streaminfo_.data.stream_info.max_blocksize = 576;
-    streaminfo_.data.stream_info.min_framesize = 0;
-    streaminfo_.data.stream_info.max_framesize = 0;
-    streaminfo_.data.stream_info.sample_rate = 44100;
-    streaminfo_.data.stream_info.channels = 1;
-    streaminfo_.data.stream_info.bits_per_sample = 8;
-    streaminfo_.data.stream_info.total_samples = 0;
+	streaminfo_.is_last = false;
+	streaminfo_.type = ::FLAC__METADATA_TYPE_STREAMINFO;
+	streaminfo_.length = FLAC__STREAM_METADATA_STREAMINFO_LENGTH;
+	streaminfo_.data.stream_info.min_blocksize = 576;
+	streaminfo_.data.stream_info.max_blocksize = 576;
+	streaminfo_.data.stream_info.min_framesize = 0;
+	streaminfo_.data.stream_info.max_framesize = 0;
+	streaminfo_.data.stream_info.sample_rate = 44100;
+	streaminfo_.data.stream_info.channels = 1;
+	streaminfo_.data.stream_info.bits_per_sample = 8;
+	streaminfo_.data.stream_info.total_samples = 0;
 	memset(streaminfo_.data.stream_info.md5sum, 0, 16);
 
-    padding_.is_last = false;
-    padding_.type = ::FLAC__METADATA_TYPE_PADDING;
-    padding_.length = 1234;
+	padding_.is_last = false;
+	padding_.type = ::FLAC__METADATA_TYPE_PADDING;
+	padding_.length = 1234;
 
-    seektable_.is_last = false;
-    seektable_.type = ::FLAC__METADATA_TYPE_SEEKTABLE;
+	seektable_.is_last = false;
+	seektable_.type = ::FLAC__METADATA_TYPE_SEEKTABLE;
 	seektable_.data.seek_table.num_points = 2;
-    seektable_.length = seektable_.data.seek_table.num_points * FLAC__STREAM_METADATA_SEEKPOINT_LENGTH;
+	seektable_.length = seektable_.data.seek_table.num_points * FLAC__STREAM_METADATA_SEEKPOINT_LENGTH;
 	seektable_.data.seek_table.points = (::FLAC__StreamMetadata_SeekPoint*)malloc_or_die_(seektable_.data.seek_table.num_points * sizeof(::FLAC__StreamMetadata_SeekPoint));
 	seektable_.data.seek_table.points[0].sample_number = 0;
 	seektable_.data.seek_table.points[0].stream_offset = 0;
@@ -81,22 +81,22 @@ static void init_metadata_blocks_()
 	seektable_.data.seek_table.points[1].stream_offset = 1000;
 	seektable_.data.seek_table.points[1].frame_samples = streaminfo_.data.stream_info.min_blocksize;
 
-    application1_.is_last = false;
-    application1_.type = ::FLAC__METADATA_TYPE_APPLICATION;
-    application1_.length = 8;
+	application1_.is_last = false;
+	application1_.type = ::FLAC__METADATA_TYPE_APPLICATION;
+	application1_.length = 8;
 	memcpy(application1_.data.application.id, "\xfe\xdc\xba\x98", 4);
 	application1_.data.application.data = (FLAC__byte*)malloc_or_die_(4);
 	memcpy(application1_.data.application.data, "\xf0\xe1\xd2\xc3", 4);
 
-    application2_.is_last = false;
-    application2_.type = ::FLAC__METADATA_TYPE_APPLICATION;
-    application2_.length = 4;
+	application2_.is_last = false;
+	application2_.type = ::FLAC__METADATA_TYPE_APPLICATION;
+	application2_.length = 4;
 	memcpy(application2_.data.application.id, "\x76\x54\x32\x10", 4);
 	application2_.data.application.data = 0;
 
-    vorbiscomment_.is_last = true;
-    vorbiscomment_.type = ::FLAC__METADATA_TYPE_VORBIS_COMMENT;
-    vorbiscomment_.length = (4 + 8) + 4 + (4 + 5) + (4 + 0);
+	vorbiscomment_.is_last = true;
+	vorbiscomment_.type = ::FLAC__METADATA_TYPE_VORBIS_COMMENT;
+	vorbiscomment_.length = (4 + 8) + 4 + (4 + 5) + (4 + 0);
 	vorbiscomment_.data.vorbis_comment.vendor_string.length = 8;
 	vorbiscomment_.data.vorbis_comment.vendor_string.entry = (FLAC__byte*)malloc_or_die_(8);
 	memcpy(vorbiscomment_.data.vorbis_comment.vendor_string.entry, "flac 1.x", 8);
diff --git a/src/test_libFLAC++/metadata_manip.cc b/src/test_libFLAC++/metadata_manip.cc
index c3760847..2a0812bd 100644
--- a/src/test_libFLAC++/metadata_manip.cc
+++ b/src/test_libFLAC++/metadata_manip.cc
@@ -314,7 +314,7 @@ static bool generate_file_()
 		return die_("priming our metadata");
 
 	if(!file_utils__generate_flacfile(flacfile_, 0, 512 * 1024, &streaminfo, metadata, 1))
-		return die_("creating the encoded file"); 
+		return die_("creating the encoded file");
 
 	free(vorbiscomment.data.vorbis_comment.vendor_string.entry);
 
@@ -363,7 +363,7 @@ static bool test_file_(const char *filename, bool ignore_metadata)
 static bool change_stats_(const char *filename, bool read_only)
 {
 	if(!file_utils__change_stats(filename, read_only))
-        return die_("during file_utils__change_stats()");
+		return die_("during file_utils__change_stats()");
 
 	return true;
 }
@@ -585,7 +585,7 @@ static bool test_level_1_()
 
 	if(!test_file_(flacfile_, /*ignore_metadata=*/false))
 		return false;
-	
+
 	printf("SV[P]PP\tprev\n");
 	if(!iterator.prev())
 		return die_("iterator ended early\n");
diff --git a/src/test_libFLAC++/metadata_object.cc b/src/test_libFLAC++/metadata_object.cc
index b92eb8a6..b04343c2 100644
--- a/src/test_libFLAC++/metadata_object.cc
+++ b/src/test_libFLAC++/metadata_object.cc
@@ -42,27 +42,27 @@ static void *malloc_or_die_(size_t size)
 
 static void init_metadata_blocks_()
 {
-    streaminfo_.is_last = false;
-    streaminfo_.type = ::FLAC__METADATA_TYPE_STREAMINFO;
-    streaminfo_.length = FLAC__STREAM_METADATA_STREAMINFO_LENGTH;
-    streaminfo_.data.stream_info.min_blocksize = 576;
-    streaminfo_.data.stream_info.max_blocksize = 576;
-    streaminfo_.data.stream_info.min_framesize = 0;
-    streaminfo_.data.stream_info.max_framesize = 0;
-    streaminfo_.data.stream_info.sample_rate = 44100;
-    streaminfo_.data.stream_info.channels = 1;
-    streaminfo_.data.stream_info.bits_per_sample = 8;
-    streaminfo_.data.stream_info.total_samples = 0;
+	streaminfo_.is_last = false;
+	streaminfo_.type = ::FLAC__METADATA_TYPE_STREAMINFO;
+	streaminfo_.length = FLAC__STREAM_METADATA_STREAMINFO_LENGTH;
+	streaminfo_.data.stream_info.min_blocksize = 576;
+	streaminfo_.data.stream_info.max_blocksize = 576;
+	streaminfo_.data.stream_info.min_framesize = 0;
+	streaminfo_.data.stream_info.max_framesize = 0;
+	streaminfo_.data.stream_info.sample_rate = 44100;
+	streaminfo_.data.stream_info.channels = 1;
+	streaminfo_.data.stream_info.bits_per_sample = 8;
+	streaminfo_.data.stream_info.total_samples = 0;
 	memset(streaminfo_.data.stream_info.md5sum, 0, 16);
 
-    padding_.is_last = false;
-    padding_.type = ::FLAC__METADATA_TYPE_PADDING;
-    padding_.length = 1234;
+	padding_.is_last = false;
+	padding_.type = ::FLAC__METADATA_TYPE_PADDING;
+	padding_.length = 1234;
 
-    seektable_.is_last = false;
-    seektable_.type = ::FLAC__METADATA_TYPE_SEEKTABLE;
+	seektable_.is_last = false;
+	seektable_.type = ::FLAC__METADATA_TYPE_SEEKTABLE;
 	seektable_.data.seek_table.num_points = 2;
-    seektable_.length = seektable_.data.seek_table.num_points * FLAC__STREAM_METADATA_SEEKPOINT_LENGTH;
+	seektable_.length = seektable_.data.seek_table.num_points * FLAC__STREAM_METADATA_SEEKPOINT_LENGTH;
 	seektable_.data.seek_table.points = (::FLAC__StreamMetadata_SeekPoint*)malloc_or_die_(seektable_.data.seek_table.num_points * sizeof(::FLAC__StreamMetadata_SeekPoint));
 	seektable_.data.seek_table.points[0].sample_number = 0;
 	seektable_.data.seek_table.points[0].stream_offset = 0;
@@ -71,16 +71,16 @@ static void init_metadata_blocks_()
 	seektable_.data.seek_table.points[1].stream_offset = 1000;
 	seektable_.data.seek_table.points[1].frame_samples = streaminfo_.data.stream_info.min_blocksize;
 
-    application_.is_last = false;
-    application_.type = ::FLAC__METADATA_TYPE_APPLICATION;
-    application_.length = 8;
+	application_.is_last = false;
+	application_.type = ::FLAC__METADATA_TYPE_APPLICATION;
+	application_.length = 8;
 	memcpy(application_.data.application.id, "\xfe\xdc\xba\x98", 4);
 	application_.data.application.data = (FLAC__byte*)malloc_or_die_(4);
 	memcpy(application_.data.application.data, "\xf0\xe1\xd2\xc3", 4);
 
-    vorbiscomment_.is_last = true;
-    vorbiscomment_.type = ::FLAC__METADATA_TYPE_VORBIS_COMMENT;
-    vorbiscomment_.length = (4 + 8) + 4 + (4 + 5) + (4 + 0);
+	vorbiscomment_.is_last = true;
+	vorbiscomment_.type = ::FLAC__METADATA_TYPE_VORBIS_COMMENT;
+	vorbiscomment_.length = (4 + 8) + 4 + (4 + 5) + (4 + 0);
 	vorbiscomment_.data.vorbis_comment.vendor_string.length = 5;
 	vorbiscomment_.data.vorbis_comment.vendor_string.entry = (FLAC__byte*)malloc_or_die_(5);
 	memcpy(vorbiscomment_.data.vorbis_comment.vendor_string.entry, "name0", 8);
@@ -117,7 +117,7 @@ bool test_metadata_object_streaminfo()
 	if(block.get_length() != expected_length) {
 		printf("FAILED, bad length, expected %u, got %u\n", expected_length, block.get_length());
 		return false;
-    }
+	}
 	printf("OK\n");
 
 	printf("testing StreamInfo::StreamInfo(const StreamInfo &)... +\n");
@@ -299,7 +299,7 @@ bool test_metadata_object_padding()
 	if(block.get_length() != expected_length) {
 		printf("FAILED, bad length, expected %u, got %u\n", expected_length, block.get_length());
 		return false;
-    }
+	}
 	printf("OK\n");
 
 	printf("testing Padding::Padding(const Padding &)... +\n");
@@ -409,7 +409,7 @@ bool test_metadata_object_application()
 	if(block.get_length() != expected_length) {
 		printf("FAILED, bad length, expected %u, got %u\n", expected_length, block.get_length());
 		return false;
-    }
+	}
 	printf("OK\n");
 
 	printf("testing Application::Application(const Application &)... +\n");
@@ -528,7 +528,7 @@ bool test_metadata_object_seektable()
 	if(block.get_length() != expected_length) {
 		printf("FAILED, bad length, expected %u, got %u\n", expected_length, block.get_length());
 		return false;
-    }
+	}
 	printf("OK\n");
 
 	printf("testing SeekTable::SeekTable(const SeekTable &)... +\n");
@@ -790,7 +790,7 @@ bool test_metadata_object_vorbiscomment()
 	if(block.get_length() != expected_length) {
 		printf("FAILED, bad length, expected %u, got %u\n", expected_length, block.get_length());
 		return false;
-    }
+	}
 	printf("OK\n");
 
 	printf("testing VorbisComment::VorbisComment(const VorbisComment &)... +\n");
diff --git a/src/test_libFLAC/decoders.c b/src/test_libFLAC/decoders.c
index 8184246e..1dce3616 100644
--- a/src/test_libFLAC/decoders.c
+++ b/src/test_libFLAC/decoders.c
@@ -125,27 +125,27 @@ static void init_metadata_blocks_()
 	*/
 
 	/* min/max_framesize and md5sum don't get written at first, so we have to leave them 0 */
-    streaminfo_.is_last = false;
-    streaminfo_.type = FLAC__METADATA_TYPE_STREAMINFO;
-    streaminfo_.length = FLAC__STREAM_METADATA_STREAMINFO_LENGTH;
-    streaminfo_.data.stream_info.min_blocksize = 576;
-    streaminfo_.data.stream_info.max_blocksize = 576;
-    streaminfo_.data.stream_info.min_framesize = 0;
-    streaminfo_.data.stream_info.max_framesize = 0;
-    streaminfo_.data.stream_info.sample_rate = 44100;
-    streaminfo_.data.stream_info.channels = 1;
-    streaminfo_.data.stream_info.bits_per_sample = 8;
-    streaminfo_.data.stream_info.total_samples = 0;
+	streaminfo_.is_last = false;
+	streaminfo_.type = FLAC__METADATA_TYPE_STREAMINFO;
+	streaminfo_.length = FLAC__STREAM_METADATA_STREAMINFO_LENGTH;
+	streaminfo_.data.stream_info.min_blocksize = 576;
+	streaminfo_.data.stream_info.max_blocksize = 576;
+	streaminfo_.data.stream_info.min_framesize = 0;
+	streaminfo_.data.stream_info.max_framesize = 0;
+	streaminfo_.data.stream_info.sample_rate = 44100;
+	streaminfo_.data.stream_info.channels = 1;
+	streaminfo_.data.stream_info.bits_per_sample = 8;
+	streaminfo_.data.stream_info.total_samples = 0;
 	memset(streaminfo_.data.stream_info.md5sum, 0, 16);
 
-    padding_.is_last = false;
-    padding_.type = FLAC__METADATA_TYPE_PADDING;
-    padding_.length = 1234;
+	padding_.is_last = false;
+	padding_.type = FLAC__METADATA_TYPE_PADDING;
+	padding_.length = 1234;
 
-    seektable_.is_last = false;
-    seektable_.type = FLAC__METADATA_TYPE_SEEKTABLE;
+	seektable_.is_last = false;
+	seektable_.type = FLAC__METADATA_TYPE_SEEKTABLE;
 	seektable_.data.seek_table.num_points = 2;
-    seektable_.length = seektable_.data.seek_table.num_points * FLAC__STREAM_METADATA_SEEKPOINT_LENGTH;
+	seektable_.length = seektable_.data.seek_table.num_points * FLAC__STREAM_METADATA_SEEKPOINT_LENGTH;
 	seektable_.data.seek_table.points = malloc_or_die_(seektable_.data.seek_table.num_points * sizeof(FLAC__StreamMetadata_SeekPoint));
 	seektable_.data.seek_table.points[0].sample_number = 0;
 	seektable_.data.seek_table.points[0].stream_offset = 0;
@@ -154,16 +154,16 @@ static void init_metadata_blocks_()
 	seektable_.data.seek_table.points[1].stream_offset = 1000;
 	seektable_.data.seek_table.points[1].frame_samples = streaminfo_.data.stream_info.min_blocksize;
 
-    application1_.is_last = false;
-    application1_.type = FLAC__METADATA_TYPE_APPLICATION;
-    application1_.length = 8;
+	application1_.is_last = false;
+	application1_.type = FLAC__METADATA_TYPE_APPLICATION;
+	application1_.length = 8;
 	memcpy(application1_.data.application.id, "\xfe\xdc\xba\x98", 4);
 	application1_.data.application.data = malloc_or_die_(4);
 	memcpy(application1_.data.application.data, "\xf0\xe1\xd2\xc3", 4);
 
-    application2_.is_last = false;
-    application2_.type = FLAC__METADATA_TYPE_APPLICATION;
-    application2_.length = 4;
+	application2_.is_last = false;
+	application2_.type = FLAC__METADATA_TYPE_APPLICATION;
+	application2_.length = 4;
 	memcpy(application2_.data.application.id, "\x76\x54\x32\x10", 4);
 	application2_.data.application.data = 0;
 
@@ -206,7 +206,7 @@ static FLAC__bool generate_file_()
 	num_expected_ = 5;
 
 	if(!file_utils__generate_flacfile(flacfilename_, &flacfilesize_, 512 * 1024, &streaminfo_, expected_metadata_sequence_, num_expected_))
-		return die_("creating the encoded file"); 
+		return die_("creating the encoded file");
 
 	return true;
 }
@@ -227,21 +227,21 @@ static FLAC__StreamDecoderReadStatus stream_decoder_read_callback_(const FLAC__S
 
 	if(feof(dcd->file))
 		return FLAC__STREAM_DECODER_READ_STATUS_END_OF_STREAM;
-    else if(*bytes > 0) {
-        unsigned bytes_read = fread(buffer, 1, *bytes, dcd->file);
-        if(bytes_read == 0) {
-            if(feof(dcd->file))
-                return FLAC__STREAM_DECODER_READ_STATUS_END_OF_STREAM;
-            else
-                return FLAC__STREAM_DECODER_READ_STATUS_CONTINUE;
-        }
-        else {
-            *bytes = bytes_read;
-            return FLAC__STREAM_DECODER_READ_STATUS_CONTINUE;
-        }
-    }
-    else
-        return FLAC__STREAM_DECODER_READ_STATUS_ABORT; /* abort to avoid a deadlock */
+	else if(*bytes > 0) {
+		unsigned bytes_read = fread(buffer, 1, *bytes, dcd->file);
+		if(bytes_read == 0) {
+			if(feof(dcd->file))
+				return FLAC__STREAM_DECODER_READ_STATUS_END_OF_STREAM;
+			else
+				return FLAC__STREAM_DECODER_READ_STATUS_CONTINUE;
+		}
+		else {
+			*bytes = bytes_read;
+			return FLAC__STREAM_DECODER_READ_STATUS_CONTINUE;
+		}
+	}
+	else
+		return FLAC__STREAM_DECODER_READ_STATUS_ABORT; /* abort to avoid a deadlock */
 }
 
 static FLAC__StreamDecoderWriteStatus stream_decoder_write_callback_(const FLAC__StreamDecoder *decoder, const FLAC__Frame *frame, const FLAC__int32 * const buffer[], void *client_data)
@@ -258,13 +258,13 @@ static FLAC__StreamDecoderWriteStatus stream_decoder_write_callback_(const FLAC_
 	if(dcd->error_occurred)
 		return FLAC__STREAM_DECODER_WRITE_STATUS_ABORT;
 
-    if(
-        (frame->header.number_type == FLAC__FRAME_NUMBER_TYPE_FRAME_NUMBER && frame->header.number.frame_number == 0) ||
-        (frame->header.number_type == FLAC__FRAME_NUMBER_TYPE_SAMPLE_NUMBER && frame->header.number.sample_number == 0)
-    ) {
-        printf("content... ");
-        fflush(stdout);
-    }
+	if(
+		(frame->header.number_type == FLAC__FRAME_NUMBER_TYPE_FRAME_NUMBER && frame->header.number.frame_number == 0) ||
+		(frame->header.number_type == FLAC__FRAME_NUMBER_TYPE_SAMPLE_NUMBER && frame->header.number.sample_number == 0)
+	) {
+		printf("content... ");
+		fflush(stdout);
+	}
 
 	return FLAC__STREAM_DECODER_WRITE_STATUS_CONTINUE;
 }
diff --git a/src/test_libFLAC/encoders.c b/src/test_libFLAC/encoders.c
index 5721fd13..779e82da 100644
--- a/src/test_libFLAC/encoders.c
+++ b/src/test_libFLAC/encoders.c
@@ -118,27 +118,27 @@ static void init_metadata_blocks_()
 	*/
 
 	/* min/max_framesize and md5sum don't get written at first, so we have to leave them 0 */
-    streaminfo_.is_last = false;
-    streaminfo_.type = FLAC__METADATA_TYPE_STREAMINFO;
-    streaminfo_.length = FLAC__STREAM_METADATA_STREAMINFO_LENGTH;
-    streaminfo_.data.stream_info.min_blocksize = 576;
-    streaminfo_.data.stream_info.max_blocksize = 576;
-    streaminfo_.data.stream_info.min_framesize = 0;
-    streaminfo_.data.stream_info.max_framesize = 0;
-    streaminfo_.data.stream_info.sample_rate = 44100;
-    streaminfo_.data.stream_info.channels = 1;
-    streaminfo_.data.stream_info.bits_per_sample = 8;
-    streaminfo_.data.stream_info.total_samples = 0;
+	streaminfo_.is_last = false;
+	streaminfo_.type = FLAC__METADATA_TYPE_STREAMINFO;
+	streaminfo_.length = FLAC__STREAM_METADATA_STREAMINFO_LENGTH;
+	streaminfo_.data.stream_info.min_blocksize = 576;
+	streaminfo_.data.stream_info.max_blocksize = 576;
+	streaminfo_.data.stream_info.min_framesize = 0;
+	streaminfo_.data.stream_info.max_framesize = 0;
+	streaminfo_.data.stream_info.sample_rate = 44100;
+	streaminfo_.data.stream_info.channels = 1;
+	streaminfo_.data.stream_info.bits_per_sample = 8;
+	streaminfo_.data.stream_info.total_samples = 0;
 	memset(streaminfo_.data.stream_info.md5sum, 0, 16);
 
-    padding_.is_last = false;
-    padding_.type = FLAC__METADATA_TYPE_PADDING;
-    padding_.length = 1234;
+	padding_.is_last = false;
+	padding_.type = FLAC__METADATA_TYPE_PADDING;
+	padding_.length = 1234;
 
-    seektable_.is_last = false;
-    seektable_.type = FLAC__METADATA_TYPE_SEEKTABLE;
+	seektable_.is_last = false;
+	seektable_.type = FLAC__METADATA_TYPE_SEEKTABLE;
 	seektable_.data.seek_table.num_points = 2;
-    seektable_.length = seektable_.data.seek_table.num_points * FLAC__STREAM_METADATA_SEEKPOINT_LENGTH;
+	seektable_.length = seektable_.data.seek_table.num_points * FLAC__STREAM_METADATA_SEEKPOINT_LENGTH;
 	seektable_.data.seek_table.points = malloc_or_die_(seektable_.data.seek_table.num_points * sizeof(FLAC__StreamMetadata_SeekPoint));
 	seektable_.data.seek_table.points[0].sample_number = 0;
 	seektable_.data.seek_table.points[0].stream_offset = 0;
@@ -147,22 +147,22 @@ static void init_metadata_blocks_()
 	seektable_.data.seek_table.points[1].stream_offset = 1000;
 	seektable_.data.seek_table.points[1].frame_samples = streaminfo_.data.stream_info.min_blocksize;
 
-    application1_.is_last = false;
-    application1_.type = FLAC__METADATA_TYPE_APPLICATION;
-    application1_.length = 8;
+	application1_.is_last = false;
+	application1_.type = FLAC__METADATA_TYPE_APPLICATION;
+	application1_.length = 8;
 	memcpy(application1_.data.application.id, "\xfe\xdc\xba\x98", 4);
 	application1_.data.application.data = malloc_or_die_(4);
 	memcpy(application1_.data.application.data, "\xf0\xe1\xd2\xc3", 4);
 
-    application2_.is_last = false;
-    application2_.type = FLAC__METADATA_TYPE_APPLICATION;
-    application2_.length = 4;
+	application2_.is_last = false;
+	application2_.type = FLAC__METADATA_TYPE_APPLICATION;
+	application2_.length = 4;
 	memcpy(application2_.data.application.id, "\x76\x54\x32\x10", 4);
 	application2_.data.application.data = 0;
 
-    vorbiscomment_.is_last = true;
-    vorbiscomment_.type = FLAC__METADATA_TYPE_VORBIS_COMMENT;
-    vorbiscomment_.length = (4 + 8) + 4 + (4 + 5) + (4 + 0);
+	vorbiscomment_.is_last = true;
+	vorbiscomment_.type = FLAC__METADATA_TYPE_VORBIS_COMMENT;
+	vorbiscomment_.length = (4 + 8) + 4 + (4 + 5) + (4 + 0);
 	vorbiscomment_.data.vorbis_comment.vendor_string.length = 8;
 	vorbiscomment_.data.vorbis_comment.vendor_string.entry = malloc_or_die_(8);
 	memcpy(vorbiscomment_.data.vorbis_comment.vendor_string.entry, "flac 1.x", 8);
diff --git a/src/test_libFLAC/metadata_manip.c b/src/test_libFLAC/metadata_manip.c
index 2ef0eaed..b9988223 100644
--- a/src/test_libFLAC/metadata_manip.c
+++ b/src/test_libFLAC/metadata_manip.c
@@ -319,7 +319,7 @@ static FLAC__bool generate_file_()
 		return die_("priming our metadata");
 
 	if(!file_utils__generate_flacfile(flacfile_, 0, 512 * 1024, &streaminfo, metadata, 1))
-		return die_("creating the encoded file"); 
+		return die_("creating the encoded file");
 
 	free(vorbiscomment.data.vorbis_comment.vendor_string.entry);
 
@@ -377,7 +377,7 @@ static FLAC__bool test_file_(const char *filename, void (*metadata_callback)(con
 static FLAC__bool change_stats_(const char *filename, FLAC__bool read_only)
 {
 	if(!file_utils__change_stats(filename, read_only))
-        return die_("during file_utils__change_stats()");
+		return die_("during file_utils__change_stats()");
 
 	return true;
 }
@@ -592,7 +592,7 @@ static FLAC__bool test_level_1_()
 
 	if(!test_file_(flacfile_, decoder_metadata_callback_compare_))
 		return false;
-	
+
 	printf("SV[P]PP\tprev\n");
 	if(!FLAC__metadata_simple_iterator_prev(iterator))
 		return die_("iterator ended early\n");
diff --git a/src/test_libFLAC/metadata_object.c b/src/test_libFLAC/metadata_object.c
index 36468f92..34b77c1a 100644
--- a/src/test_libFLAC/metadata_object.c
+++ b/src/test_libFLAC/metadata_object.c
@@ -69,7 +69,7 @@ static FLAC__bool check_seektable_(const FLAC__StreamMetadata *block, unsigned n
 	if(block->length != expected_length) {
 		printf("FAILED, bad length, expected %u, got %u\n", expected_length, block->length);
 		return false;
-    }
+	}
 	if(block->data.seek_table.num_points != num_points) {
 		printf("FAILED, expected %u point, got %u\n", num_points, block->data.seek_table.num_points);
 		return false;
@@ -93,14 +93,14 @@ static void entry_new_(FLAC__StreamMetadata_VorbisComment_Entry *entry, const ch
 {
 	entry->length = strlen(field);
 	entry->entry = (FLAC__byte*)malloc(entry->length);
-	FLAC__ASSERT(0 != entry->entry);	
+	FLAC__ASSERT(0 != entry->entry);
 	memcpy(entry->entry, field, entry->length);
 }
 
 static void entry_clone_(FLAC__StreamMetadata_VorbisComment_Entry *entry)
 {
 	FLAC__byte *x = (FLAC__byte*)malloc(entry->length);
-	FLAC__ASSERT(0 != x);	
+	FLAC__ASSERT(0 != x);
 	memcpy(x, entry->entry, entry->length);
 	entry->entry = x;
 }
@@ -206,7 +206,7 @@ FLAC__bool test_metadata_object()
 	if(block->length != expected_length) {
 		printf("FAILED, bad length, expected %u, got %u\n", expected_length, block->length);
 		return false;
-    }
+	}
 	printf("OK\n");
 
 	printf("testing FLAC__metadata_object_clone()... ");
@@ -237,7 +237,7 @@ FLAC__bool test_metadata_object()
 	if(block->length != expected_length) {
 		printf("FAILED, bad length, expected %u, got %u\n", expected_length, block->length);
 		return false;
-    }
+	}
 	printf("OK\n");
 
 	printf("testing FLAC__metadata_object_clone()... ");
@@ -268,7 +268,7 @@ FLAC__bool test_metadata_object()
 	if(block->length != expected_length) {
 		printf("FAILED, bad length, expected %u, got %u\n", expected_length, block->length);
 		return false;
-    }
+	}
 	printf("OK\n");
 
 	printf("testing FLAC__metadata_object_clone()... ");
@@ -539,7 +539,7 @@ FLAC__bool test_metadata_object()
 	if(!check_seektable_(block, seekpoints, seekpoint_array))
 		return false;
 
-    {
+	{
 		FLAC__uint64 nums[2] = { 3, 7 };
 		seekpoint_array[seekpoints++].sample_number = nums[0];
 		seekpoint_array[seekpoints++].sample_number = nums[1];
@@ -612,7 +612,7 @@ FLAC__bool test_metadata_object()
 	if(block->length != expected_length) {
 		printf("FAILED, bad length, expected %u, got %u\n", expected_length, block->length);
 		return false;
-    }
+	}
 	printf("OK\n");
 
 	printf("testing FLAC__metadata_object_clone()... ");
diff --git a/src/test_libFLAC/metadata_utils.c b/src/test_libFLAC/metadata_utils.c
index a691ab83..eadd581c 100644
--- a/src/test_libFLAC/metadata_utils.c
+++ b/src/test_libFLAC/metadata_utils.c
@@ -31,35 +31,35 @@ FLAC__bool compare_block_data_streaminfo_(const FLAC__StreamMetadata_StreamInfo
 	if(blockcopy->min_blocksize != block->min_blocksize) {
 		printf("FAILED, min_blocksize mismatch, expected %u, got %u\n", block->min_blocksize, blockcopy->min_blocksize);
 		return false;
-    }
+	}
 	if(blockcopy->max_blocksize != block->max_blocksize) {
 		printf("FAILED, max_blocksize mismatch, expected %u, got %u\n", block->max_blocksize, blockcopy->max_blocksize);
 		return false;
-    }
+	}
 	if(blockcopy->min_framesize != block->min_framesize) {
 		printf("FAILED, min_framesize mismatch, expected %u, got %u\n", block->min_framesize, blockcopy->min_framesize);
 		return false;
-    }
+	}
 	if(blockcopy->max_framesize != block->max_framesize) {
 		printf("FAILED, max_framesize mismatch, expected %u, got %u\n", block->max_framesize, blockcopy->max_framesize);
 		return false;
-    }
+	}
 	if(blockcopy->sample_rate != block->sample_rate) {
 		printf("FAILED, sample_rate mismatch, expected %u, got %u\n", block->sample_rate, blockcopy->sample_rate);
 		return false;
-    }
+	}
 	if(blockcopy->channels != block->channels) {
 		printf("FAILED, channels mismatch, expected %u, got %u\n", block->channels, blockcopy->channels);
 		return false;
-    }
+	}
 	if(blockcopy->bits_per_sample != block->bits_per_sample) {
 		printf("FAILED, bits_per_sample mismatch, expected %u, got %u\n", block->bits_per_sample, blockcopy->bits_per_sample);
 		return false;
-    }
+	}
 	if(blockcopy->total_samples != block->total_samples) {
 		printf("FAILED, total_samples mismatch, expected %llu, got %llu\n", block->total_samples, blockcopy->total_samples);
 		return false;
-    }
+	}
 	if(0 != memcmp(blockcopy->md5sum, block->md5sum, sizeof(block->md5sum))) {
 		printf("FAILED, md5sum mismatch, expected %02X%02X%02X%02X%02X%02X%02X%02X%02X%02X%02X%02X%02X%02X%02X%02X, got %02X%02X%02X%02X%02X%02X%02X%02X%02X%02X%02X%02X%02X%02X%02X%02X\n",
 			(unsigned)block->md5sum[0],
@@ -96,7 +96,7 @@ FLAC__bool compare_block_data_streaminfo_(const FLAC__StreamMetadata_StreamInfo
 			(unsigned)blockcopy->md5sum[15]
 		);
 		return false;
-    }
+	}
 	return true;
 }
 
@@ -125,7 +125,7 @@ FLAC__bool compare_block_data_application_(const FLAC__StreamMetadata_Applicatio
 			(unsigned)blockcopy->id[3]
 		);
 		return false;
-    }
+	}
 	if(0 == block->data || 0 == blockcopy->data) {
 		if(block->data != blockcopy->data) {
 			printf("FAILED, data mismatch (%s's data pointer is null)\n", 0==block->data?"original":"copy");
@@ -155,7 +155,7 @@ FLAC__bool compare_block_data_seektable_(const FLAC__StreamMetadata_SeekTable *b
 	if(blockcopy->num_points != block->num_points) {
 		printf("FAILED, num_points mismatch, expected %u, got %u\n", block->num_points, blockcopy->num_points);
 		return false;
-    }
+	}
 	for(i = 0; i < block->num_points; i++) {
 		if(blockcopy->points[i].sample_number != block->points[i].sample_number) {
 			printf("FAILED, points[%u].sample_number mismatch, expected %llu, got %llu\n", i, block->points[i].sample_number, blockcopy->points[i].sample_number);
@@ -179,7 +179,7 @@ FLAC__bool compare_block_data_vorbiscomment_(const FLAC__StreamMetadata_VorbisCo
 	if(blockcopy->vendor_string.length != block->vendor_string.length) {
 		printf("FAILED, vendor_string.length mismatch, expected %u, got %u\n", block->vendor_string.length, blockcopy->vendor_string.length);
 		return false;
-    }
+	}
 	if(0 == block->vendor_string.entry || 0 == blockcopy->vendor_string.entry) {
 		if(block->vendor_string.entry != blockcopy->vendor_string.entry) {
 			printf("FAILED, vendor_string.entry mismatch\n");
@@ -189,11 +189,11 @@ FLAC__bool compare_block_data_vorbiscomment_(const FLAC__StreamMetadata_VorbisCo
 	else if(0 != memcmp(blockcopy->vendor_string.entry, block->vendor_string.entry, block->vendor_string.length)) {
 		printf("FAILED, vendor_string.entry mismatch\n");
 		return false;
-    }
+	}
 	if(blockcopy->num_comments != block->num_comments) {
 		printf("FAILED, num_comments mismatch, expected %u, got %u\n", block->num_comments, blockcopy->num_comments);
 		return false;
-    }
+	}
 	for(i = 0; i < block->num_comments; i++) {
 		if(blockcopy->comments[i].length != block->comments[i].length) {
 			printf("FAILED, comments[%u].length mismatch, expected %u, got %u\n", i, block->comments[i].length, blockcopy->comments[i].length);
@@ -220,15 +220,15 @@ FLAC__bool compare_block_(const FLAC__StreamMetadata *block, const FLAC__StreamM
 	if(blockcopy->type != block->type) {
 		printf("FAILED, type mismatch, expected %s, got %s\n", FLAC__MetadataTypeString[block->type], FLAC__MetadataTypeString[blockcopy->type]);
 		return false;
-    }
+	}
 	if(blockcopy->is_last != block->is_last) {
 		printf("FAILED, is_last mismatch, expected %u, got %u\n", (unsigned)block->is_last, (unsigned)blockcopy->is_last);
 		return false;
-    }
+	}
 	if(blockcopy->length != block->length) {
 		printf("FAILED, length mismatch, expected %u, got %u\n", block->length, blockcopy->length);
 		return false;
-    }
+	}
 	switch(block->type) {
 		case FLAC__METADATA_TYPE_STREAMINFO:
 			return compare_block_data_streaminfo_(&block->data.stream_info, &blockcopy->data.stream_info);
diff --git a/src/test_libOggFLAC++/decoders.cc b/src/test_libOggFLAC++/decoders.cc
index 3bbc54b6..a56fc254 100644
--- a/src/test_libOggFLAC++/decoders.cc
+++ b/src/test_libOggFLAC++/decoders.cc
@@ -61,27 +61,27 @@ static void init_metadata_blocks_()
 	*/
 
 	/* min/max_framesize and md5sum don't get written at first, so we have to leave them 0 */
-    streaminfo_.is_last = false;
-    streaminfo_.type = ::FLAC__METADATA_TYPE_STREAMINFO;
-    streaminfo_.length = FLAC__STREAM_METADATA_STREAMINFO_LENGTH;
-    streaminfo_.data.stream_info.min_blocksize = 576;
-    streaminfo_.data.stream_info.max_blocksize = 576;
-    streaminfo_.data.stream_info.min_framesize = 0;
-    streaminfo_.data.stream_info.max_framesize = 0;
-    streaminfo_.data.stream_info.sample_rate = 44100;
-    streaminfo_.data.stream_info.channels = 1;
-    streaminfo_.data.stream_info.bits_per_sample = 8;
-    streaminfo_.data.stream_info.total_samples = 0;
+	streaminfo_.is_last = false;
+	streaminfo_.type = ::FLAC__METADATA_TYPE_STREAMINFO;
+	streaminfo_.length = FLAC__STREAM_METADATA_STREAMINFO_LENGTH;
+	streaminfo_.data.stream_info.min_blocksize = 576;
+	streaminfo_.data.stream_info.max_blocksize = 576;
+	streaminfo_.data.stream_info.min_framesize = 0;
+	streaminfo_.data.stream_info.max_framesize = 0;
+	streaminfo_.data.stream_info.sample_rate = 44100;
+	streaminfo_.data.stream_info.channels = 1;
+	streaminfo_.data.stream_info.bits_per_sample = 8;
+	streaminfo_.data.stream_info.total_samples = 0;
 	memset(streaminfo_.data.stream_info.md5sum, 0, 16);
 
-    padding_.is_last = false;
-    padding_.type = ::FLAC__METADATA_TYPE_PADDING;
-    padding_.length = 1234;
+	padding_.is_last = false;
+	padding_.type = ::FLAC__METADATA_TYPE_PADDING;
+	padding_.length = 1234;
 
-    seektable_.is_last = false;
-    seektable_.type = ::FLAC__METADATA_TYPE_SEEKTABLE;
+	seektable_.is_last = false;
+	seektable_.type = ::FLAC__METADATA_TYPE_SEEKTABLE;
 	seektable_.data.seek_table.num_points = 2;
-    seektable_.length = seektable_.data.seek_table.num_points * FLAC__STREAM_METADATA_SEEKPOINT_LENGTH;
+	seektable_.length = seektable_.data.seek_table.num_points * FLAC__STREAM_METADATA_SEEKPOINT_LENGTH;
 	seektable_.data.seek_table.points = (::FLAC__StreamMetadata_SeekPoint*)malloc_or_die_(seektable_.data.seek_table.num_points * sizeof(::FLAC__StreamMetadata_SeekPoint));
 	seektable_.data.seek_table.points[0].sample_number = 0;
 	seektable_.data.seek_table.points[0].stream_offset = 0;
@@ -90,16 +90,16 @@ static void init_metadata_blocks_()
 	seektable_.data.seek_table.points[1].stream_offset = 1000;
 	seektable_.data.seek_table.points[1].frame_samples = streaminfo_.data.stream_info.min_blocksize;
 
-    application1_.is_last = false;
-    application1_.type = ::FLAC__METADATA_TYPE_APPLICATION;
-    application1_.length = 8;
+	application1_.is_last = false;
+	application1_.type = ::FLAC__METADATA_TYPE_APPLICATION;
+	application1_.length = 8;
 	memcpy(application1_.data.application.id, "\xfe\xdc\xba\x98", 4);
 	application1_.data.application.data = (FLAC__byte*)malloc_or_die_(4);
 	memcpy(application1_.data.application.data, "\xf0\xe1\xd2\xc3", 4);
 
-    application2_.is_last = false;
-    application2_.type = ::FLAC__METADATA_TYPE_APPLICATION;
-    application2_.length = 4;
+	application2_.is_last = false;
+	application2_.type = ::FLAC__METADATA_TYPE_APPLICATION;
+	application2_.length = 4;
 	memcpy(application2_.data.application.id, "\x76\x54\x32\x10", 4);
 	application2_.data.application.data = 0;
 
@@ -142,7 +142,7 @@ static bool generate_file_()
 	num_expected_ = 5;
 
 	if(!file_utils__generate_oggflacfile(oggflacfilename_, &oggflacfilesize_, 512 * 1024, &streaminfo_, expected_metadata_sequence_, num_expected_))
-		return die_("creating the encoded file"); 
+		return die_("creating the encoded file");
 
 	return true;
 }
@@ -169,21 +169,21 @@ public:
 
 	if(feof(file_))
 		return ::FLAC__STREAM_DECODER_READ_STATUS_END_OF_STREAM;
-    else if(*bytes > 0) {
-        unsigned bytes_read = ::fread(buffer, 1, *bytes, file_);
-        if(bytes_read == 0) {
-            if(feof(file_))
-                return ::FLAC__STREAM_DECODER_READ_STATUS_END_OF_STREAM;
-            else
-                return ::FLAC__STREAM_DECODER_READ_STATUS_CONTINUE;
-        }
-        else {
-            *bytes = bytes_read;
-            return ::FLAC__STREAM_DECODER_READ_STATUS_CONTINUE;
-        }
-    }
-    else
-        return ::FLAC__STREAM_DECODER_READ_STATUS_ABORT; /* abort to avoid a deadlock */
+	else if(*bytes > 0) {
+		unsigned bytes_read = ::fread(buffer, 1, *bytes, file_);
+		if(bytes_read == 0) {
+			if(feof(file_))
+				return ::FLAC__STREAM_DECODER_READ_STATUS_END_OF_STREAM;
+			else
+				return ::FLAC__STREAM_DECODER_READ_STATUS_CONTINUE;
+		}
+		else {
+			*bytes = bytes_read;
+			return ::FLAC__STREAM_DECODER_READ_STATUS_CONTINUE;
+		}
+	}
+	else
+		return ::FLAC__STREAM_DECODER_READ_STATUS_ABORT; /* abort to avoid a deadlock */
 }
 
 ::FLAC__StreamDecoderWriteStatus DecoderCommon::common_write_callback_(const ::FLAC__Frame *frame)
@@ -191,13 +191,13 @@ public:
 	if(error_occurred_)
 		return ::FLAC__STREAM_DECODER_WRITE_STATUS_ABORT;
 
-    if(
-        (frame->header.number_type == ::FLAC__FRAME_NUMBER_TYPE_FRAME_NUMBER && frame->header.number.frame_number == 0) ||
-        (frame->header.number_type == ::FLAC__FRAME_NUMBER_TYPE_SAMPLE_NUMBER && frame->header.number.sample_number == 0)
-    ) {
-        printf("content... ");
-        fflush(stdout);
-    }
+	if(
+		(frame->header.number_type == ::FLAC__FRAME_NUMBER_TYPE_FRAME_NUMBER && frame->header.number.frame_number == 0) ||
+		(frame->header.number_type == ::FLAC__FRAME_NUMBER_TYPE_SAMPLE_NUMBER && frame->header.number.sample_number == 0)
+	) {
+		printf("content... ");
+		fflush(stdout);
+	}
 
 	return ::FLAC__STREAM_DECODER_WRITE_STATUS_CONTINUE;
 }
diff --git a/src/test_libOggFLAC++/encoders.cc b/src/test_libOggFLAC++/encoders.cc
index 58172b56..f30941c6 100644
--- a/src/test_libOggFLAC++/encoders.cc
+++ b/src/test_libOggFLAC++/encoders.cc
@@ -51,27 +51,27 @@ static void init_metadata_blocks_()
 	*/
 
 	/* min/max_framesize and md5sum don't get written at first, so we have to leave them 0 */
-    streaminfo_.is_last = false;
-    streaminfo_.type = ::FLAC__METADATA_TYPE_STREAMINFO;
-    streaminfo_.length = FLAC__STREAM_METADATA_STREAMINFO_LENGTH;
-    streaminfo_.data.stream_info.min_blocksize = 576;
-    streaminfo_.data.stream_info.max_blocksize = 576;
-    streaminfo_.data.stream_info.min_framesize = 0;
-    streaminfo_.data.stream_info.max_framesize = 0;
-    streaminfo_.data.stream_info.sample_rate = 44100;
-    streaminfo_.data.stream_info.channels = 1;
-    streaminfo_.data.stream_info.bits_per_sample = 8;
-    streaminfo_.data.stream_info.total_samples = 0;
+	streaminfo_.is_last = false;
+	streaminfo_.type = ::FLAC__METADATA_TYPE_STREAMINFO;
+	streaminfo_.length = FLAC__STREAM_METADATA_STREAMINFO_LENGTH;
+	streaminfo_.data.stream_info.min_blocksize = 576;
+	streaminfo_.data.stream_info.max_blocksize = 576;
+	streaminfo_.data.stream_info.min_framesize = 0;
+	streaminfo_.data.stream_info.max_framesize = 0;
+	streaminfo_.data.stream_info.sample_rate = 44100;
+	streaminfo_.data.stream_info.channels = 1;
+	streaminfo_.data.stream_info.bits_per_sample = 8;
+	streaminfo_.data.stream_info.total_samples = 0;
 	memset(streaminfo_.data.stream_info.md5sum, 0, 16);
 
-    padding_.is_last = false;
-    padding_.type = ::FLAC__METADATA_TYPE_PADDING;
-    padding_.length = 1234;
+	padding_.is_last = false;
+	padding_.type = ::FLAC__METADATA_TYPE_PADDING;
+	padding_.length = 1234;
 
-    seektable_.is_last = false;
-    seektable_.type = ::FLAC__METADATA_TYPE_SEEKTABLE;
+	seektable_.is_last = false;
+	seektable_.type = ::FLAC__METADATA_TYPE_SEEKTABLE;
 	seektable_.data.seek_table.num_points = 2;
-    seektable_.length = seektable_.data.seek_table.num_points * FLAC__STREAM_METADATA_SEEKPOINT_LENGTH;
+	seektable_.length = seektable_.data.seek_table.num_points * FLAC__STREAM_METADATA_SEEKPOINT_LENGTH;
 	seektable_.data.seek_table.points = (::FLAC__StreamMetadata_SeekPoint*)malloc_or_die_(seektable_.data.seek_table.num_points * sizeof(::FLAC__StreamMetadata_SeekPoint));
 	seektable_.data.seek_table.points[0].sample_number = 0;
 	seektable_.data.seek_table.points[0].stream_offset = 0;
@@ -80,22 +80,22 @@ static void init_metadata_blocks_()
 	seektable_.data.seek_table.points[1].stream_offset = 1000;
 	seektable_.data.seek_table.points[1].frame_samples = streaminfo_.data.stream_info.min_blocksize;
 
-    application1_.is_last = false;
-    application1_.type = ::FLAC__METADATA_TYPE_APPLICATION;
-    application1_.length = 8;
+	application1_.is_last = false;
+	application1_.type = ::FLAC__METADATA_TYPE_APPLICATION;
+	application1_.length = 8;
 	memcpy(application1_.data.application.id, "\xfe\xdc\xba\x98", 4);
 	application1_.data.application.data = (FLAC__byte*)malloc_or_die_(4);
 	memcpy(application1_.data.application.data, "\xf0\xe1\xd2\xc3", 4);
 
-    application2_.is_last = false;
-    application2_.type = ::FLAC__METADATA_TYPE_APPLICATION;
-    application2_.length = 4;
+	application2_.is_last = false;
+	application2_.type = ::FLAC__METADATA_TYPE_APPLICATION;
+	application2_.length = 4;
 	memcpy(application2_.data.application.id, "\x76\x54\x32\x10", 4);
 	application2_.data.application.data = 0;
 
-    vorbiscomment_.is_last = true;
-    vorbiscomment_.type = ::FLAC__METADATA_TYPE_VORBIS_COMMENT;
-    vorbiscomment_.length = (4 + 8) + 4 + (4 + 5) + (4 + 0);
+	vorbiscomment_.is_last = true;
+	vorbiscomment_.type = ::FLAC__METADATA_TYPE_VORBIS_COMMENT;
+	vorbiscomment_.length = (4 + 8) + 4 + (4 + 5) + (4 + 0);
 	vorbiscomment_.data.vorbis_comment.vendor_string.length = 8;
 	vorbiscomment_.data.vorbis_comment.vendor_string.entry = (FLAC__byte*)malloc_or_die_(8);
 	memcpy(vorbiscomment_.data.vorbis_comment.vendor_string.entry, "flac 1.x", 8);
diff --git a/src/test_libOggFLAC/decoders.c b/src/test_libOggFLAC/decoders.c
index bba0c3a7..2db275db 100644
--- a/src/test_libOggFLAC/decoders.c
+++ b/src/test_libOggFLAC/decoders.c
@@ -84,27 +84,27 @@ static void init_metadata_blocks_()
 	*/
 
 	/* min/max_framesize and md5sum don't get written at first, so we have to leave them 0 */
-    streaminfo_.is_last = false;
-    streaminfo_.type = FLAC__METADATA_TYPE_STREAMINFO;
-    streaminfo_.length = FLAC__STREAM_METADATA_STREAMINFO_LENGTH;
-    streaminfo_.data.stream_info.min_blocksize = 576;
-    streaminfo_.data.stream_info.max_blocksize = 576;
-    streaminfo_.data.stream_info.min_framesize = 0;
-    streaminfo_.data.stream_info.max_framesize = 0;
-    streaminfo_.data.stream_info.sample_rate = 44100;
-    streaminfo_.data.stream_info.channels = 1;
-    streaminfo_.data.stream_info.bits_per_sample = 8;
-    streaminfo_.data.stream_info.total_samples = 0;
+	streaminfo_.is_last = false;
+	streaminfo_.type = FLAC__METADATA_TYPE_STREAMINFO;
+	streaminfo_.length = FLAC__STREAM_METADATA_STREAMINFO_LENGTH;
+	streaminfo_.data.stream_info.min_blocksize = 576;
+	streaminfo_.data.stream_info.max_blocksize = 576;
+	streaminfo_.data.stream_info.min_framesize = 0;
+	streaminfo_.data.stream_info.max_framesize = 0;
+	streaminfo_.data.stream_info.sample_rate = 44100;
+	streaminfo_.data.stream_info.channels = 1;
+	streaminfo_.data.stream_info.bits_per_sample = 8;
+	streaminfo_.data.stream_info.total_samples = 0;
 	memset(streaminfo_.data.stream_info.md5sum, 0, 16);
 
-    padding_.is_last = false;
-    padding_.type = FLAC__METADATA_TYPE_PADDING;
-    padding_.length = 1234;
+	padding_.is_last = false;
+	padding_.type = FLAC__METADATA_TYPE_PADDING;
+	padding_.length = 1234;
 
-    seektable_.is_last = false;
-    seektable_.type = FLAC__METADATA_TYPE_SEEKTABLE;
+	seektable_.is_last = false;
+	seektable_.type = FLAC__METADATA_TYPE_SEEKTABLE;
 	seektable_.data.seek_table.num_points = 2;
-    seektable_.length = seektable_.data.seek_table.num_points * FLAC__STREAM_METADATA_SEEKPOINT_LENGTH;
+	seektable_.length = seektable_.data.seek_table.num_points * FLAC__STREAM_METADATA_SEEKPOINT_LENGTH;
 	seektable_.data.seek_table.points = malloc_or_die_(seektable_.data.seek_table.num_points * sizeof(FLAC__StreamMetadata_SeekPoint));
 	seektable_.data.seek_table.points[0].sample_number = 0;
 	seektable_.data.seek_table.points[0].stream_offset = 0;
@@ -113,16 +113,16 @@ static void init_metadata_blocks_()
 	seektable_.data.seek_table.points[1].stream_offset = 1000;
 	seektable_.data.seek_table.points[1].frame_samples = streaminfo_.data.stream_info.min_blocksize;
 
-    application1_.is_last = false;
-    application1_.type = FLAC__METADATA_TYPE_APPLICATION;
-    application1_.length = 8;
+	application1_.is_last = false;
+	application1_.type = FLAC__METADATA_TYPE_APPLICATION;
+	application1_.length = 8;
 	memcpy(application1_.data.application.id, "\xfe\xdc\xba\x98", 4);
 	application1_.data.application.data = malloc_or_die_(4);
 	memcpy(application1_.data.application.data, "\xf0\xe1\xd2\xc3", 4);
 
-    application2_.is_last = false;
-    application2_.type = FLAC__METADATA_TYPE_APPLICATION;
-    application2_.length = 4;
+	application2_.is_last = false;
+	application2_.type = FLAC__METADATA_TYPE_APPLICATION;
+	application2_.length = 4;
 	memcpy(application2_.data.application.id, "\x76\x54\x32\x10", 4);
 	application2_.data.application.data = 0;
 
@@ -134,7 +134,7 @@ static void init_metadata_blocks_()
 		vorbiscomment_.data.vorbis_comment.vendor_string.length = vendor_string_length;
 		vorbiscomment_.data.vorbis_comment.vendor_string.entry = malloc_or_die_(vendor_string_length);
 		memcpy(vorbiscomment_.data.vorbis_comment.vendor_string.entry, FLAC__VENDOR_STRING, vendor_string_length);
-		vorbiscomment_.data.vorbis_comment.num_comments = 2;
+			vorbiscomment_.data.vorbis_comment.num_comments = 2;
 		vorbiscomment_.data.vorbis_comment.comments = malloc_or_die_(vorbiscomment_.data.vorbis_comment.num_comments * sizeof(FLAC__StreamMetadata_VorbisComment_Entry));
 		vorbiscomment_.data.vorbis_comment.comments[0].length = 5;
 		vorbiscomment_.data.vorbis_comment.comments[0].entry = malloc_or_die_(5);
@@ -165,7 +165,7 @@ static FLAC__bool generate_file_()
 	num_expected_ = 5;
 
 	if(!file_utils__generate_oggflacfile(oggflacfilename_, &oggflacfilesize_, 512 * 1024, &streaminfo_, expected_metadata_sequence_, num_expected_))
-		return die_("creating the encoded file"); 
+		return die_("creating the encoded file");
 
 	return true;
 }
@@ -186,21 +186,21 @@ static FLAC__StreamDecoderReadStatus stream_decoder_read_callback_(const OggFLAC
 
 	if(feof(dcd->file))
 		return FLAC__STREAM_DECODER_READ_STATUS_END_OF_STREAM;
-    else if(*bytes > 0) {
-        unsigned bytes_read = fread(buffer, 1, *bytes, dcd->file);
-        if(bytes_read == 0) {
-            if(feof(dcd->file))
-                return FLAC__STREAM_DECODER_READ_STATUS_END_OF_STREAM;
-            else
-                return FLAC__STREAM_DECODER_READ_STATUS_CONTINUE;
-        }
-        else {
-            *bytes = bytes_read;
-            return FLAC__STREAM_DECODER_READ_STATUS_CONTINUE;
-        }
-    }
-    else
-        return FLAC__STREAM_DECODER_READ_STATUS_ABORT; /* abort to avoid a deadlock */
+	else if(*bytes > 0) {
+		unsigned bytes_read = fread(buffer, 1, *bytes, dcd->file);
+		if(bytes_read == 0) {
+			if(feof(dcd->file))
+				return FLAC__STREAM_DECODER_READ_STATUS_END_OF_STREAM;
+			else
+				return FLAC__STREAM_DECODER_READ_STATUS_CONTINUE;
+		}
+		else {
+			*bytes = bytes_read;
+			return FLAC__STREAM_DECODER_READ_STATUS_CONTINUE;
+		}
+	}
+	else
+		return FLAC__STREAM_DECODER_READ_STATUS_ABORT; /* abort to avoid a deadlock */
 }
 
 static FLAC__StreamDecoderWriteStatus stream_decoder_write_callback_(const OggFLAC__StreamDecoder *decoder, const FLAC__Frame *frame, const FLAC__int32 * const buffer[], void *client_data)
@@ -217,13 +217,13 @@ static FLAC__StreamDecoderWriteStatus stream_decoder_write_callback_(const OggFL
 	if(dcd->error_occurred)
 		return FLAC__STREAM_DECODER_WRITE_STATUS_ABORT;
 
-    if(
-        (frame->header.number_type == FLAC__FRAME_NUMBER_TYPE_FRAME_NUMBER && frame->header.number.frame_number == 0) ||
-        (frame->header.number_type == FLAC__FRAME_NUMBER_TYPE_SAMPLE_NUMBER && frame->header.number.sample_number == 0)
-    ) {
-        printf("content... ");
-        fflush(stdout);
-    }
+	if(
+		(frame->header.number_type == FLAC__FRAME_NUMBER_TYPE_FRAME_NUMBER && frame->header.number.frame_number == 0) ||
+		(frame->header.number_type == FLAC__FRAME_NUMBER_TYPE_SAMPLE_NUMBER && frame->header.number.sample_number == 0)
+	) {
+		printf("content... ");
+		fflush(stdout);
+	}
 
 	return FLAC__STREAM_DECODER_WRITE_STATUS_CONTINUE;
 }
diff --git a/src/test_libOggFLAC/encoders.c b/src/test_libOggFLAC/encoders.c
index 547c870a..85728293 100644
--- a/src/test_libOggFLAC/encoders.c
+++ b/src/test_libOggFLAC/encoders.c
@@ -72,27 +72,27 @@ static void init_metadata_blocks_()
 	*/
 
 	/* min/max_framesize and md5sum don't get written at first, so we have to leave them 0 */
-    streaminfo_.is_last = false;
-    streaminfo_.type = FLAC__METADATA_TYPE_STREAMINFO;
-    streaminfo_.length = FLAC__STREAM_METADATA_STREAMINFO_LENGTH;
-    streaminfo_.data.stream_info.min_blocksize = 576;
-    streaminfo_.data.stream_info.max_blocksize = 576;
-    streaminfo_.data.stream_info.min_framesize = 0;
-    streaminfo_.data.stream_info.max_framesize = 0;
-    streaminfo_.data.stream_info.sample_rate = 44100;
-    streaminfo_.data.stream_info.channels = 1;
-    streaminfo_.data.stream_info.bits_per_sample = 8;
-    streaminfo_.data.stream_info.total_samples = 0;
+	streaminfo_.is_last = false;
+	streaminfo_.type = FLAC__METADATA_TYPE_STREAMINFO;
+	streaminfo_.length = FLAC__STREAM_METADATA_STREAMINFO_LENGTH;
+	streaminfo_.data.stream_info.min_blocksize = 576;
+	streaminfo_.data.stream_info.max_blocksize = 576;
+	streaminfo_.data.stream_info.min_framesize = 0;
+	streaminfo_.data.stream_info.max_framesize = 0;
+	streaminfo_.data.stream_info.sample_rate = 44100;
+	streaminfo_.data.stream_info.channels = 1;
+	streaminfo_.data.stream_info.bits_per_sample = 8;
+	streaminfo_.data.stream_info.total_samples = 0;
 	memset(streaminfo_.data.stream_info.md5sum, 0, 16);
 
-    padding_.is_last = false;
-    padding_.type = FLAC__METADATA_TYPE_PADDING;
-    padding_.length = 1234;
+	padding_.is_last = false;
+	padding_.type = FLAC__METADATA_TYPE_PADDING;
+	padding_.length = 1234;
 
-    seektable_.is_last = false;
-    seektable_.type = FLAC__METADATA_TYPE_SEEKTABLE;
+	seektable_.is_last = false;
+	seektable_.type = FLAC__METADATA_TYPE_SEEKTABLE;
 	seektable_.data.seek_table.num_points = 2;
-    seektable_.length = seektable_.data.seek_table.num_points * FLAC__STREAM_METADATA_SEEKPOINT_LENGTH;
+	seektable_.length = seektable_.data.seek_table.num_points * FLAC__STREAM_METADATA_SEEKPOINT_LENGTH;
 	seektable_.data.seek_table.points = malloc_or_die_(seektable_.data.seek_table.num_points * sizeof(FLAC__StreamMetadata_SeekPoint));
 	seektable_.data.seek_table.points[0].sample_number = 0;
 	seektable_.data.seek_table.points[0].stream_offset = 0;
@@ -101,22 +101,22 @@ static void init_metadata_blocks_()
 	seektable_.data.seek_table.points[1].stream_offset = 1000;
 	seektable_.data.seek_table.points[1].frame_samples = streaminfo_.data.stream_info.min_blocksize;
 
-    application1_.is_last = false;
-    application1_.type = FLAC__METADATA_TYPE_APPLICATION;
-    application1_.length = 8;
+	application1_.is_last = false;
+	application1_.type = FLAC__METADATA_TYPE_APPLICATION;
+	application1_.length = 8;
 	memcpy(application1_.data.application.id, "\xfe\xdc\xba\x98", 4);
 	application1_.data.application.data = malloc_or_die_(4);
 	memcpy(application1_.data.application.data, "\xf0\xe1\xd2\xc3", 4);
 
-    application2_.is_last = false;
-    application2_.type = FLAC__METADATA_TYPE_APPLICATION;
-    application2_.length = 4;
+	application2_.is_last = false;
+	application2_.type = FLAC__METADATA_TYPE_APPLICATION;
+	application2_.length = 4;
 	memcpy(application2_.data.application.id, "\x76\x54\x32\x10", 4);
 	application2_.data.application.data = 0;
 
-    vorbiscomment_.is_last = true;
-    vorbiscomment_.type = FLAC__METADATA_TYPE_VORBIS_COMMENT;
-    vorbiscomment_.length = (4 + 8) + 4 + (4 + 5) + (4 + 0);
+	vorbiscomment_.is_last = true;
+	vorbiscomment_.type = FLAC__METADATA_TYPE_VORBIS_COMMENT;
+	vorbiscomment_.length = (4 + 8) + 4 + (4 + 5) + (4 + 0);
 	vorbiscomment_.data.vorbis_comment.vendor_string.length = 8;
 	vorbiscomment_.data.vorbis_comment.vendor_string.entry = malloc_or_die_(8);
 	memcpy(vorbiscomment_.data.vorbis_comment.vendor_string.entry, "flac 1.x", 8);
diff --git a/src/test_libOggFLAC/metadata_utils.c b/src/test_libOggFLAC/metadata_utils.c
index c6367bb3..2eebfe8f 100644
--- a/src/test_libOggFLAC/metadata_utils.c
+++ b/src/test_libOggFLAC/metadata_utils.c
@@ -31,35 +31,35 @@ FLAC__bool compare_block_data_streaminfo_(const FLAC__StreamMetadata_StreamInfo
 	if(blockcopy->min_blocksize != block->min_blocksize) {
 		printf("FAILED, min_blocksize mismatch, expected %u, got %u\n", block->min_blocksize, blockcopy->min_blocksize);
 		return false;
-    }
+	}
 	if(blockcopy->max_blocksize != block->max_blocksize) {
 		printf("FAILED, max_blocksize mismatch, expected %u, got %u\n", block->max_blocksize, blockcopy->max_blocksize);
 		return false;
-    }
+	}
 	if(blockcopy->min_framesize != block->min_framesize) {
 		printf("FAILED, min_framesize mismatch, expected %u, got %u\n", block->min_framesize, blockcopy->min_framesize);
 		return false;
-    }
+	}
 	if(blockcopy->max_framesize != block->max_framesize) {
 		printf("FAILED, max_framesize mismatch, expected %u, got %u\n", block->max_framesize, blockcopy->max_framesize);
 		return false;
-    }
+	}
 	if(blockcopy->sample_rate != block->sample_rate) {
 		printf("FAILED, sample_rate mismatch, expected %u, got %u\n", block->sample_rate, blockcopy->sample_rate);
 		return false;
-    }
+	}
 	if(blockcopy->channels != block->channels) {
 		printf("FAILED, channels mismatch, expected %u, got %u\n", block->channels, blockcopy->channels);
 		return false;
-    }
+	}
 	if(blockcopy->bits_per_sample != block->bits_per_sample) {
 		printf("FAILED, bits_per_sample mismatch, expected %u, got %u\n", block->bits_per_sample, blockcopy->bits_per_sample);
 		return false;
-    }
+	}
 	if(blockcopy->total_samples != block->total_samples) {
 		printf("FAILED, total_samples mismatch, expected %llu, got %llu\n", block->total_samples, blockcopy->total_samples);
 		return false;
-    }
+	}
 	if(0 != memcmp(blockcopy->md5sum, block->md5sum, sizeof(block->md5sum))) {
 		printf("FAILED, md5sum mismatch, expected %02X%02X%02X%02X%02X%02X%02X%02X%02X%02X%02X%02X%02X%02X%02X%02X, got %02X%02X%02X%02X%02X%02X%02X%02X%02X%02X%02X%02X%02X%02X%02X%02X\n",
 			(unsigned)block->md5sum[0],
@@ -96,7 +96,7 @@ FLAC__bool compare_block_data_streaminfo_(const FLAC__StreamMetadata_StreamInfo
 			(unsigned)blockcopy->md5sum[15]
 		);
 		return false;
-    }
+	}
 	return true;
 }
 
@@ -125,7 +125,7 @@ FLAC__bool compare_block_data_application_(const FLAC__StreamMetadata_Applicatio
 			(unsigned)blockcopy->id[3]
 		);
 		return false;
-    }
+	}
 	if(0 == block->data || 0 == blockcopy->data) {
 		if(block->data != blockcopy->data) {
 			printf("FAILED, data mismatch (%s's data pointer is null)\n", 0==block->data?"original":"copy");
@@ -155,7 +155,7 @@ FLAC__bool compare_block_data_seektable_(const FLAC__StreamMetadata_SeekTable *b
 	if(blockcopy->num_points != block->num_points) {
 		printf("FAILED, num_points mismatch, expected %u, got %u\n", block->num_points, blockcopy->num_points);
 		return false;
-    }
+	}
 	for(i = 0; i < block->num_points; i++) {
 		if(blockcopy->points[i].sample_number != block->points[i].sample_number) {
 			printf("FAILED, points[%u].sample_number mismatch, expected %llu, got %llu\n", i, block->points[i].sample_number, blockcopy->points[i].sample_number);
@@ -179,7 +179,7 @@ FLAC__bool compare_block_data_vorbiscomment_(const FLAC__StreamMetadata_VorbisCo
 	if(blockcopy->vendor_string.length != block->vendor_string.length) {
 		printf("FAILED, vendor_string.length mismatch, expected %u, got %u\n", block->vendor_string.length, blockcopy->vendor_string.length);
 		return false;
-    }
+	}
 	if(0 == block->vendor_string.entry || 0 == blockcopy->vendor_string.entry) {
 		if(block->vendor_string.entry != blockcopy->vendor_string.entry) {
 			printf("FAILED, vendor_string.entry mismatch\n");
@@ -189,11 +189,11 @@ FLAC__bool compare_block_data_vorbiscomment_(const FLAC__StreamMetadata_VorbisCo
 	else if(0 != memcmp(blockcopy->vendor_string.entry, block->vendor_string.entry, block->vendor_string.length)) {
 		printf("FAILED, vendor_string.entry mismatch\n");
 		return false;
-    }
+	}
 	if(blockcopy->num_comments != block->num_comments) {
 		printf("FAILED, num_comments mismatch, expected %u, got %u\n", block->num_comments, blockcopy->num_comments);
 		return false;
-    }
+	}
 	for(i = 0; i < block->num_comments; i++) {
 		if(blockcopy->comments[i].length != block->comments[i].length) {
 			printf("FAILED, comments[%u].length mismatch, expected %u, got %u\n", i, block->comments[i].length, blockcopy->comments[i].length);
@@ -220,15 +220,15 @@ FLAC__bool compare_block_(const FLAC__StreamMetadata *block, const FLAC__StreamM
 	if(blockcopy->type != block->type) {
 		printf("FAILED, type mismatch, expected %s, got %s\n", FLAC__MetadataTypeString[block->type], FLAC__MetadataTypeString[blockcopy->type]);
 		return false;
-    }
+	}
 	if(blockcopy->is_last != block->is_last) {
 		printf("FAILED, is_last mismatch, expected %u, got %u\n", (unsigned)block->is_last, (unsigned)blockcopy->is_last);
 		return false;
-    }
+	}
 	if(blockcopy->length != block->length) {
 		printf("FAILED, length mismatch, expected %u, got %u\n", block->length, blockcopy->length);
 		return false;
-    }
+	}
 	switch(block->type) {
 		case FLAC__METADATA_TYPE_STREAMINFO:
 			return compare_block_data_streaminfo_(&block->data.stream_info, &blockcopy->data.stream_info);
diff --git a/strip_fPIC.sh b/strip_fPIC.sh
index 6edacd2d..fdf7de6b 100755
--- a/strip_fPIC.sh
+++ b/strip_fPIC.sh
@@ -4,12 +4,12 @@
 # This isn't always true (for example, nasm can't handle it)
 command=""
 while [ $1 ]; do
-    if [ "$1" != "-fPIC" ]; then
-        if [ "$1" != "-DPIC" ]; then
-            command="$command $1"
-        fi
-    fi
-    shift
+	if [ "$1" != "-fPIC" ]; then
+		if [ "$1" != "-DPIC" ]; then
+			command="$command $1"
+		fi
+	fi
+	shift
 done
 echo $command
 exec $command