mirror of
https://github.com/git/git.git
synced 2024-10-28 12:59:41 +01:00
archive: rename archiver data field to filter_command
The void pointer "data" in struct archiver is only used to store filter commands to pass tar archives to, like gzip. Rename it accordingly and also turn it into a char pointer to document the fact that it's a string reference. Signed-off-by: René Scharfe <l.s.r@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
650134a478
commit
96b9e5151b
2 changed files with 6 additions and 6 deletions
|
@ -383,8 +383,8 @@ static int tar_filter_config(const char *var, const char *value, void *data)
|
||||||
if (!strcmp(type, "command")) {
|
if (!strcmp(type, "command")) {
|
||||||
if (!value)
|
if (!value)
|
||||||
return config_error_nonbool(var);
|
return config_error_nonbool(var);
|
||||||
free(ar->data);
|
free(ar->filter_command);
|
||||||
ar->data = xstrdup(value);
|
ar->filter_command = xstrdup(value);
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
if (!strcmp(type, "remote")) {
|
if (!strcmp(type, "remote")) {
|
||||||
|
@ -432,10 +432,10 @@ static int write_tar_filter_archive(const struct archiver *ar,
|
||||||
struct child_process filter = CHILD_PROCESS_INIT;
|
struct child_process filter = CHILD_PROCESS_INIT;
|
||||||
int r;
|
int r;
|
||||||
|
|
||||||
if (!ar->data)
|
if (!ar->filter_command)
|
||||||
BUG("tar-filter archiver called with no filter defined");
|
BUG("tar-filter archiver called with no filter defined");
|
||||||
|
|
||||||
strbuf_addstr(&cmd, ar->data);
|
strbuf_addstr(&cmd, ar->filter_command);
|
||||||
if (args->compression_level >= 0)
|
if (args->compression_level >= 0)
|
||||||
strbuf_addf(&cmd, " -%d", args->compression_level);
|
strbuf_addf(&cmd, " -%d", args->compression_level);
|
||||||
|
|
||||||
|
@ -478,7 +478,7 @@ void init_tar_archiver(void)
|
||||||
git_config(git_tar_config, NULL);
|
git_config(git_tar_config, NULL);
|
||||||
for (i = 0; i < nr_tar_filters; i++) {
|
for (i = 0; i < nr_tar_filters; i++) {
|
||||||
/* omit any filters that never had a command configured */
|
/* omit any filters that never had a command configured */
|
||||||
if (tar_filters[i]->data)
|
if (tar_filters[i]->filter_command)
|
||||||
register_archiver(tar_filters[i]);
|
register_archiver(tar_filters[i]);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -43,7 +43,7 @@ struct archiver {
|
||||||
const char *name;
|
const char *name;
|
||||||
int (*write_archive)(const struct archiver *, struct archiver_args *);
|
int (*write_archive)(const struct archiver *, struct archiver_args *);
|
||||||
unsigned flags;
|
unsigned flags;
|
||||||
void *data;
|
char *filter_command;
|
||||||
};
|
};
|
||||||
void register_archiver(struct archiver *);
|
void register_archiver(struct archiver *);
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue