Subversion Repositories spk

Rev

Rev 50 | Rev 52 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 50 Rev 51
Line 410... Line 410...
410 
	memcpy ( m_sData, data, size );
 410 
	memcpy ( m_sData, data, size );
411 
 
 411 
 
412 
	return true;
 412 
	return true;
413 
}
 413 
}
414 
 
 414 
 
- 
 
 415 
 
- 
 
 416 
bool C_File::readFromFile(std::fstream &stream, long lSize, bool bDoSize)
- 
 
 417 
{
- 
 
 418 
	m_lDataSize = lSize;
- 
 
 419 
	try {
- 
 
 420 
		m_sData = new unsigned char[m_lDataSize];
- 
 
 421 
	}
- 
 
 422 
	catch(std::exception &e) {
- 
 
 423 
		CLog::logf(CLog::Log_IO, 2, "C_File::readFromFile() unable to malloc, %d (%s)", lSize, e.what());
- 
 
 424 
		return false;
- 
 
 425 
	}
- 
 
 426 
 
- 
 
 427 
	if ( bDoSize ) {
- 
 
 428 
		unsigned char s[4];
- 
 
 429 
		stream.read((char *)s, 4);
- 
 
 430 
	}
- 
 
 431 
 
- 
 
 432 
	try {
- 
 
 433 
		stream.read((char *)m_sData, m_lDataSize);
- 
 
 434 
	}
- 
 
 435 
	catch(std::exception &e) {
- 
 
 436 
		CLog::logf(CLog::Log_IO, 2, "C_File::readFromFile() unable to read from file, %d (%s)", lSize, e.what());
- 
 
 437 
		DeleteData ();
- 
 
 438 
		m_lDataSize = 0;
- 
 
 439 
		return false;
- 
 
 440 
	}
- 
 
 441 
	return true;
- 
 
 442 
}
415 
 
 443 
 
416 
/*
 444 
/*
417 
	Func:	ReadFromFile
 445 
	Func:	ReadFromFile
418 
	Accept:	id		- File Pointer Stream of open file
 446 
	Accept:	id		- File Pointer Stream of open file
419 
			size	- amount of data to read from file
 447 
			size	- amount of data to read from file