archive: pass archiver struct to write_archive callback

peff · gitster · commit 4d7c98986379 · 2011-06-22T11:12:35.000-07:00
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 &lt;peff@peff.net&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git 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
@@ -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
@@ -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
@@ -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 *);
 

Original file line number	Diff line number	Diff line change
`@@ -234,7 +234,8 @@ static int git_tar_config(const char var, const char value, void *cb)`
`234`	`234`	`return 0;`
`235`	`235`	`}`
`236`	`236`
`237`		`-static int write_tar_archive(struct archiver_args *args)`
	`237`	`+static int write_tar_archive(const struct archiver *ar,`
	`238`	`+ struct archiver_args *args)`
`238`	`239`	`{`
`239`	`240`	`int err = 0;`
`240`	`241`
Original file line number	Diff line number	Diff line change
`@@ -261,7 +261,8 @@ static void dos_time(time_t time, int dos_date, int *dos_time)`
`261`	`261`	`dos_time = t->tm_sec / 2 + t->tm_min 32 + t->tm_hour * 2048;`
`262`	`262`	`}`
`263`	`263`
`264`		`-static int write_zip_archive(struct archiver_args *args)`
	`264`	`+static int write_zip_archive(const struct archiver *ar,`
	`265`	`+ struct archiver_args *args)`
`265`	`266`	`{`
`266`	`267`	`int err;`
`267`	`268`
Original file line number	Diff line number	Diff line change
`@@ -410,5 +410,5 @@ int write_archive(int argc, const char *argv, const char prefix,`
`410`	`410`	`parse_treeish_arg(argv, &args, prefix);`
`411`	`411`	`parse_pathspec_arg(argv + 1, &args);`
`412`	`412`
`413`		`- return ar->write_archive(&args);`
	`413`	`+ return ar->write_archive(ar, &args);`
`414`	`414`	`}`