diff options
author | Johannes Schindelin <johannes.schindelin@gmx.de> | 2021-03-15 21:08:21 +0000 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2021-03-15 14:32:50 -0700 |
commit | 8c2efa5d7671567975add8c4e493da65c968c376 (patch) | |
tree | e6c9ad34bf87f7bc7d05518b2232434863ca81ec /pkt-line.c | |
parent | pkt-line: add PACKET_READ_GENTLE_ON_READ_ERROR option (diff) | |
download | tgif-8c2efa5d7671567975add8c4e493da65c968c376.tar.xz |
pkt-line: add options argument to read_packetized_to_strbuf()
Update the calling sequence of `read_packetized_to_strbuf()` to take
an options argument and not assume a fixed set of options. Update the
only existing caller accordingly to explicitly pass the
formerly-assumed flags.
The `read_packetized_to_strbuf()` function calls `packet_read()` with
a fixed set of assumed options (`PACKET_READ_GENTLE_ON_EOF`). This
assumption has been fine for the single existing caller
`apply_multi_file_filter()` in `convert.c`.
In a later commit we would like to add other callers to
`read_packetized_to_strbuf()` that need a different set of options.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Jeff Hostetler <jeffhost@microsoft.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'pkt-line.c')
-rw-r--r-- | pkt-line.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkt-line.c b/pkt-line.c index 457ac4e151..0194137528 100644 --- a/pkt-line.c +++ b/pkt-line.c @@ -444,7 +444,7 @@ char *packet_read_line_buf(char **src, size_t *src_len, int *dst_len) return packet_read_line_generic(-1, src, src_len, dst_len); } -ssize_t read_packetized_to_strbuf(int fd_in, struct strbuf *sb_out) +ssize_t read_packetized_to_strbuf(int fd_in, struct strbuf *sb_out, int options) { int packet_len; @@ -460,7 +460,7 @@ ssize_t read_packetized_to_strbuf(int fd_in, struct strbuf *sb_out) * that there is already room for the extra byte. */ sb_out->buf + sb_out->len, LARGE_PACKET_DATA_MAX+1, - PACKET_READ_GENTLE_ON_EOF); + options); if (packet_len <= 0) break; sb_out->len += packet_len; |