From: Rene Scharfe Date: Fri, 25 Jul 2008 10:41:24 GMT Subject: [PATCH 4/6] archive: declare struct archiver where it's needed Message-ID: <1216982486-5887-4-git-send-email-rene.scharfe@lsrfire.ath.cx> In-Reply-To: <1216982486-5887-3-git-send-email-rene.scharfe@lsrfire.ath.cx> Move the declaration of struct archiver to archive.c, as this is the only file left where it is used. Signed-off-by: Rene Scharfe --- archive.c | 6 +++++- archive.h | 6 ------ 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/archive.c b/archive.c index c4662a2..f834b5f 100644 --- a/archive.c +++ b/archive.c @@ -9,7 +9,11 @@ static const char archive_usage[] = \ #define USES_ZLIB_COMPRESSION 1 -const struct archiver archivers[] = { +const struct archiver { + const char *name; + write_archive_fn_t write_archive; + unsigned int flags; +} archivers[] = { { "tar", write_tar_archive }, { "zip", write_zip_archive, USES_ZLIB_COMPRESSION }, }; diff --git a/archive.h b/archive.h index 929368d..0b15b35 100644 --- a/archive.h +++ b/archive.h @@ -17,12 +17,6 @@ typedef int (*write_archive_fn_t)(struct archiver_args *); 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; - unsigned int flags; -}; - /* * Archive-format specific backends. */ -- 1.6.0.rc0.42.g186458