summaryrefslogtreecommitdiff
path: root/src/w32
diff options
context:
space:
mode:
authorPaul Smith <psmith@gnu.org>2023-03-25 17:53:19 -0400
committerPaul Smith <psmith@gnu.org>2023-03-26 16:48:48 -0400
commitcaf1d4c28fd96f1b3efec10f3978c45e5cf57aa4 (patch)
tree52bd4e454609d31627afaa7ed098754e95c3a52e /src/w32
parentf99d0834184c97f162e965a603e88a3e10e22993 (diff)
downloadmake-git-caf1d4c28fd96f1b3efec10f3978c45e5cf57aa4.tar.gz
Clean up expand.c
Clarify the naming and documentation on functions in src/expand.c: - variable_expand -> expand_string - variable_expand_string -> expand_string_buf - variable_expand_for_file -> expand_string_for_file - allocated_variable_expand -> allocated_expand_string - allocated_variable_expand_for_file -> allocated_expand_string_for_file Change all callers to use the new names. * src/variable.h: Rename the functions and macros. * src/expand.c: Ditto. * src/file.c: Use the new function names. * src/function.c: Ditto. * src/implicit.c: Ditto. * src/job.c: Ditto. * src/loadapi.c: Ditto. * src/main.c: Ditto. * src/read.c: Ditto. * src/remake.c: Ditto. * src/variable.c: Ditto. * src/vpath.c: Ditto. * src/w32/subproc/sub_proc.c: Ditto.
Diffstat (limited to 'src/w32')
-rw-r--r--src/w32/subproc/sub_proc.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/w32/subproc/sub_proc.c b/src/w32/subproc/sub_proc.c
index 4331973a..be32d9ef 100644
--- a/src/w32/subproc/sub_proc.c
+++ b/src/w32/subproc/sub_proc.c
@@ -615,7 +615,7 @@ process_begin(
char **argvi = argv;
size_t arglen = 0;
- strcpy(buf, variable_expand ("$(SHELL)"));
+ strcpy(buf, expand_string ("$(SHELL)"));
shell_name = &buf[0];
strcpy(exec_fname, "-c");
/* Construct a single command string in argv[0]. */