Commit fa401a32d23eb832c6494db9770e6522b11f36d7
2018-07-19T08:20:04
Merge pull request #4704 from nelhage/no-pkt-pack Remove GIT_PKT_PACK entirely
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70
diff --git a/src/transports/smart.h b/src/transports/smart.h
index 26bd64e..057d7e6 100644
--- a/src/transports/smart.h
+++ b/src/transports/smart.h
@@ -40,7 +40,6 @@ typedef enum {
GIT_PKT_HAVE,
GIT_PKT_ACK,
GIT_PKT_NAK,
- GIT_PKT_PACK,
GIT_PKT_COMMENT,
GIT_PKT_ERR,
GIT_PKT_DATA,
diff --git a/src/transports/smart_pkt.c b/src/transports/smart_pkt.c
index d7de5bd..cd9ca6c 100644
--- a/src/transports/smart_pkt.c
+++ b/src/transports/smart_pkt.c
@@ -86,19 +86,6 @@ static int nak_pkt(git_pkt **out)
return 0;
}
-static int pack_pkt(git_pkt **out)
-{
- git_pkt *pkt;
-
- pkt = git__malloc(sizeof(git_pkt));
- GITERR_CHECK_ALLOC(pkt);
-
- pkt->type = GIT_PKT_PACK;
- *out = pkt;
-
- return 0;
-}
-
static int comment_pkt(git_pkt **out, const char *line, size_t len)
{
git_pkt_comment *pkt;
@@ -417,12 +404,12 @@ int git_pkt_parse_line(
* server is trying to send us the packfile already.
*/
if (bufflen >= 4 && !git__prefixcmp(line, "PACK")) {
- giterr_clear();
- *out = line;
- return pack_pkt(head);
+ giterr_set(GITERR_NET, "unexpected pack file");
+ } else {
+ giterr_set(GITERR_NET, "bad packet length");
}
- return (int)len;
+ return -1;
}
/*
diff --git a/src/transports/smart_protocol.c b/src/transports/smart_protocol.c
index b114e18..716aa45 100644
--- a/src/transports/smart_protocol.c
+++ b/src/transports/smart_protocol.c
@@ -70,12 +70,6 @@ int git_smart__store_refs(transport_smart *t, int flushes)
return -1;
}
- if (pkt->type == GIT_PKT_PACK) {
- giterr_set(GITERR_NET, "unexpected packfile");
- git__free(pkt);
- return -1;
- }
-
if (pkt->type != GIT_PKT_FLUSH && git_vector_insert(refs, pkt) < 0)
return -1;