diff options
author | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2013-12-18 21:53:52 +0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2013-12-18 10:07:14 -0800 |
commit | 3aa3fda184c9004833234f25f1d2201fee743bc3 (patch) | |
tree | b785de27d41be669f6733a33b2259ce75193e7a0 | |
parent | e460e0fa90a57fcd9504559352d4c28a2c1909af (diff) | |
download | git-3aa3fda184c9004833234f25f1d2201fee743bc3.tar.gz |
connect.c: replace some use of starts_with() with skip_prefix()
"name" will be reset unconditionally soon after skip_prefix() returns
NULL.
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r-- | connect.c | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -131,7 +131,7 @@ struct ref **get_remote_heads(int in, char *src_buf, size_t src_len, for (;;) { struct ref *ref; unsigned char old_sha1[20]; - char *name; + const char *name; int len, name_len; char *buffer = packet_buffer; @@ -145,8 +145,8 @@ struct ref **get_remote_heads(int in, char *src_buf, size_t src_len, if (!len) break; - if (len > 4 && starts_with(buffer, "ERR ")) - die("remote error: %s", buffer + 4); + if ((name = skip_prefix(buffer, "ERR ")) != NULL) + die("remote error: %s", name); if (len < 42 || get_sha1_hex(buffer, old_sha1) || buffer[40] != ' ') die("protocol error: expected sha/ref, got '%s'", buffer); |