github-repos/make
1
0
Fork 0
mirror of https://github.com/mirror/make.git synced 2025-01-27 12:51:07 +08:00
Code Issues Packages Projects Releases Wiki Activity

Don't use Hungarian notation: remove _p/_ptr from var names.

Browse Source 
Fixes Savannah bug #32567.
This commit is contained in:
Paul Smith 2011-11-14 00:58:49 +00:00
parent 63888b91f6
commit 83ce81fcaa
2 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,5 +1,9 @@
2011-11-13 Paul Smith <psmith@gnu.org> 2011-11-13 Paul Smith <psmith@gnu.org>
* job.c (construct_command_argv): Remove _p.
(construct_command_argv_internal): Remove _ptr.
Fixes Savannah bug #32567.
* main.c (clean_jobserver): Don't write the free token to the pipe. * main.c (clean_jobserver): Don't write the free token to the pipe.
Change suggested by Tim Newsome <tnewsome@aristanetworks.com> Change suggested by Tim Newsome <tnewsome@aristanetworks.com>

16
job.c
View File

@ -2385,7 +2385,7 @@ void clean_tmp (void)
static char ** static char **
construct_command_argv_internal (char *line, char **restp, char *shell, construct_command_argv_internal (char *line, char **restp, char *shell,
char *shellflags, char *ifs, int flags, char *shellflags, char *ifs, int flags,
char **batch_filename_p) char **batch_filename UNUSED)
{ {
#ifdef __MSDOS__ #ifdef __MSDOS__
/* MSDOS supports both the stock DOS shell and ports of Unixy shells. /* MSDOS supports both the stock DOS shell and ports of Unixy shells.
@ -3048,7 +3048,7 @@ construct_command_argv_internal (char *line, char **restp, char *shell,
new_argv = xmalloc(2 * sizeof (char *)); new_argv = xmalloc(2 * sizeof (char *));
new_argv[0] = xstrdup (""); new_argv[0] = xstrdup ("");
new_argv[1] = NULL; new_argv[1] = NULL;
} else if ((no_default_sh_exe || batch_mode_shell) && batch_filename_ptr) { } else if ((no_default_sh_exe || batch_mode_shell) && batch_filename) {
int temp_fd; int temp_fd;
FILE* batch = NULL; FILE* batch = NULL;
int id = GetCurrentProcessId(); int id = GetCurrentProcessId();
@ -3056,10 +3056,10 @@ construct_command_argv_internal (char *line, char **restp, char *shell,
/* create a file name */ /* create a file name */
sprintf(fbuf, "make%d", id); sprintf(fbuf, "make%d", id);
*batch_filename_ptr = create_batch_file (fbuf, unixy_shell, &temp_fd); *batch_filename = create_batch_file (fbuf, unixy_shell, &temp_fd);
DB (DB_JOBS, (_("Creating temporary batch file %s\n"), DB (DB_JOBS, (_("Creating temporary batch file %s\n"),
*batch_filename_ptr)); *batch_filename));
/* Create a FILE object for the batch file, and write to it the /* Create a FILE object for the batch file, and write to it the
commands to be executed. Put the batch file in TEXT mode. */ commands to be executed. Put the batch file in TEXT mode. */
@ -3077,9 +3077,9 @@ construct_command_argv_internal (char *line, char **restp, char *shell,
new_argv = xmalloc(3 * sizeof (char *)); new_argv = xmalloc(3 * sizeof (char *));
if (unixy_shell) { if (unixy_shell) {
new_argv[0] = xstrdup (shell); new_argv[0] = xstrdup (shell);
new_argv[1] = *batch_filename_ptr; /* only argv[0] gets freed later */ new_argv[1] = *batch_filename; /* only argv[0] gets freed later */
} else { } else {
new_argv[0] = xstrdup (*batch_filename_ptr); new_argv[0] = xstrdup (*batch_filename);
new_argv[1] = NULL; new_argv[1] = NULL;
} }
new_argv[2] = NULL; new_argv[2] = NULL;
@ -3198,7 +3198,7 @@ construct_command_argv_internal (char *line, char **restp, char *shell,
char ** char **
construct_command_argv (char *line, char **restp, struct file *file, construct_command_argv (char *line, char **restp, struct file *file,
int cmd_flags, char **batch_filename_p) int cmd_flags, char **batch_filename)
{ {
char *shell, *ifs, *shellflags; char *shell, *ifs, *shellflags;
char **argv; char **argv;
@ -3312,7 +3312,7 @@ construct_command_argv (char *line, char **restp, struct file *file,
} }
argv = construct_command_argv_internal (line, restp, shell, shellflags, ifs, argv = construct_command_argv_internal (line, restp, shell, shellflags, ifs,
cmd_flags, batch_filename_p); cmd_flags, batch_filename);
free (shell); free (shell);
free (shellflags); free (shellflags);