Added function to check heading match in file in CycleStorage

include/Storages.h

@@ -192,6 +192,9 @@ class CycleStorage
 		inline int getSize(){ return size; }
 		inline int getInfSize(){ return inf_size; }
 		inline int getFullSize(){ return full_size; }
+
+		bool checkAttr(int inf_sz, int inf_count, int seek);
+
 	protected:
 		FILE *file;
 		int inf_size;

src/Various/CycleStorage.cc

@@ -138,6 +138,26 @@ bool CycleStorage::findHead()
 	return true;
 }
 
+/*!      */
+bool CycleStorage::checkAttr(int inf_sz, int inf_count, int seek)
+{
+	if( file==NULL ) return false;
+	fseek(file,seek,0);
+
+	/*!   */
+	CycleStorageAttr csa;
+	fread(&csa, sizeof(csa), 1, file);
+
+	/*!        */
+	if( ( csa.size!=inf_count ) || ( csa.inf_size!=inf_sz ) || ( csa.seekpos!=seek ) )
+	{
+		fclose(file);
+		file=NULL;
+		return false;
+	}
+	return true;
+}
+
 bool CycleStorage::open(const char* name, int byte_sz, int inf_sz, int inf_count, int seek)
 {
 	/*! 	        ,     
@@ -155,17 +175,9 @@ bool CycleStorage::open(const char* name, int byte_sz, int inf_sz, int inf_count
 		return false;
 	}
 
-	/*!   */
-	CycleStorageAttr csa;
-	fread(&csa, sizeof(csa), 1, file);
-
-	/*!        */
-	if( ( csa.size!=inf_count ) || ( csa.inf_size!=inf_sz ) || ( csa.seekpos!=seek ) )
-	{
-		fclose(file);
-		file=NULL;
+	if( !checkAttr(inf_sz, inf_count, seek) )
 		return false;
-	}
+
 	inf_size=inf_sz;
 	full_size=sizeof(CycleStorageElem)+inf_size;
 	size=inf_count;

src/Various/TableBlockStorage.cc

@@ -115,7 +115,7 @@ bool TableBlockStorage::copyToNextBlock(void)
 	return true;
 }
 
-/*!      */
+/*!      */
 bool TableBlockStorage::checkAttr( int key_sz, int inf_sz, int inf_count, int block_num, int block_lim, int seek )
 {
 	if( file==NULL ) return false;