A bit more clearer code
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@2547 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
parent
103fd23c3e
commit
c69d3ed5e4
1 changed files with 8 additions and 6 deletions
|
@ -362,6 +362,8 @@ int CEXEBuild::process_jump(LineParser &line, int wt, int *offs)
|
|||
}
|
||||
|
||||
#define FLAG_OFFSET(flag) (FIELD_OFFSET(installer_flags, flag)/sizeof(int))
|
||||
#define SECTION_FIELD_GET(field) (FIELD_OFFSET(section, field)/sizeof(int))
|
||||
#define SECTION_FIELD_SET(field) (-1 - (int)(FIELD_OFFSET(section, field)/sizeof(int)))
|
||||
|
||||
int CEXEBuild::doCommand(int which_token, LineParser &line, FILE *fp, const char *curfilename, int *lineptr)
|
||||
{
|
||||
|
@ -4091,7 +4093,7 @@ int CEXEBuild::doCommand(int which_token, LineParser &line, FILE *fp, const char
|
|||
}
|
||||
ent.which=EW_SECTIONSET;
|
||||
ent.offsets[0]=add_string(line.gettoken_str(1));
|
||||
ent.offsets[1]=-1;
|
||||
ent.offsets[1]=SECTION_FIELD_SET(name_ptr);
|
||||
ent.offsets[2]=add_string(line.gettoken_str(2));
|
||||
SCRIPT_MSG("SectionSetText: %s=%s\n",line.gettoken_str(1),line.gettoken_str(2));
|
||||
return add_entry(&ent);
|
||||
|
@ -4103,7 +4105,7 @@ int CEXEBuild::doCommand(int which_token, LineParser &line, FILE *fp, const char
|
|||
}
|
||||
ent.which=EW_SECTIONSET;
|
||||
ent.offsets[0]=add_string(line.gettoken_str(1));
|
||||
ent.offsets[1]=0;
|
||||
ent.offsets[1]=SECTION_FIELD_GET(name_ptr);
|
||||
ent.offsets[2]=line.gettoken_enum(2,usrvars);
|
||||
if (line.gettoken_str(2)[0] && ent.offsets[2]<0) PRINTHELP()
|
||||
SCRIPT_MSG("SectionGetText: %s->%s\n",line.gettoken_str(1),line.gettoken_str(2));
|
||||
|
@ -4116,7 +4118,7 @@ int CEXEBuild::doCommand(int which_token, LineParser &line, FILE *fp, const char
|
|||
}
|
||||
ent.which=EW_SECTIONSET;
|
||||
ent.offsets[0]=add_string(line.gettoken_str(1));
|
||||
ent.offsets[1]=-3;
|
||||
ent.offsets[1]=SECTION_FIELD_SET(flags);
|
||||
ent.offsets[2]=add_string(line.gettoken_str(2));
|
||||
SCRIPT_MSG("SectionSetFlags: %s->%s\n",line.gettoken_str(1),line.gettoken_str(2));
|
||||
return add_entry(&ent);
|
||||
|
@ -4128,7 +4130,7 @@ int CEXEBuild::doCommand(int which_token, LineParser &line, FILE *fp, const char
|
|||
}
|
||||
ent.which=EW_SECTIONSET;
|
||||
ent.offsets[0]=add_string(line.gettoken_str(1));
|
||||
ent.offsets[1]=2;
|
||||
ent.offsets[1]=SECTION_FIELD_GET(flags);
|
||||
ent.offsets[2]=line.gettoken_enum(2,usrvars);
|
||||
if (line.gettoken_str(2)[0] && ent.offsets[2]<0) PRINTHELP()
|
||||
SCRIPT_MSG("SectionGetFlags: %s->%s\n",line.gettoken_str(1),line.gettoken_str(2));
|
||||
|
@ -4141,7 +4143,7 @@ int CEXEBuild::doCommand(int which_token, LineParser &line, FILE *fp, const char
|
|||
}
|
||||
ent.which=EW_SECTIONSET;
|
||||
ent.offsets[0]=add_string(line.gettoken_str(1));
|
||||
ent.offsets[1]=-2;
|
||||
ent.offsets[1]=SECTION_FIELD_SET(install_types);
|
||||
ent.offsets[2]=add_string(line.gettoken_str(2));
|
||||
SCRIPT_MSG("SectionSetInstTypes: %s->%s\n",line.gettoken_str(1),line.gettoken_str(2));
|
||||
return add_entry(&ent);
|
||||
|
@ -4153,7 +4155,7 @@ int CEXEBuild::doCommand(int which_token, LineParser &line, FILE *fp, const char
|
|||
}
|
||||
ent.which=EW_SECTIONSET;
|
||||
ent.offsets[0]=add_string(line.gettoken_str(1));
|
||||
ent.offsets[1]=1;
|
||||
ent.offsets[1]=SECTION_FIELD_GET(install_types);
|
||||
ent.offsets[2]=line.gettoken_enum(2,usrvars);
|
||||
if (line.gettoken_str(2)[0] && ent.offsets[2]<0) PRINTHELP()
|
||||
SCRIPT_MSG("SectionGetInstTypes: %s->%s\n",line.gettoken_str(1),line.gettoken_str(2));
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue