Fixed 5 GCC warnings
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6502 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
parent
0c0d2d3f2f
commit
6bba242764
4 changed files with 8 additions and 5 deletions
|
@ -176,4 +176,4 @@ void __declspec(dllexport) SelectFileDialog(HWND hwndParent, int string_size, TC
|
||||||
// restore working dir
|
// restore working dir
|
||||||
// OFN_NOCHANGEDIR doesn't always work (see MSDN)
|
// OFN_NOCHANGEDIR doesn't always work (see MSDN)
|
||||||
SetCurrentDirectory(currentDirectory);
|
SetCurrentDirectory(currentDirectory);
|
||||||
}
|
}
|
||||||
|
|
|
@ -106,9 +106,9 @@ CEXEBuild::~CEXEBuild()
|
||||||
}
|
}
|
||||||
|
|
||||||
CEXEBuild::CEXEBuild(signed char pponly) :
|
CEXEBuild::CEXEBuild(signed char pponly) :
|
||||||
|
preprocessonly(pponly),
|
||||||
m_exehead(0),
|
m_exehead(0),
|
||||||
m_exehead_size(0),
|
m_exehead_size(0)
|
||||||
preprocessonly(pponly)
|
|
||||||
{
|
{
|
||||||
set_verbosity(3);
|
set_verbosity(3);
|
||||||
|
|
||||||
|
|
|
@ -3136,9 +3136,9 @@ int CEXEBuild::doCommand(int which_token, LineParser &line)
|
||||||
case TOK_P_MAKENSIS:
|
case TOK_P_MAKENSIS:
|
||||||
{
|
{
|
||||||
const TCHAR *cmdname=get_commandtoken_name(which_token);
|
const TCHAR *cmdname=get_commandtoken_name(which_token);
|
||||||
const TCHAR *exec=line.gettoken_str(1), *define;
|
const TCHAR *exec=line.gettoken_str(1), *define=0;
|
||||||
int comp=line.gettoken_enum(2,_T("<\0>\0<>\0=\0ignore\0"));
|
int comp=line.gettoken_enum(2,_T("<\0>\0<>\0=\0ignore\0"));
|
||||||
int validparams=true, ret=-1, cmpv;
|
int validparams=true, ret=-1, cmpv=0;
|
||||||
switch(line.getnumtokens()-1)
|
switch(line.getnumtokens()-1)
|
||||||
{
|
{
|
||||||
case 1: comp=4; break;
|
case 1: comp=4; break;
|
||||||
|
|
|
@ -169,6 +169,9 @@ uInt *hn) /* working area: values in order of bit length */
|
||||||
int y; /* number of dummy codes added */
|
int y; /* number of dummy codes added */
|
||||||
uInt z; /* number of entries in current table */
|
uInt z; /* number of entries in current table */
|
||||||
|
|
||||||
|
#ifdef __GNUC__
|
||||||
|
r.base = 0; // Avoid GCC "may be used uninitialized in this function" warning
|
||||||
|
#endif
|
||||||
|
|
||||||
/* Generate counts for each bit length */
|
/* Generate counts for each bit length */
|
||||||
p=c;
|
p=c;
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue