зеркало из https://github.com/microsoft/git.git
argv-array: drop "detach" code
The argv_array_detach function (and associated free() function) was really only useful for transferring ownership of the memory to a "struct child_process". Now that we have an internal argv_array in that struct, there are no callers left. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Родитель
173fd1a1a4
Коммит
ff857e4ee8
|
@ -53,11 +53,3 @@ Functions
|
|||
`argv_array_clear`::
|
||||
Free all memory associated with the array and return it to the
|
||||
initial, empty state.
|
||||
|
||||
`argv_array_detach`::
|
||||
Detach the argv array from the `struct argv_array`, transferring
|
||||
ownership of the allocated array and strings.
|
||||
|
||||
`argv_array_free_detached`::
|
||||
Free the memory allocated by a `struct argv_array` that was later
|
||||
detached and is now no longer needed.
|
||||
|
|
20
argv-array.c
20
argv-array.c
|
@ -68,23 +68,3 @@ void argv_array_clear(struct argv_array *array)
|
|||
}
|
||||
argv_array_init(array);
|
||||
}
|
||||
|
||||
const char **argv_array_detach(struct argv_array *array, int *argc)
|
||||
{
|
||||
const char **argv =
|
||||
array->argv == empty_argv || array->argc == 0 ? NULL : array->argv;
|
||||
if (argc)
|
||||
*argc = array->argc;
|
||||
argv_array_init(array);
|
||||
return argv;
|
||||
}
|
||||
|
||||
void argv_array_free_detached(const char **argv)
|
||||
{
|
||||
if (argv) {
|
||||
int i;
|
||||
for (i = 0; argv[i]; i++)
|
||||
free((char **)argv[i]);
|
||||
free(argv);
|
||||
}
|
||||
}
|
||||
|
|
|
@ -19,7 +19,5 @@ LAST_ARG_MUST_BE_NULL
|
|||
void argv_array_pushl(struct argv_array *, ...);
|
||||
void argv_array_pop(struct argv_array *);
|
||||
void argv_array_clear(struct argv_array *);
|
||||
const char **argv_array_detach(struct argv_array *array, int *argc);
|
||||
void argv_array_free_detached(const char **argv);
|
||||
|
||||
#endif /* ARGV_ARRAY_H */
|
||||
|
|
Загрузка…
Ссылка в новой задаче