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

Tabs to spaces and minor cleanup

Browse source 
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6514 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
anders_k 2014-07-05 11:55:28 +00:00
parent 41fd62105e
commit edd80964a7
15 changed files with 317 additions and 326 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Source/build.h
View file

@ -203,7 +203,7 @@ class CEXEBuild {
int parseScript(); int parseScript();
int includeScript(const TCHAR *f, NStreamEncoding&enc); int includeScript(const TCHAR *f, NStreamEncoding&enc);
TCHAR* GetMacro(const TCHAR *macroname, TCHAR**macroend = 0); TCHAR* GetMacro(const TCHAR *macroname, TCHAR**macroend = 0);
inline bool MacroExists(const TCHAR *macroname); bool MacroExists(const TCHAR *macroname) { return !!GetMacro(macroname); }
int LoadLicenseFile(const TCHAR *file, TCHAR** pdata, const TCHAR *cmdname, WORD AnsiCP); int LoadLicenseFile(const TCHAR *file, TCHAR** pdata, const TCHAR *cmdname, WORD AnsiCP);
#ifdef NSIS_FIX_DEFINES_IN_STRINGS #ifdef NSIS_FIX_DEFINES_IN_STRINGS
void ps_addtoline(const TCHAR *str, GrowBuf &linedata, StringList &hist, bool bIgnoreDefines = false); void ps_addtoline(const TCHAR *str, GrowBuf &linedata, StringList &hist, bool bIgnoreDefines = false);
@ -470,8 +470,6 @@ class CEXEBuild {
const TCHAR* m_currentmacroname; const TCHAR* m_currentmacroname;
GrowBuf m_macros; GrowBuf m_macros;
StringList m_macro_entry;
UINT64 db_opt_save, db_opt_save_u, db_full_size, db_full_size_u; UINT64 db_opt_save, db_opt_save_u, db_full_size, db_full_size_u;
int db_comp_save, db_comp_save_u; int db_comp_save, db_comp_save_u;

5
Source/lang.h
View file

@ -312,10 +312,7 @@ struct NLF {
unsigned int m_uCodePage; /* Code page associated with language. When unsigned int m_uCodePage; /* Code page associated with language. When
* using Unicode, this value will be 1200. * using Unicode, this value will be 1200.
*/ */
bool m_bRTL; /* Is this a right-to-left language like Hebrew? */
bool m_bRTL; /* Is this a right-to-left language like
Hebrew? */
TCHAR *m_szStrings[NLF_STRINGS]; TCHAR *m_szStrings[NLF_STRINGS];
}; };

4
Source/script.cpp
View file

@ -952,10 +952,6 @@ TCHAR* CEXEBuild::GetMacro(const TCHAR *macroname, TCHAR**macroend /*= 0*/)
} }
return 0; return 0;
} }
inline bool CEXEBuild::MacroExists(const TCHAR *macroname)
{
return !!GetMacro(macroname);
}
int CEXEBuild::LoadLicenseFile(const TCHAR *file, TCHAR** pdata, const TCHAR *cmdname, WORD AnsiCP) // caller must free *pdata, even on error result int CEXEBuild::LoadLicenseFile(const TCHAR *file, TCHAR** pdata, const TCHAR *cmdname, WORD AnsiCP) // caller must free *pdata, even on error result
{ {

2
Source/strlist.h
View file

@ -58,7 +58,7 @@ public:
int add(const TCHAR *str, int case_sensitive); int add(const TCHAR *str, int case_sensitive);
/** /**
* Search the StrinList for a string. If the string already exists in the * Search the StringList for a string. If the string already exists in the
* list then it returns the index of the found string. Returns -1 on * list then it returns the index of the found string. Returns -1 on
* failure. * failure.
* *