From: Jeff King <peff@peff.net>
To: git@vger.kernel.org
Subject: [PATCH 3/8] create_bundle(): drop unused "header" parameter
Date: Thu, 24 Jan 2019 08:11:51 -0500 [thread overview]
Message-ID: <20190124131151.GC22398@sigill.intra.peff.net> (raw)
In-Reply-To: <20190124131104.GA24017@sigill.intra.peff.net>
There's no need to pass a header struct to create_bundle(); it writes
the header information directly to a descriptor (and does not report
back details to the caller).
Signed-off-by: Jeff King <peff@peff.net>
---
builtin/bundle.c | 3 +--
bundle.c | 4 ++--
bundle.h | 4 ++--
3 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/builtin/bundle.c b/builtin/bundle.c
index 9e9c65d9c6..1ea4bfdfc1 100644
--- a/builtin/bundle.c
+++ b/builtin/bundle.c
@@ -56,8 +56,7 @@ int cmd_bundle(int argc, const char **argv, const char *prefix)
}
if (!startup_info->have_repository)
die(_("Need a repository to create a bundle."));
- return !!create_bundle(the_repository, &header,
- bundle_file, argc, argv);
+ return !!create_bundle(the_repository, bundle_file, argc, argv);
} else if (!strcmp(cmd, "unbundle")) {
if (!startup_info->have_repository)
die(_("Need a repository to unbundle."));
diff --git a/bundle.c b/bundle.c
index 37b1daa691..b45666c49b 100644
--- a/bundle.c
+++ b/bundle.c
@@ -424,8 +424,8 @@ static int write_bundle_refs(int bundle_fd, struct rev_info *revs)
return ref_count;
}
-int create_bundle(struct repository *r, struct bundle_header *header,
- const char *path, int argc, const char **argv)
+int create_bundle(struct repository *r, const char *path,
+ int argc, const char **argv)
{
struct lock_file lock = LOCK_INIT;
int bundle_fd = -1;
diff --git a/bundle.h b/bundle.h
index 781e6f5c3a..37c37d7f65 100644
--- a/bundle.h
+++ b/bundle.h
@@ -18,8 +18,8 @@ struct bundle_header {
int is_bundle(const char *path, int quiet);
int read_bundle_header(const char *path, struct bundle_header *header);
-int create_bundle(struct repository *r, struct bundle_header *header,
- const char *path, int argc, const char **argv);
+int create_bundle(struct repository *r, const char *path,
+ int argc, const char **argv);
int verify_bundle(struct repository *r, struct bundle_header *header, int verbose);
#define BUNDLE_VERBOSE 1
int unbundle(struct repository *r, struct bundle_header *header,
--
2.20.1.842.g8986705066
next prev parent reply other threads:[~2019-01-24 13:11 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-01-24 13:11 [PATCH 0/9] drop some unused parameters Jeff King
2019-01-24 13:11 ` [PATCH 1/8] match-trees: drop unused path parameter from score functions Jeff King
2019-01-24 13:11 ` [PATCH 2/8] apply: drop unused "def" parameter from find_name_gnu() Jeff King
2019-01-24 13:11 ` Jeff King [this message]
2019-01-24 13:11 ` [PATCH 4/8] column: drop unused "opts" parameter in item_length() Jeff King
2019-01-24 13:12 ` [PATCH 5/8] show_date_relative(): drop unused "tz" parameter Jeff King
2019-01-24 14:07 ` Derrick Stolee
2019-01-24 13:12 ` [PATCH 6/8] config: drop unused parameter from maybe_remove_section() Jeff King
2019-01-24 13:12 ` [PATCH 7/8] convert: drop len parameter from conversion checks Jeff King
2019-01-24 13:12 ` [PATCH 8/8] convert: drop path parameter from actual conversion functions Jeff King
2019-01-24 14:09 ` [PATCH 0/9] drop some unused parameters Derrick Stolee
2019-01-24 20:35 ` Junio C Hamano
2019-01-25 1:53 ` brian m. carlson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190124131151.GC22398@sigill.intra.peff.net \
--to=peff@peff.net \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).