src/(aiff|caf|wav).c : Improve debug output when marker == 0.

3 files changed, 9 insertions, 6 deletions

diff --git a/src/aiff.c b/src/aiff.c
index 6294906..88716ee 100644
--- a/src/aiff.c
+++ b/src/aiff.c
@@ -417,7 +417,8 @@ aiff_read_header (SF_PRIVATE *psf, COMM_CHUNK *comm_fmt)
 		marker = chunk_size = 0 ;
 		psf_binheader_readf (psf, "Ejm4", jump, &marker, &chunk_size) ;
 		if (marker == 0)
-		{	psf_log_printf (psf, "Have 0 marker.\n") ;
+		{	sf_count_t pos = psf_ftell (psf) ;
+			psf_log_printf (psf, "Have 0 marker at position %D (0x%x).\n", pos, pos) ;
 			break ;
 			} ;
 
diff --git a/src/caf.c b/src/caf.c
index 3f80c6f..948cda6 100644
--- a/src/caf.c
+++ b/src/caf.c
@@ -1,5 +1,5 @@
 /*
-** Copyright (C) 2005-2014 Erik de Castro Lopo <erikd@mega-nerd.com>
+** Copyright (C) 2005-2015 Erik de Castro Lopo <erikd@mega-nerd.com>
 **
 ** This program is free software; you can redistribute it and/or modify
 ** it under the terms of the GNU Lesser General Public License as published by
@@ -382,13 +382,14 @@ caf_read_header (SF_PRIVATE *psf)
 
 	psf->sf.channels = desc.channels_per_frame ;
 
-	while (psf_ftell (psf) < psf->filelength)
+	while (1)
 	{	marker = 0 ;
 		chunk_size = 0 ;
 
 		psf_binheader_readf (psf, "mE8", &marker, &chunk_size) ;
 		if (marker == 0)
-		{	psf_log_printf (psf, "Have 0 marker.\n") ;
+		{	sf_count_t pos = psf_ftell (psf) ;
+			psf_log_printf (psf, "Have 0 marker at position %D (0x%x).\n", pos, pos) ;
 			break ;
 			} ;
 
diff --git a/src/wav.c b/src/wav.c
index a798e0c..4d6ca25 100644
--- a/src/wav.c
+++ b/src/wav.c
@@ -1,5 +1,5 @@
 /*
-** Copyright (C) 1999-2014 Erik de Castro Lopo <erikd@mega-nerd.com>
+** Copyright (C) 1999-2015 Erik de Castro Lopo <erikd@mega-nerd.com>
 ** Copyright (C) 2004-2005 David Viens <davidv@plogue.com>
 **
 ** This program is free software; you can redistribute it and/or modify
@@ -355,7 +355,8 @@ wav_read_header	(SF_PRIVATE *psf, int *blockalign, int *framesperblock)
 		marker = chunk_size = 0 ;
 		psf_binheader_readf (psf, "jm4", jump, &marker, &chunk_size) ;
 		if (marker == 0)
-		{	psf_log_printf (psf, "Have 0 marker.\n") ;
+		{	sf_count_t pos = psf_ftell (psf) ;
+			psf_log_printf (psf, "Have 0 marker at position %D (0x%x).\n", pos, pos) ;
 			break ;
 			} ;