boost/build
2
0
Fork 0
mirror of https://github.com/boostorg/build.git synced 2026-02-14 12:42:11 +00:00
Code Issues Projects Releases Wiki Activity

Boost Jam code cleanup - minor stylistic changes.

Browse Source 
[SVN r79101]
This commit is contained in:
Jurko Gospodnetić
2012-06-26 10:30:14 +00:00
parent bca364c875
commit 52eafb9eb5
3 changed files with 23 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/engine/command.c
View File

@@ -29,7 +29,7 @@
CMD * cmd_new( RULE * rule, LIST * targets, LIST * sources, LIST * shell )
{
CMD * cmd = (CMD *)BJAM_MALLOC( sizeof( CMD ) );
FRAME frame[1];
FRAME frame[ 1 ];
assert( cmd );
cmd->rule = rule;

11
src/engine/command.h
View File

@@ -29,6 +29,7 @@
* cmd_new() - return a new CMD or 0 if too many args.
* cmd_free() - delete CMD and its parts.
* cmd_next() - walk the CMD chain.
* cmd_release_targets_and_shell() - CMD forgets about its targets & shell.
*/
@@ -48,11 +49,11 @@ typedef struct _cmd CMD;
struct _cmd
{
CMD * next;
CMD * tail; /* valid on in head */
RULE * rule; /* rule->actions contains shell script */
LIST * shell; /* $(JAMSHELL) value */
LOL args; /* LISTs for $(<), $(>) */
string buf[1]; /* actual commands */
CMD * tail; /* valid on in head */
RULE * rule; /* rule->actions contains shell script */
LIST * shell; /* $(JAMSHELL) value */
LOL args; /* LISTs for $(<), $(>) */
string buf[ 1 ]; /* actual commands */
};
CMD * cmd_new

31
src/engine/make1.c
View File

@@ -91,7 +91,7 @@ typedef struct _state
TARGET * t; /* current target */
TARGET * parent; /* parent argument necessary for make1a() */
int curstate; /* current state */
int status;
int status; /* EXEC_CMD_* - input for make1d() */
} state;
static void make1a ( state * );
@@ -547,17 +547,21 @@ static void make1c( state * pState )
}
else
{
/* Pop state first in case exec_cmd(), exec_wait() or make_closure()
* push a new state. Collect the target off the stack before that to
* avoid accessing data later from a freed stack node.
*/
TARGET * t = pState->t ;
pop_state( &state_stack );
/* Increment the jobs running counter. */
++cmdsrunning;
/* Execute the actual build command. */
exec_cmd( cmd->buf, make_closure, pState->t, cmd->shell, rule_name,
exec_cmd( cmd->buf, make_closure, t, cmd->shell, rule_name,
target_name );
/* Pop state first because exec_wait() will push state. */
pop_state( &state_stack );
/* Wait until we are under the concurrent command count limit. */
/* Wait until under the concurrent command count limit. */
assert( 0 < globs.jobs );
assert( globs.jobs <= MAXJOBS );
while ( cmdsrunning >= globs.jobs )
@@ -591,10 +595,7 @@ static void make1c( state * pState )
TARGET * t = pState->t;
TARGET * additional_includes = NULL;
if ( globs.noexec )
t->progress = T_MAKE_NOEXEC_DONE;
else
t->progress = T_MAKE_DONE;
t->progress = globs.noexec ? T_MAKE_NOEXEC_DONE : T_MAKE_DONE;
/* Target has been updated so rescan it for dependencies. */
if ( ( t->fate >= T_FATE_MISSING ) &&
@@ -969,12 +970,12 @@ static void swap_settings
static CMD * make1cmds( TARGET * t )
{
CMD * cmds = 0;
LIST * shell = L0;
CMD * cmds = 0;
LIST * shell = L0;
module_t * settings_module = 0;
TARGET * settings_target = 0;
ACTIONS * a0;
int running_flag = globs.noexec ? A_RUNNING_NOEXEC : A_RUNNING;
TARGET * settings_target = 0;
ACTIONS * a0;
int const running_flag = globs.noexec ? A_RUNNING_NOEXEC : A_RUNNING;
/* Step through actions. Actions may be shared with other targets or grouped
* using RULE_TOGETHER, so actions already seen are skipped.