diff options
| author | René Scharfe <rene.scharfe@lsrfire.ath.cx> | 2008-07-15 07:49:40 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-07-15 14:08:11 (GMT) |
| commit | 34533004b27df4f34e18d9e26832fcc956a39fca (patch) | |
| tree | 4b08c40dda8f421a4dd27c199dc0dbf7686bc19e /builtin-upload-archive.c | |
| parent | dc6282d2013792c0df625527e12a54e40d07b122 (diff) | |
| download | git-34533004b27df4f34e18d9e26832fcc956a39fca.zip git-34533004b27df4f34e18d9e26832fcc956a39fca.tar.gz git-34533004b27df4f34e18d9e26832fcc956a39fca.tar.bz2 | |
archive: remove args member from struct archiver
Pass struct archiver and struct archiver_args explicitly to parse_archive_args
and remove the latter from the former. This allows us to get rid of struct
archiver_desc and simplifies the code a bit.
Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin-upload-archive.c')
| -rw-r--r-- | builtin-upload-archive.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/builtin-upload-archive.c b/builtin-upload-archive.c index 371400d..295e24c 100644 --- a/builtin-upload-archive.c +++ b/builtin-upload-archive.c @@ -19,7 +19,8 @@ static const char lostchild[] = static int run_upload_archive(int argc, const char **argv, const char *prefix) { - struct archiver ar; + const struct archiver *ar; + struct archiver_args args; const char *sent_argv[MAX_ARGS]; const char *arg_cmd = "argument "; char *p, buf[4096]; @@ -65,12 +66,12 @@ static int run_upload_archive(int argc, const char **argv, const char *prefix) sent_argv[sent_argc] = NULL; /* parse all options sent by the client */ - treeish_idx = parse_archive_args(sent_argc, sent_argv, &ar); + treeish_idx = parse_archive_args(sent_argc, sent_argv, &ar, &args); - parse_treeish_arg(sent_argv + treeish_idx, &ar.args, prefix); - parse_pathspec_arg(sent_argv + treeish_idx + 1, &ar.args); + parse_treeish_arg(sent_argv + treeish_idx, &args, prefix); + parse_pathspec_arg(sent_argv + treeish_idx + 1, &args); - return ar.write_archive(&ar.args); + return ar->write_archive(&args); } static void error_clnt(const char *fmt, ...) |