Subversion Repositories spk

Rev

Rev 226 | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 226 Rev 298
Line 5... Line 5...
5 
#endif
 5 
#endif
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 
 
 - 
 
11 
#include "CyString.h"
 - 
 
12 
 
 10 
 
13 
#ifdef _DEBUG
 11 
#ifdef _DEBUG
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 );
 12 
#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 );
15 
#else
 13 
#else
16 
#define CLEANUP fclose ( id ); if ( data ) delete data; if ( uncomprData ) delete uncomprData; if ( !removeFile.Empty() ) remove ( removeFile.c_str() );
14 
#define CLEANUP fclose ( id ); if ( data ) delete data; if ( uncomprData ) delete uncomprData; if ( !removeFile.Empty() ) remove ( removeFile.c_str() );
Line 45... Line 43...
45 
	*len -= (pos + 1);
 43 
	*len -= (pos + 1);
46 
 
 44 
 
47 
	return data + (pos + 1);
 45 
	return data + (pos + 1);
48 
}
 46 
}
49 
 
 47 
 
50 
char *LineByLineRead ( char *data, long *len, const Utils::String &end, CyString *readData )
 48 
char *LineByLineRead ( char *data, long *len, const Utils::String &end, Utils::String *readData )
51 
{
 49 
{
52 
	Utils::String line;
 50 
	Utils::String line;
53 
	while ( true )
 51 
	while ( true )
54 
	{
 52 
	{
55 
		data = ReadNextLine ( data, len, &line );
 53 
		data = ReadNextLine ( data, len, &line );
56 
 
 54 
 
57 
		if ( line == end )
 55 
		if ( line == end )
58 
			break;
 56 
			break;
59 
		*readData += (line + "\n");
 57 
		(*readData) = (*readData) + (line + "\n");
60 
	}
 58 
	}
61 
 
 59 
 
62 
	return data;
 60 
	return data;
63 
}
 61 
}
64 
 
 62 
 
Line 156... Line 154...
156 
 
 154 
 
157 
	printf ( "* Writing to %s... ", argv[2] );
 155 
	printf ( "* Writing to %s... ", argv[2] );
158 
	/*
 156 
	/*
159 
	if ( mspk )
 157 
	if ( mspk )
160 
	{
 158 
	{
161 
		if ( mspk->WriteFile ( CyString(argv[2]) ) )
 159 
		if ( mspk->WriteFile (Utils::WString(argv[2]) ) )
162 
			printf ( "(Done)\n" );
 160 
			printf ( "(Done)\n" );
163 
		else
 161 
		else
164 
			printf ( "(Error)\n" );
 162 
			printf ( "(Error)\n" );
165 
	}
 163 
	}
166 
	else
 164 
	else