12 files changed, 23 insertions, 25 deletions
diff --git a/src/inputPlugins/_flac_common.c b/src/inputPlugins/_flac_common.c
index ddfc0b525..acf582709 100644
--- a/src/inputPlugins/_flac_common.c
+++ b/src/inputPlugins/_flac_common.c
@@ -208,4 +208,4 @@ void flac_error_common_cb(const char *plugin,
 	}
 }
 
-#endif				/* HAVE_FLAC || HAVE_OGGFLAC */
+#endif /* HAVE_FLAC || HAVE_OGGFLAC */
diff --git a/src/inputPlugins/_flac_common.h b/src/inputPlugins/_flac_common.h
index b20b32e02..6143cbfe7 100644
--- a/src/inputPlugins/_flac_common.h
+++ b/src/inputPlugins/_flac_common.h
@@ -73,6 +73,6 @@ static inline int flacSendChunk(FlacData * data)
 	return 0;
 }
 
-#endif				/* HAVE_FLAC || HAVE_OGGFLAC */
+#endif /* HAVE_FLAC || HAVE_OGGFLAC */
 
-#endif				/* _FLAC_COMMON_H */
+#endif /* _FLAC_COMMON_H */
diff --git a/src/inputPlugins/_ogg_common.c b/src/inputPlugins/_ogg_common.c
index 62a147972..8abdc33bc 100644
--- a/src/inputPlugins/_ogg_common.c
+++ b/src/inputPlugins/_ogg_common.c
@@ -70,4 +70,4 @@ ogg_stream_type ogg_stream_type_detect(InputStream * inStream)
 	return VORBIS;
 }
 
-#endif				/* defined(HAVE_OGGFLAC || defined(HAVE_OGGVORBIS) */
+#endif /* defined(HAVE_OGGFLAC || defined(HAVE_OGGVORBIS) */
diff --git a/src/inputPlugins/_ogg_common.h b/src/inputPlugins/_ogg_common.h
index 147ba9fa6..aebb75128 100644
--- a/src/inputPlugins/_ogg_common.h
+++ b/src/inputPlugins/_ogg_common.h
@@ -30,6 +30,6 @@ typedef enum _ogg_stream_type { VORBIS, FLAC } ogg_stream_type;
 
 ogg_stream_type ogg_stream_type_detect(InputStream * inStream);
 
-#endif				/* defined(HAVE_OGGFLAC || defined(HAVE_OGGVORBIS) */
+#endif /* defined(HAVE_OGGFLAC || defined(HAVE_OGGVORBIS) */
 
-#endif				/* _OGG_COMMON_H */
+#endif /* _OGG_COMMON_H */
diff --git a/src/inputPlugins/aac_plugin.c b/src/inputPlugins/aac_plugin.c
index b7d2e2521..c24254b54 100644
--- a/src/inputPlugins/aac_plugin.c
+++ b/src/inputPlugins/aac_plugin.c
@@ -482,4 +482,4 @@ InputPlugin aacPlugin = {
 	NULL,
 };
 
-#endif				/* HAVE_FAAD */
+#endif /* HAVE_FAAD */
diff --git a/src/inputPlugins/audiofile_plugin.c b/src/inputPlugins/audiofile_plugin.c
index 19038bbab..adec604ae 100644
--- a/src/inputPlugins/audiofile_plugin.c
+++ b/src/inputPlugins/audiofile_plugin.c
@@ -194,4 +194,4 @@ InputPlugin audiofilePlugin = {
 	NULL
 };
 
-#endif				/* HAVE_AUDIOFILE */
+#endif /* HAVE_AUDIOFILE */
diff --git a/src/inputPlugins/flac_plugin.c b/src/inputPlugins/flac_plugin.c
index 737cdbcd4..342cc38c3 100644
--- a/src/inputPlugins/flac_plugin.c
+++ b/src/inputPlugins/flac_plugin.c
@@ -454,7 +454,7 @@ InputPlugin flacPlugin = {
 	flac_mime_types
 };
 
-#else				/* !HAVE_FLAC */
+#else /* !HAVE_FLAC */
 
 InputPlugin flacPlugin = {
 	NULL,
@@ -469,4 +469,4 @@ InputPlugin flacPlugin = {
 	NULL,
 };
 
-#endif				/* HAVE_FLAC */
+#endif /* HAVE_FLAC */
diff --git a/src/inputPlugins/mod_plugin.c b/src/inputPlugins/mod_plugin.c
index 7a5012554..31d7b20de 100644
--- a/src/inputPlugins/mod_plugin.c
+++ b/src/inputPlugins/mod_plugin.c
@@ -298,4 +298,4 @@ InputPlugin modPlugin = {
 	NULL
 };
 
-#endif				/* HAVE_AUDIOFILE */
+#endif /* HAVE_AUDIOFILE */
diff --git a/src/inputPlugins/mp3_plugin.c b/src/inputPlugins/mp3_plugin.c
index 442ea3acf..afe5f3280 100644
--- a/src/inputPlugins/mp3_plugin.c
+++ b/src/inputPlugins/mp3_plugin.c
@@ -225,12 +225,10 @@ static ReplayGainInfo *parseId3ReplayGainInfo(struct id3_tag *tag)
 		if (frame->nfields < 3)
 			continue;
 
-		key =
-		    (char *)
+		key = (char *)
 		    id3_ucs4_latin1duplicate(id3_field_getstring
 					     (&frame->fields[1]));
-		value =
-		    (char *)
+		value = (char *)
 		    id3_ucs4_latin1duplicate(id3_field_getstring
 					     (&frame->fields[2]));
 
@@ -440,11 +438,11 @@ enum xing_magic {
 };
 
 struct xing {
-	long flags;		/* valid fields (see below) */
+	long flags;	/* valid fields (see below) */
 	unsigned long frames;	/* total number of frames */
 	unsigned long bytes;	/* total number of bytes */
 	unsigned char toc[100];	/* 100-point seek table */
-	long scale;		/* VBR quality */
+	long scale;	/* VBR quality */
 	enum xing_magic magic;	/* header magic */
 };
 
diff --git a/src/inputPlugins/mp4_plugin.c b/src/inputPlugins/mp4_plugin.c
index e55a68e95..0a68dcc98 100644
--- a/src/inputPlugins/mp4_plugin.c
+++ b/src/inputPlugins/mp4_plugin.c
@@ -468,4 +468,4 @@ InputPlugin mp4Plugin = {
 	NULL
 };
 
-#endif				/* HAVE_FAAD */
+#endif /* HAVE_FAAD */
diff --git a/src/inputPlugins/oggflac_plugin.c b/src/inputPlugins/oggflac_plugin.c
index d1f48bf31..5ee2de7f0 100644
--- a/src/inputPlugins/oggflac_plugin.c
+++ b/src/inputPlugins/oggflac_plugin.c
@@ -251,8 +251,8 @@ static void of_metadata_decode_cb(const OggFLAC__SeekableStreamDecoder * dec,
 }
 
 static OggFLAC__SeekableStreamDecoder
-    *full_decoder_init_and_read_metadata(FlacData * data,
-					 unsigned int metadata_only)
+    * full_decoder_init_and_read_metadata(FlacData * data,
+					  unsigned int metadata_only)
 {
 	OggFLAC__SeekableStreamDecoder *decoder = NULL;
 	unsigned int s = 1;
@@ -416,7 +416,7 @@ InputPlugin oggflacPlugin = {
 	oggflac_mime_types
 };
 
-#else				/* !HAVE_FLAC */
+#else /* !HAVE_FLAC */
 
 InputPlugin oggflacPlugin = {
 	NULL,
@@ -431,4 +431,4 @@ InputPlugin oggflacPlugin = {
 	NULL,
 };
 
-#endif				/* HAVE_OGGFLAC */
+#endif /* HAVE_OGGFLAC */
diff --git a/src/inputPlugins/oggvorbis_plugin.c b/src/inputPlugins/oggvorbis_plugin.c
index 2e186edd5..1bc7de2b3 100644
--- a/src/inputPlugins/oggvorbis_plugin.c
+++ b/src/inputPlugins/oggvorbis_plugin.c
@@ -50,7 +50,7 @@
 #define ov_time_total(VF, I) ((double)ov_time_total(VF, I)/1000)
 #define ov_time_tell(VF) ((double)ov_time_tell(VF)/1000)
 #define ov_time_seek_page(VF, S) (ov_time_seek_page(VF, (S)*1000))
-#endif				/* HAVE_TREMOR */
+#endif /* HAVE_TREMOR */
 
 #include <errno.h>
 
@@ -424,7 +424,7 @@ InputPlugin oggvorbisPlugin = {
 	oggvorbis_MimeTypes
 };
 
-#else				/* !HAVE_OGGVORBIS */
+#else /* !HAVE_OGGVORBIS */
 
 InputPlugin oggvorbisPlugin = {
 	NULL,
@@ -439,4 +439,4 @@ InputPlugin oggvorbisPlugin = {
 	NULL,
 };
 
-#endif				/* HAVE_OGGVORBIS */
+#endif /* HAVE_OGGVORBIS */