commit, merge: initialize static strbuf

[git.git] / archive.h

diff --git a/archive.h b/archive.h
index 4e44549fdd702ceca430aeb319cc5d5f1afc7ac9..4a02371f374a159604ab55102be5ba5b9d3f7cd2 100644 (file)
--- a/archive.h
+++ b/archive.h
@@ -13,19 +13,17 @@ struct archiver_args {
        time_t time;
        const char **pathspec;
        unsigned int verbose : 1;
-       void *extra;
+       int compression_level;
 };
 
 typedef int (*write_archive_fn_t)(struct archiver_args *);
 
-typedef void *(*parse_extra_args_fn_t)(int argc, const char **argv);
-
 typedef int (*write_archive_entry_fn_t)(struct archiver_args *args, const unsigned char *sha1, const char *path, size_t pathlen, unsigned int mode, void *buffer, unsigned long size);
 
 struct archiver {
        const char *name;
        write_archive_fn_t write_archive;
-       parse_extra_args_fn_t parse_extra;
+       unsigned int flags;
 };
 
 extern int parse_archive_args(int argc, const char **argv, const struct archiver **ar, struct archiver_args *args);
@@ -41,10 +39,6 @@ extern void parse_pathspec_arg(const char **pathspec,
  */
 extern int write_tar_archive(struct archiver_args *);
 extern int write_zip_archive(struct archiver_args *);
-extern void *parse_extra_zip_args(int argc, const char **argv);
-
-extern void *sha1_file_to_archive(const char *path, const unsigned char *sha1, unsigned int mode, enum object_type *type, unsigned long *size, const struct commit *commit);
-extern int is_archive_path_ignored(const char *path);
 
 extern int write_archive_entries(struct archiver_args *args, write_archive_entry_fn_t write_entry);