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

Refactored verbosity handling with new setter&getter

Browse source 
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6494 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
anders_k 2014-06-15 19:12:12 +00:00
parent 401dbe8aed
commit d91176ba49
4 changed files with 45 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

25
Source/script.cpp
View file

@ -3447,7 +3447,6 @@ int CEXEBuild::doCommand(int which_token, LineParser &line)
case TOK_P_VERBOSE:
{
extern int g_display_errors;
for(int argi=1; argi<line.getnumtokens(); ++argi)
{
int v,k=line.gettoken_enum(argi,_T("push\0pop\0"));
@ -3483,32 +3482,12 @@ int CEXEBuild::doCommand(int which_token, LineParser &line)
else
{
// push
v=0;
if (display_errors)
{
v++;
if (display_warnings)
{
v++;
if (display_info)
{
v++;
if (display_script)
{
v++;
}
}
}
}
v=get_verbosity();
verbose_stack.add(&v,sizeof(int));
continue;
}
}
display_script=v>3;
display_info=v>2;
display_warnings=v>1;
display_errors=v>0;
g_display_errors=display_errors;
set_verbosity(v);
}
}
return PS_OK;