pack-bitmap.c: make pack_bitmap_filename() static
Reviewed-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano committed
Jan 14, 2015 at 15:40 UTC
cb4680500a3e72e0d5811659f9e4f46c8df91696
2 files changed
+14
-15
pack-bitmap.c
+14
-14
@@ -252,6 +252,20 @@ static int load_bitmap_entries_v1(struct bitmap_index *index)
252
return 0;
253
}
254
255
+static char *pack_bitmap_filename(struct packed_git *p)
256
+{
257
+ char *idx_name;
258
+ int len;
259
+
260
+ len = strlen(p->pack_name) - strlen(".pack");
261
+ idx_name = xmalloc(len + strlen(".bitmap") + 1);
262
+
263
+ memcpy(idx_name, p->pack_name, len);
264
+ memcpy(idx_name + len, ".bitmap", strlen(".bitmap") + 1);
265
+
266
+ return idx_name;
267
+}
268
+
269
static int open_pack_bitmap_1(struct packed_git *packfile)
270
{
271
int fd;
@@ -322,20 +336,6 @@ failed:
336
return -1;
337
}
338
325
-char *pack_bitmap_filename(struct packed_git *p)
326
-{
327
- char *idx_name;
328
- int len;
329
-
330
- len = strlen(p->pack_name) - strlen(".pack");
331
- idx_name = xmalloc(len + strlen(".bitmap") + 1);
332
-
333
- memcpy(idx_name, p->pack_name, len);
334
- memcpy(idx_name + len, ".bitmap", strlen(".bitmap") + 1);
335
-
336
- return idx_name;
337
-}
338
-
339
static int open_pack_bitmap(void)
340
{
341
struct packed_git *p;
pack-bitmap.h
-1
@@ -38,7 +38,6 @@ int prepare_bitmap_git(void);
38
void count_bitmap_commit_list(uint32_t *commits, uint32_t *trees, uint32_t *blobs, uint32_t *tags);
39
void traverse_bitmap_commit_list(show_reachable_fn show_reachable);
40
void test_bitmap_walk(struct rev_info *revs);
41
-char *pack_bitmap_filename(struct packed_git *p);
41
int prepare_bitmap_walk(struct rev_info *revs);
42
int reuse_partial_packfile_from_bitmap(struct packed_git **packfile, uint32_t *entries, off_t *up_to);
43
int rebuild_existing_bitmaps(struct packing_data *mapping, khash_sha1 *reused_bitmaps, int show_progress);