WebSVN – spk – Diff – /libspk/src/BaseFile.cpp



##########################################################################################
##################                Base Class Functions                  ##################
##########################################################################################
*/
 
CLinkList<C_File> *CBaseFile::fileList(int type) const
{
	CLinkList<C_File> *list = new CLinkList<C_File>;
	for ( CListNode<C_File> *node = m_lFiles.Front(); node; node = node->next() )
	{
		C_File *f = node->Data();

			doneLen = uncomprLen;
			delete uncompr;
		}
		catch (std::exception &e) {
			CLog::logf(CLog::Log_IO, 2, "CBaseFile::_read_Header() unable to malloc [uncompr], %d (%s)", uncomprLen, e.what());
			delete []readData;
			return -1;
		}
	}
	else if ( m_SHeader.iValueCompression == SPKCOMPRESS_7ZIP ) {
		long len = uncomprLen;

	}
	// no compression
	else
		ReadValues ( CyString ((char *)readData) );
 
	delete []readData;
 
	return doneLen;
}
 
int CBaseFile::_read_FileHeader(std::fstream &stream, int iReadType, int iMaxProgress, int iDoneLen, CProgressInfo *pProgress)

			if ( err == Z_OK ) ReadFiles ( CyString ((char *)uncompr) );
			delete uncompr;
		}
		catch (std::exception &e) {
			CLog::logf(CLog::Log_IO, 2, "CBaseFile::_read_FileHeader() unable to malloc [uncompr], %d (%s)", uncomprLen, e.what());
			delete []readData;
			return -1;
		}
 
	}
	else if ( m_SHeader.iValueCompression == SPKCOMPRESS_7ZIP )

		if ( compr ) ReadFiles ( CyString ((char *)compr) );
	}
	else
		ReadFiles ( CyString ((char *)readData) );
 
	delete []readData;
	return true;
}
 
bool CBaseFile::readFile(std::fstream &stream, int readtype, CProgressInfo *progress)
{

Rev 52	Rev 53
Line 94...	Line 94...
94	`##########################################################################################`	94	`##########################################################################################`
95	`################## Base Class Functions ##################`	95	`################## Base Class Functions ##################`
96	`##########################################################################################`	96	`##########################################################################################`
97	`*/`	97	`*/`
98		98
99	`CLinkList<C_File> *CBaseFile::GetFileList(int type)`	99	`CLinkList<C_File> *CBaseFile::fileList(int type) const`
100	`{`	100	`{`
101	`CLinkList<C_File> *list = new CLinkList<C_File>;`	101	`CLinkList<C_File> *list = new CLinkList<C_File>;`
102	`for ( CListNode<C_File> *node = m_lFiles.Front(); node; node = node->next() )`	102	`for ( CListNode<C_File> *node = m_lFiles.Front(); node; node = node->next() )`
103	`{`	103	`{`
104	`C_File *f = node->Data();`	104	`C_File *f = node->Data();`
Line 1615...	Line 1615...
1615	`doneLen = uncomprLen;`	1615	`doneLen = uncomprLen;`
1616	`delete uncompr;`	1616	`delete uncompr;`
1617	`}`	1617	`}`
1618	`catch (std::exception &e) {`	1618	`catch (std::exception &e) {`
1619	`CLog::logf(CLog::Log_IO, 2, "CBaseFile::_read_Header() unable to malloc [uncompr], %d (%s)", uncomprLen, e.what());`	1619	`CLog::logf(CLog::Log_IO, 2, "CBaseFile::_read_Header() unable to malloc [uncompr], %d (%s)", uncomprLen, e.what());`
-		1620	`delete []readData;`
1620	`return -1;`	1621	`return -1;`
1621	`}`	1622	`}`
1622	`}`	1623	`}`
1623	`else if ( m_SHeader.iValueCompression == SPKCOMPRESS_7ZIP ) {`	1624	`else if ( m_SHeader.iValueCompression == SPKCOMPRESS_7ZIP ) {`
1624	`long len = uncomprLen;`	1625	`long len = uncomprLen;`
Line 1630...	Line 1631...
1630	`}`	1631	`}`
1631	`// no compression`	1632	`// no compression`
1632	`else`	1633	`else`
1633	`ReadValues ( CyString ((char *)readData) );`	1634	`ReadValues ( CyString ((char *)readData) );`
1634		1635
1635	`delete readData;`	1636	`delete []readData;`
1636		1637
1637	`return doneLen;`	1638	`return doneLen;`
1638	`}`	1639	`}`
1639		1640
1640	`int CBaseFile::_read_FileHeader(std::fstream &stream, int iReadType, int iMaxProgress, int iDoneLen, CProgressInfo *pProgress)`	1641	`int CBaseFile::_read_FileHeader(std::fstream &stream, int iReadType, int iMaxProgress, int iDoneLen, CProgressInfo *pProgress)`
Line 1666...	Line 1667...
1666	`if ( err == Z_OK ) ReadFiles ( CyString ((char *)uncompr) );`	1667	`if ( err == Z_OK ) ReadFiles ( CyString ((char *)uncompr) );`
1667	`delete uncompr;`	1668	`delete uncompr;`
1668	`}`	1669	`}`
1669	`catch (std::exception &e) {`	1670	`catch (std::exception &e) {`
1670	`CLog::logf(CLog::Log_IO, 2, "CBaseFile::_read_FileHeader() unable to malloc [uncompr], %d (%s)", uncomprLen, e.what());`	1671	`CLog::logf(CLog::Log_IO, 2, "CBaseFile::_read_FileHeader() unable to malloc [uncompr], %d (%s)", uncomprLen, e.what());`
-		1672	`delete []readData;`
1671	`return -1;`	1673	`return -1;`
1672	`}`	1674	`}`
1673		1675
1674	`}`	1676	`}`
1675	`else if ( m_SHeader.iValueCompression == SPKCOMPRESS_7ZIP )`	1677	`else if ( m_SHeader.iValueCompression == SPKCOMPRESS_7ZIP )`
Line 1681...	Line 1683...
1681	`if ( compr ) ReadFiles ( CyString ((char *)compr) );`	1683	`if ( compr ) ReadFiles ( CyString ((char *)compr) );`
1682	`}`	1684	`}`
1683	`else`	1685	`else`
1684	`ReadFiles ( CyString ((char *)readData) );`	1686	`ReadFiles ( CyString ((char *)readData) );`
1685		1687
1686	`delete readData;`	1688	`delete []readData;`
1687	`return true;`	1689	`return true;`
1688	`}`	1690	`}`
1689		1691
1690	`bool CBaseFile::readFile(std::fstream &stream, int readtype, CProgressInfo *progress)`	1692	`bool CBaseFile::readFile(std::fstream &stream, int readtype, CProgressInfo *progress)`
1691	`{`	1693	`{`

Subversion Repositories spk

(root)/libspk/src/BaseFile.cpp – Rev 52 → 53