Skip to content

Commit

Permalink
sha1_file: make "read_object" static
Browse files Browse the repository at this point in the history
This function is only used from "sha1_file.c".

And as we want to add a "replace_object" hook in "read_sha1_file",
we must not let people bypass the hook using something other than
"read_sha1_file".

Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information
Christian Couder authored and Junio C Hamano committed Jan 13, 2009
1 parent abc776f commit c2c5b27
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
3 changes: 0 additions & 3 deletions cache.h
Original file line number Diff line number Diff line change
Expand Up @@ -631,9 +631,6 @@ extern int write_sha1_file(void *buf, unsigned long len, const char *type, unsig
extern int pretend_sha1_file(void *, unsigned long, enum object_type, unsigned char *);
extern int force_object_loose(const unsigned char *sha1, time_t mtime);

/* just like read_sha1_file(), but non fatal in presence of bad objects */
extern void *read_object(const unsigned char *sha1, enum object_type *type, unsigned long *size);

/* global flag to enable extra checks when accessing packed objects */
extern int do_check_packed_object_crc;

Expand Down
7 changes: 5 additions & 2 deletions sha1_file.c
Original file line number Diff line number Diff line change
Expand Up @@ -1700,6 +1700,9 @@ static void add_delta_base_cache(struct packed_git *p, off_t base_offset,
delta_base_cache_lru.prev = &ent->lru;
}

static void *read_object(const unsigned char *sha1, enum object_type *type,
unsigned long *size);

static void *unpack_delta_entry(struct packed_git *p,
struct pack_window **w_curs,
off_t curpos,
Expand Down Expand Up @@ -2130,8 +2133,8 @@ int pretend_sha1_file(void *buf, unsigned long len, enum object_type type,
return 0;
}

void *read_object(const unsigned char *sha1, enum object_type *type,
unsigned long *size)
static void *read_object(const unsigned char *sha1, enum object_type *type,
unsigned long *size)
{
unsigned long mapsize;
void *map, *buf;
Expand Down

0 comments on commit c2c5b27

Please sign in to comment.