improve error output in binary file

shogun-toolbox · Aug 30, 2011 · 6f9f139 · 6f9f139
1 parent dc68e4f
commit 6f9f139
Showing 1 changed file with 14 additions and 7 deletions.
diff --git a/src/shogun/io/BinaryFile.cpp b/src/shogun/io/BinaryFile.cpp
@@ -380,19 +380,26 @@ void
 CBinaryFile::read_header(TSGDataType* dest)
 {
 	ASSERT(file);
+	ASSERT(dest);
+
+	if (fseek(file, 0L, SEEK_SET)!=0)
+		SG_ERROR("Error seeking file '%s' to the beginning.\n", filename);
 
 	char fourcc[4];
 	uint16_t endian=0;
 
-	if (!((fread(&fourcc, sizeof(char), 4, file)==4) &&
-			(fread(&endian, sizeof(uint16_t), 1, file)== 1) &&
-			(fread(&dest->m_ctype, sizeof(dest->m_ctype), 1, file)== 1)
-		  && (fread(&dest->m_ptype, sizeof(dest->m_ptype), 1, file)== 1)
-			))
-		SG_ERROR("Error reading header\n");
+	if (fread(&fourcc, sizeof(char), 4, file)!=4)
+		SG_ERROR("Error reading fourcc header in file '%s'\n", filename);
+
+	if (fread(&endian, sizeof(uint16_t), 1, file)!=1)
+		SG_ERROR("Error reading endian header in file '%s'\n", filename);
+
+	if ((fread(&dest->m_ctype, sizeof(dest->m_ctype), 1, file)!=1) ||
+			(fread(&dest->m_ptype, sizeof(dest->m_ptype), 1, file)!=1))
+		SG_ERROR("Error reading datatype header in file '%s'\n", filename);
 
 	if (strncmp(fourcc, "SG01", 4))
-		SG_ERROR("Header mismatch, expected SG01\n");
+		SG_ERROR("Header mismatch, expected SG01 in file '%s'\n", filename);
 }
 
 void