Subversion Repositories spk

Rev

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

Rev 175 Rev 185
Line 6... Line 6...
6 
 
 6 
 
7 
#include <MultiSpkFile.h>
 7 
#include <MultiSpkFile.h>
8 
#include "../../HiP/HiP.h"
 8 
#include "../../HiP/HiP.h"
9 
#include <Logging/log.h>
 9 
#include <Logging/log.h>
10 
 
 10 
 
- 
 
 11 
#include "CyString.h"
11 
 
 12 
 
12 
#ifdef _DEBUG
 13 
#ifdef _DEBUG
13 
#define CLEANUP fclose ( id ); if ( data ) delete data; if ( uncomprData ) delete uncomprData; if ( !removeFile.Empty() ) remove ( removeFile.c_str() ); char pause; printf ( "Press Enter to Close\n" ); scanf ( "%c", &pause );
 14 
#define CLEANUP fclose ( id ); if ( data ) delete data; if ( uncomprData ) delete uncomprData; if ( !removeFile.Empty() ) remove ( removeFile.c_str() ); char pause; printf ( "Press Enter to Close\n" ); scanf ( "%c", &pause );
14 
#else
 15 
#else
15 
#define CLEANUP fclose ( id ); if ( data ) delete data; if ( uncomprData ) delete uncomprData; if ( !removeFile.Empty() ) remove ( removeFile.c_str() );
16 
#define CLEANUP fclose ( id ); if ( data ) delete data; if ( uncomprData ) delete uncomprData; if ( !removeFile.Empty() ) remove ( removeFile.c_str() );
16 
#endif
 17 
#endif
17 
 
 18 
 
18 
char *ReadNextLine ( char *data, long *len, CyString *str )
 19 
char *ReadNextLine ( char *data, long *len, Utils::String *str )
19 
{
 20 
{
20 
	int pos = 0;
 21 
	int pos = 0;
21 
	bool end = false;
 22 
	bool end = false;
22 
	while ( pos < *len )
 23 
	while ( pos < *len )
23 
	{
 24 
	{
Line 44... Line 45...
44 
	*len -= (pos + 1);
 45 
	*len -= (pos + 1);
45 
 
 46 
 
46 
	return data + (pos + 1);
 47 
	return data + (pos + 1);
47 
}
 48 
}
48 
 
 49 
 
49 
char *LineByLineRead ( char *data, long *len, CyString end, CyString *readData )
 50 
char *LineByLineRead ( char *data, long *len, const Utils::String &end, CyString *readData )
50 
{
 51 
{
51 
	CyString line;
 52 
	Utils::String line;
52 
	while ( true )
 53 
	while ( true )
53 
	{
 54 
	{
54 
		data = ReadNextLine ( data, len, &line );
 55 
		data = ReadNextLine ( data, len, &line );
55 
 
 56 
 
56 
		if ( line == end )
 57 
		if ( line == end )