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

All acceptable warnings now contain a file name and a line number

Browse source 
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@2614 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
kichik 2003-06-05 21:53:52 +00:00
parent e406ae6c1c
commit 2b611d8f70
5 changed files with 68 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Source/makenssi.cpp
View file

@ -258,14 +258,13 @@ int main(int argc, char **argv)
fprintf(g_output,"\n\nProcessing config: \n");
fflush(g_output);
}
int lc=0;
int ret=build.process_script(cfg,exepath,&lc);
int ret=build.process_script(cfg,exepath);
fclose(cfg);
if (ret != PS_OK && ret != PS_EOF)
{
if (build.display_errors)
{
fprintf(g_output,"Error in config on line %d -- aborting creation process\n",lc);
fprintf(g_output,"Error in config on line %d -- aborting creation process\n",build.linecnt);
fflush(g_output);
}
return 1;
@ -341,15 +340,14 @@ int main(int argc, char **argv)
fprintf(g_output,"\n\nProcessing script file: \"%s\"\n",sfile);
fflush(g_output);
}
int lc=0;
int ret=build.process_script(fp,sfile,&lc);
int ret=build.process_script(fp,sfile);
if (fp != stdin) fclose(fp);
if (ret != PS_EOF && ret != PS_OK)
{
if (build.display_errors)
{
fprintf(g_output,"Error in script \"%s\" on line %d -- aborting creation process\n",sfile,lc);
fprintf(g_output,"Error in script \"%s\" on line %d -- aborting creation process\n",sfile,build.linecnt);
fflush(g_output);
}
return 1;