summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeff King <peff@peff.net>2011-06-21 21:24:07 -0400
committerJunio C Hamano <gitster@pobox.com>2011-06-22 11:12:35 -0700
commit4d7c98986379b0ab93cbf9092b60dfb5ab1cee7c (patch)
treebfee1193f7a5bcfb17829faf5c419bfd2a654bb4
parent13e0f88d4aba326da9217c225d6ab5e642eb611d (diff)
downloadgit-4d7c98986379b0ab93cbf9092b60dfb5ab1cee7c.tar.gz
archive: pass archiver struct to write_archive callback
The current archivers are very static; when you are in the write_tar_archive function, you know you are writing a tar. However, to facilitate runtime-configurable archivers that will share a common write function we need to tell the function which archiver was used. As a convenience, we also provide an opaque data pointer in the archiver struct so that individual archivers can put something useful there when they register themselves. Technically they could just use the "name" field to look in an internal map of names to data, but this is much simpler. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--archive-tar.c3
-rw-r--r--archive-zip.c3
-rw-r--r--archive.c2
-rw-r--r--archive.h3
4 files changed, 7 insertions, 4 deletions
diff --git a/archive-tar.c b/archive-tar.c
index 930375bf21..bed9a9b15c 100644
--- a/archive-tar.c
+++ b/archive-tar.c
@@ -234,7 +234,8 @@ static int git_tar_config(const char *var, const char *value, void *cb)
return 0;
}
-static int write_tar_archive(struct archiver_args *args)
+static int write_tar_archive(const struct archiver *ar,
+ struct archiver_args *args)
{
int err = 0;
diff --git a/archive-zip.c b/archive-zip.c
index a776d8359c..42df66080a 100644
--- a/archive-zip.c
+++ b/archive-zip.c
@@ -261,7 +261,8 @@ static void dos_time(time_t *time, int *dos_date, int *dos_time)
*dos_time = t->tm_sec / 2 + t->tm_min * 32 + t->tm_hour * 2048;
}
-static int write_zip_archive(struct archiver_args *args)
+static int write_zip_archive(const struct archiver *ar,
+ struct archiver_args *args)
{
int err;
diff --git a/archive.c b/archive.c
index f0b4e85513..a0a5beb948 100644
--- a/archive.c
+++ b/archive.c
@@ -410,5 +410,5 @@ int write_archive(int argc, const char **argv, const char *prefix,
parse_treeish_arg(argv, &args, prefix);
parse_pathspec_arg(argv + 1, &args);
- return ar->write_archive(&args);
+ return ar->write_archive(ar, &args);
}
diff --git a/archive.h b/archive.h
index f39cede0c6..b3cf2198b1 100644
--- a/archive.h
+++ b/archive.h
@@ -17,8 +17,9 @@ struct archiver_args {
#define ARCHIVER_WANT_COMPRESSION_LEVELS 1
struct archiver {
const char *name;
- int (*write_archive)(struct archiver_args *);
+ int (*write_archive)(const struct archiver *, struct archiver_args *);
unsigned flags;
+ void *data;
};
extern void register_archiver(struct archiver *);