From: Ben Peart <peartben@gmail.com>
To: git@vger.kernel.org
Cc: gitster@pobox.com, benpeart@microsoft.com,
christian.couder@gmail.com, larsxschneider@gmail.com
Subject: [PATCH v3 2/8] convert: Update convert to use new packet_writel() function
Date: Wed, 29 Mar 2017 11:53:24 -0400 [thread overview]
Message-ID: <20170329155330.12860-3-benpeart@microsoft.com> (raw)
In-Reply-To: <20170329155330.12860-1-benpeart@microsoft.com>
convert.c had it's own packet_write_list() function that can now be
replaced with the new packet_writel() function from pkt-line.
Signed-off-by: Ben Peart <benpeart@microsoft.com>
---
convert.c | 23 ++---------------------
1 file changed, 2 insertions(+), 21 deletions(-)
diff --git a/convert.c b/convert.c
index 8d652bf27c..793c29ebfd 100644
--- a/convert.c
+++ b/convert.c
@@ -521,25 +521,6 @@ static struct cmd2process *find_multi_file_filter_entry(struct hashmap *hashmap,
return hashmap_get(hashmap, &key, NULL);
}
-static int packet_write_list(int fd, const char *line, ...)
-{
- va_list args;
- int err;
- va_start(args, line);
- for (;;) {
- if (!line)
- break;
- if (strlen(line) > LARGE_PACKET_DATA_MAX)
- return -1;
- err = packet_write_fmt_gently(fd, "%s\n", line);
- if (err)
- return err;
- line = va_arg(args, const char*);
- }
- va_end(args);
- return packet_flush_gently(fd);
-}
-
static void read_multi_file_filter_status(int fd, struct strbuf *status)
{
struct strbuf **pair;
@@ -616,7 +597,7 @@ static struct cmd2process *start_multi_file_filter(struct hashmap *hashmap, cons
sigchain_push(SIGPIPE, SIG_IGN);
- err = packet_write_list(process->in, "git-filter-client", "version=2", NULL);
+ err = packet_writel(process->in, "git-filter-client", "version=2", NULL);
if (err)
goto done;
@@ -632,7 +613,7 @@ static struct cmd2process *start_multi_file_filter(struct hashmap *hashmap, cons
if (err)
goto done;
- err = packet_write_list(process->in, "capability=clean", "capability=smudge", NULL);
+ err = packet_writel(process->in, "capability=clean", "capability=smudge", NULL);
for (;;) {
cap_buf = packet_read_line(process->out, NULL);
--
2.12.1.gvfs.1.18.ge47db72
next prev parent reply other threads:[~2017-03-29 15:54 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-03-29 15:53 [PATCH v3 0/8] refactor the filter process code into a reusable module Ben Peart
2017-03-29 15:53 ` [PATCH v3 1/8] pkt-line: add packet_writel() and packet_read_line_gently() Ben Peart
2017-03-29 15:53 ` Ben Peart [this message]
2017-03-29 15:53 ` [PATCH v3 3/8] convert: Split start_multi_file_filter into two separate functions Ben Peart
2017-03-29 15:53 ` [PATCH v3 4/8] convert: Separate generic structures and variables from the filter specific ones Ben Peart
2017-03-29 15:53 ` [PATCH v3 5/8] convert: Update generic functions to only use generic data structures Ben Peart
2017-03-29 15:53 ` [PATCH v3 6/8] convert: rename reusable sub-process functions Ben Peart
2017-03-29 15:53 ` [PATCH v3 7/8] sub-process: move sub-process functions into separate files Ben Peart
2017-03-29 20:43 ` Junio C Hamano
2017-03-30 15:27 ` Ben Peart
2017-03-29 15:53 ` [PATCH v3 8/8] convert: Update subprocess_read_status to not die on EOF Ben Peart
2017-03-29 19:59 ` [PATCH v3 0/8] refactor the filter process code into a reusable module Junio C Hamano
2017-03-30 15:26 ` Ben Peart
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=20170329155330.12860-3-benpeart@microsoft.com \
--to=peartben@gmail.com \
--cc=benpeart@microsoft.com \
--cc=christian.couder@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=larsxschneider@gmail.com \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.