github-repos/make
1
0
Fork 0
mirror of https://github.com/mirror/make.git synced 2026-08-22 18:03:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

* src/job.c: Switch from bit operators to flags macros

Browse Source 
* src/remake.c: Ditto.
This commit is contained in:
Paul Smith
2023-01-28 13:01:39 -05:00
parent faedfdb0af
commit 2f336608d8
2 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/job.c
View File

@@ -1193,7 +1193,7 @@ start_job_command (struct child *child)
| child->file->cmds->lines_flags[child->command_line - 1]); | child->file->cmds->lines_flags[child->command_line - 1]);
p = child->command_ptr; p = child->command_ptr;
child->noerror = ((flags & COMMANDS_NOERROR) != 0); child->noerror = ANY_SET (flags, COMMANDS_NOERROR);
while (*p != '\0') while (*p != '\0')
{ {
@@ -1209,7 +1209,7 @@ start_job_command (struct child *child)
++p; ++p;
} }
child->recursive = ((flags & COMMANDS_RECURSE) != 0); child->recursive = ANY_SET (flags, COMMANDS_RECURSE);
/* Update the file's command flags with any new ones we found. We only /* Update the file's command flags with any new ones we found. We only
keep the COMMANDS_RECURSE setting. Even this isn't 100% correct; we are keep the COMMANDS_RECURSE setting. Even this isn't 100% correct; we are
@@ -1294,7 +1294,7 @@ start_job_command (struct child *child)
command line, or 'succeeded' otherwise. The exit status of 1 tells the command line, or 'succeeded' otherwise. The exit status of 1 tells the
user that -q is saying 'something to do'; the exit status for a random user that -q is saying 'something to do'; the exit status for a random
error is 2. */ error is 2. */
if (argv != 0 && question_flag && !(flags & COMMANDS_RECURSE)) if (argv != 0 && question_flag && NONE_SET (flags, COMMANDS_RECURSE))
{ {
FREE_ARGV (argv); FREE_ARGV (argv);
#ifdef VMS #ifdef VMS
@@ -1310,7 +1310,7 @@ start_job_command (struct child *child)
#endif #endif
} }
if (touch_flag && !(flags & COMMANDS_RECURSE)) if (touch_flag && NONE_SET (flags, COMMANDS_RECURSE))
{ {
/* Go on to the next command. It might be the recursive one. /* Go on to the next command. It might be the recursive one.
We construct ARGV only to find the end of the command line. */ We construct ARGV only to find the end of the command line. */
@@ -1344,7 +1344,7 @@ start_job_command (struct child *child)
in SYNC_RECURSE mode or this command is not recursive. We'll also check in SYNC_RECURSE mode or this command is not recursive. We'll also check
output_sync separately below in case it changes due to error. */ output_sync separately below in case it changes due to error. */
child->output.syncout = output_sync && (output_sync == OUTPUT_SYNC_RECURSE child->output.syncout = output_sync && (output_sync == OUTPUT_SYNC_RECURSE
|| !(flags & COMMANDS_RECURSE)); || NONE_SET (flags, COMMANDS_RECURSE));
OUTPUT_SET (&child->output); OUTPUT_SET (&child->output);
@@ -1355,7 +1355,7 @@ start_job_command (struct child *child)
/* Print the command if appropriate. */ /* Print the command if appropriate. */
if (just_print_flag || ISDB (DB_PRINT) if (just_print_flag || ISDB (DB_PRINT)
|| (!(flags & COMMANDS_SILENT) && !run_silent)) || (NONE_SET (flags, COMMANDS_SILENT) && !run_silent))
OS (message, 0, "%s", p); OS (message, 0, "%s", p);
/* Tell update_goal_chain that a command has been started on behalf of /* Tell update_goal_chain that a command has been started on behalf of
@@ -1395,7 +1395,7 @@ start_job_command (struct child *child)
/* If -n was given, recurse to get the next line in the sequence. */ /* If -n was given, recurse to get the next line in the sequence. */
if (just_print_flag && !(flags & COMMANDS_RECURSE)) if (just_print_flag && NONE_SET (flags, COMMANDS_RECURSE))
{ {
FREE_ARGV (argv); FREE_ARGV (argv);
goto next_command; goto next_command;
@@ -1464,12 +1464,12 @@ start_job_command (struct child *child)
#else #else
jobserver_pre_child (flags & COMMANDS_RECURSE); jobserver_pre_child (ANY_SET (flags, COMMANDS_RECURSE));
child->pid = child_execute_job ((struct childbase *)child, child->pid = child_execute_job ((struct childbase *)child,
child->good_stdin, argv); child->good_stdin, argv);
jobserver_post_child (flags & COMMANDS_RECURSE); jobserver_post_child (ANY_SET (flags, COMMANDS_RECURSE));
#endif /* !VMS */ #endif /* !VMS */
} }
@@ -3538,7 +3538,7 @@ construct_command_argv_internal (char *line, char **restp, const char *shell,
/* Some shells do not work well when invoked as 'sh -c xxx' to run a /* Some shells do not work well when invoked as 'sh -c xxx' to run a
command line (e.g. Cygnus GNUWIN32 sh.exe on W32 systems). In these command line (e.g. Cygnus GNUWIN32 sh.exe on W32 systems). In these
cases, run commands via a script file. */ cases, run commands via a script file. */
if (just_print_flag && !(flags & COMMANDS_RECURSE)) if (just_print_flag && NONE_SET (flags, COMMANDS_RECURSE))
{ {
/* Need to allocate new_argv, although it's unused, because /* Need to allocate new_argv, although it's unused, because
start_job_command will want to free it and its 0'th element. */ start_job_command will want to free it and its 0'th element. */

4
src/remake.c
View File

@@ -958,7 +958,7 @@ notice_finished_file (struct file *file)
we don't want to do the touching. */ we don't want to do the touching. */
unsigned int i; unsigned int i;
for (i = 0; i < file->cmds->ncommand_lines; ++i) for (i = 0; i < file->cmds->ncommand_lines; ++i)
if (!(file->cmds->lines_flags[i] & COMMANDS_RECURSE)) if (NONE_SET (file->cmds->lines_flags[i], COMMANDS_RECURSE))
goto have_nonrecursing; goto have_nonrecursing;
} }
else else
@@ -999,7 +999,7 @@ notice_finished_file (struct file *file)
if ((question_flag || just_print_flag || touch_flag) && file->cmds) if ((question_flag || just_print_flag || touch_flag) && file->cmds)
{ {
for (i = file->cmds->ncommand_lines; i > 0; --i) for (i = file->cmds->ncommand_lines; i > 0; --i)
if (! (file->cmds->lines_flags[i-1] & COMMANDS_RECURSE)) if (NONE_SET (file->cmds->lines_flags[i-1], COMMANDS_RECURSE))
break; break;
} }