Commit 1ff2107184dbd40fab4074751f009b9f4deec3de
2020-03-18T16:11:30
remove got_ prefix from static functions in got-fetch-pack
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
diff --git a/libexec/got-fetch-pack/got-fetch-pack.c b/libexec/got-fetch-pack/got-fetch-pack.c
index 00e1058..167e339 100644
--- a/libexec/got-fetch-pack/got-fetch-pack.c
+++ b/libexec/got-fetch-pack/got-fetch-pack.c
@@ -156,7 +156,7 @@ match_remote_ref(struct got_pathlist_head *have_refs, struct got_object_id *id,
}
static int
-got_check_pack_hash(int fd, size_t sz, uint8_t *hcomp)
+check_pack_hash(int fd, size_t sz, uint8_t *hcomp)
{
SHA1_CTX ctx;
uint8_t hexpect[SHA1_DIGEST_LENGTH];
@@ -201,7 +201,7 @@ got_has_object(struct got_object_id *obj)
}
static int
-got_match_branch(char *br, char *pat)
+match_branch(char *br, char *pat)
{
char name[128];
@@ -221,7 +221,7 @@ got_match_branch(char *br, char *pat)
}
static const struct got_error *
-got_tokenize_refline(char **tokens, char *line, int len)
+tokenize_refline(char **tokens, char *line, int len)
{
const struct got_error *err = NULL;
char *p;
@@ -420,7 +420,7 @@ fetch_pack(int fd, int packfd, struct got_object_id *packid,
err = got_error_msg(GOT_ERR_FETCH_FAILED, msg);
goto done;
}
- err = got_tokenize_refline(sp, buf, n);
+ err = tokenize_refline(sp, buf, n);
if (err)
goto done;
if (chattygit && sp[2][0] != '\0')
@@ -440,7 +440,7 @@ fetch_pack(int fd, int packfd, struct got_object_id *packid,
is_firstpkt = 0;
if (strstr(sp[1], "^{}"))
continue;
- if (fetchbranch && !got_match_branch(sp[1], fetchbranch))
+ if (fetchbranch && !match_branch(sp[1], fetchbranch))
continue;
if (refsz == nref + 1) {
refsz *= 2;
@@ -552,7 +552,7 @@ fetch_pack(int fd, int packfd, struct got_object_id *packid,
err = got_error_from_errno("lseek");
goto done;
}
- if (got_check_pack_hash(packfd, packsz, packid->sha1) == -1)
+ if (check_pack_hash(packfd, packsz, packid->sha1) == -1)
err = got_error(GOT_ERR_BAD_PACKFILE);
done:
TAILQ_FOREACH(pe, &symrefs, entry) {