dragonleo/NSIS
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Reorganized code

Browse source 
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@2639 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
icemank 2003-06-13 03:48:29 +00:00
parent 6d246677db
commit 6a63c810be
1 changed files with 12 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

22
Source/script.cpp
View file

@ -44,7 +44,10 @@ char *CEXEBuild::set_file_predefine(char *filename)
void CEXEBuild::restore_file_predefine(char *oldfilename) void CEXEBuild::restore_file_predefine(char *oldfilename)
{ {
definedlist.del("__FILE__"); definedlist.del("__FILE__");
if(oldfilename) definedlist.add("__FILE__",oldfilename); if(oldfilename) {
definedlist.add("__FILE__",oldfilename);
free(oldfilename);
}
} }
char *CEXEBuild::set_timestamp_predefine(char *filename) char *CEXEBuild::set_timestamp_predefine(char *filename)
@ -82,7 +85,10 @@ char *CEXEBuild::set_timestamp_predefine(char *filename)
void CEXEBuild::restore_timestamp_predefine(char *oldtimestamp) void CEXEBuild::restore_timestamp_predefine(char *oldtimestamp)
{ {
definedlist.del("__TIMESTAMP__"); definedlist.del("__TIMESTAMP__");
if(oldtimestamp) definedlist.add("__TIMESTAMP__",oldtimestamp); if(oldtimestamp) {
definedlist.add("__TIMESTAMP__",oldtimestamp);
free(oldtimestamp);
}
} }
char *CEXEBuild::set_line_predefine(int linecnt) char *CEXEBuild::set_line_predefine(int linecnt)
@ -103,7 +109,10 @@ char *CEXEBuild::set_line_predefine(int linecnt)
void CEXEBuild::restore_line_predefine(char *oldline) void CEXEBuild::restore_line_predefine(char *oldline)
{ {
definedlist.del("__LINE__"); definedlist.del("__LINE__");
if(oldline) definedlist.add("__LINE__",oldline); if(oldline) {
definedlist.add("__LINE__",oldline);
free(oldline);
}
} }
#endif #endif
@ -130,9 +139,7 @@ int CEXEBuild::process_script(FILE *filepointer, char *filename)
#ifdef NSIS_SUPPORT_STANDARD_PREDEFINES #ifdef NSIS_SUPPORT_STANDARD_PREDEFINES
// Added by Sunil Kamath 11 June 2003 // Added by Sunil Kamath 11 June 2003
restore_file_predefine(oldfilename); restore_file_predefine(oldfilename);
if (oldfilename) free(oldfilename);
restore_timestamp_predefine(oldtimestamp); restore_timestamp_predefine(oldtimestamp);
if (oldtimestamp) free(oldtimestamp);
#endif #endif
fp = 0; fp = 0;
@ -483,12 +490,9 @@ int CEXEBuild::process_oneline(char *line, char *filename, int linenum)
if(!is_commandline) { // Don't set the predefines for command line /X option if(!is_commandline) { // Don't set the predefines for command line /X option
if(!is_macro) { if(!is_macro) {
restore_file_predefine(oldfilename); restore_file_predefine(oldfilename);
if (oldfilename) free(oldfilename);
restore_timestamp_predefine(oldtimestamp); restore_timestamp_predefine(oldtimestamp);
if (oldtimestamp) free(oldtimestamp);
} }
restore_line_predefine(oldline); restore_line_predefine(oldline);
if (oldline) free(oldline);
} }
#endif #endif
@ -2265,9 +2269,7 @@ int CEXEBuild::doCommand(int which_token, LineParser &line)
#ifdef NSIS_SUPPORT_STANDARD_PREDEFINES #ifdef NSIS_SUPPORT_STANDARD_PREDEFINES
// Added by Sunil Kamath 11 June 2003 // Added by Sunil Kamath 11 June 2003
restore_file_predefine(oldfilename); restore_file_predefine(oldfilename);
if (oldfilename) free(oldfilename);
restore_timestamp_predefine(oldtimestamp); restore_timestamp_predefine(oldtimestamp);
if (oldtimestamp) free(oldtimestamp);
#endif #endif