Browse Source

[PATCH] Possible cleanups for local-pull.c

Hi. This patch contains the following possible cleanups:

 * Make some needlessly global functions in local-pull.c static
 * Change 'char *' to 'const char *' where appropriate

Signed-off-by: Peter Hagervall <hager@cs.umu.se>
Signed-off-by: Junio C Hamano <junkio@cox.net>
maint
Peter Hagervall 20 years ago committed by Junio C Hamano
parent
commit
2ab141a26f
  1. 2
      cache.h
  2. 10
      local-pull.c
  3. 2
      sha1_file.c

2
cache.h

@ -327,7 +327,7 @@ extern int get_ack(int fd, unsigned char *result_sha1); @@ -327,7 +327,7 @@ extern int get_ack(int fd, unsigned char *result_sha1);
extern struct ref **get_remote_heads(int in, struct ref **list, int nr_match, char **match);

extern struct packed_git *parse_pack_index(unsigned char *sha1);
extern struct packed_git *parse_pack_index_file(unsigned char *sha1,
extern struct packed_git *parse_pack_index_file(const unsigned char *sha1,
char *idx_path);

extern void prepare_packed_git(void);

10
local-pull.c

@ -17,7 +17,7 @@ void prefetch(unsigned char *sha1) @@ -17,7 +17,7 @@ void prefetch(unsigned char *sha1)

static struct packed_git *packs = NULL;

void setup_index(unsigned char *sha1)
static void setup_index(unsigned char *sha1)
{
struct packed_git *new_pack;
char filename[PATH_MAX];
@ -30,7 +30,7 @@ void setup_index(unsigned char *sha1) @@ -30,7 +30,7 @@ void setup_index(unsigned char *sha1)
packs = new_pack;
}

int setup_indices()
static int setup_indices(void)
{
DIR *dir;
struct dirent *de;
@ -49,7 +49,7 @@ int setup_indices() @@ -49,7 +49,7 @@ int setup_indices()
return 0;
}

int copy_file(const char *source, const char *dest, const char *hex)
static int copy_file(const char *source, const char *dest, const char *hex)
{
if (use_link) {
if (!link(source, dest)) {
@ -97,7 +97,7 @@ int copy_file(const char *source, const char *dest, const char *hex) @@ -97,7 +97,7 @@ int copy_file(const char *source, const char *dest, const char *hex)
return -1;
}

int fetch_pack(unsigned char *sha1)
static int fetch_pack(const unsigned char *sha1)
{
struct packed_git *target;
char filename[PATH_MAX];
@ -125,7 +125,7 @@ int fetch_pack(unsigned char *sha1) @@ -125,7 +125,7 @@ int fetch_pack(unsigned char *sha1)
return 0;
}

int fetch_file(unsigned char *sha1)
static int fetch_file(const unsigned char *sha1)
{
static int object_name_start = -1;
static char filename[PATH_MAX];

2
sha1_file.c

@ -487,7 +487,7 @@ struct packed_git *parse_pack_index(unsigned char *sha1) @@ -487,7 +487,7 @@ struct packed_git *parse_pack_index(unsigned char *sha1)
return parse_pack_index_file(sha1, path);
}

struct packed_git *parse_pack_index_file(unsigned char *sha1, char *idx_path)
struct packed_git *parse_pack_index_file(const unsigned char *sha1, char *idx_path)
{
struct packed_git *p;
unsigned long idx_size;

Loading…
Cancel
Save