diff options
| author | Masaya Suzuki <masayasuzuki@google.com> | 2018-12-29 21:19:14 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-01-02 21:05:27 (GMT) |
| commit | 01f9ec64c8a82a05ba7e5a17b292ede037a469ea (patch) | |
| tree | cc8f641b1f66482e6796fd66e0c7825ce2a8a79c /remote-curl.c | |
| parent | b21ebb671bb7dea8d342225f0d66c41f4e54d5ca (diff) | |
| download | git-01f9ec64c8a82a05ba7e5a17b292ede037a469ea.zip git-01f9ec64c8a82a05ba7e5a17b292ede037a469ea.tar.gz git-01f9ec64c8a82a05ba7e5a17b292ede037a469ea.tar.bz2 | |
Use packet_reader instead of packet_read_line
By using and sharing a packet_reader while handling a Git pack protocol
request, the same reader option is used throughout the code. This makes
it easy to set a reader option to the request parsing code.
Signed-off-by: Masaya Suzuki <masayasuzuki@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'remote-curl.c')
| -rw-r--r-- | remote-curl.c | 22 |
1 files changed, 15 insertions, 7 deletions
diff --git a/remote-curl.c b/remote-curl.c index 1220dff..bbd9ba0 100644 --- a/remote-curl.c +++ b/remote-curl.c @@ -409,28 +409,36 @@ static struct discovery *discover_refs(const char *service, int for_push) if (maybe_smart && (5 <= last->len && last->buf[4] == '#') && !strbuf_cmp(&exp, &type)) { - char *line; + struct packet_reader reader; + packet_reader_init(&reader, -1, last->buf, last->len, + PACKET_READ_CHOMP_NEWLINE); /* * smart HTTP response; validate that the service * pkt-line matches our request. */ - line = packet_read_line_buf(&last->buf, &last->len, NULL); - if (!line) + if (packet_reader_read(&reader) != PACKET_READ_NORMAL) die("invalid server response; expected service, got flush packet"); strbuf_reset(&exp); strbuf_addf(&exp, "# service=%s", service); - if (strcmp(line, exp.buf)) - die("invalid server response; got '%s'", line); + if (strcmp(reader.line, exp.buf)) + die("invalid server response; got '%s'", reader.line); strbuf_release(&exp); /* The header can include additional metadata lines, up * until a packet flush marker. Ignore these now, but * in the future we might start to scan them. */ - while (packet_read_line_buf(&last->buf, &last->len, NULL)) - ; + for (;;) { + packet_reader_read(&reader); + if (reader.pktlen <= 0) { + break; + } + } + + last->buf = reader.src_buffer; + last->len = reader.src_len; last->proto_git = 1; } else if (maybe_smart && |