summaryrefslogtreecommitdiff
path: root/update-cache.c
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2005-04-17 17:02:22 (GMT)
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-04-17 17:02:22 (GMT)
commitc747fc6facdbbde4386418cfe6ad7e231a1b4eaf (patch)
tree47b1c42d316f9eace8e55e2b8d5336e0cbfcbb3e /update-cache.c
parenta38800fde24a44b12a9ed14852339466de1cb9c9 (diff)
downloadgit-c747fc6facdbbde4386418cfe6ad7e231a1b4eaf.zip
git-c747fc6facdbbde4386418cfe6ad7e231a1b4eaf.tar.gz
git-c747fc6facdbbde4386418cfe6ad7e231a1b4eaf.tar.bz2
[PATCH] Remove unused arguments from index_fd()
The function index_fd() in update-cache.c takes 5 arguments, but two is not necessary and one that is a pointer to a structure really needs to be a pointer to one member of that structure. This patch cleans it up. Also it removes printf() apparently left after initial debugging. Signed-off-by: Junio C Hamano <junkio@cox.net> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'update-cache.c')
-rw-r--r--update-cache.c15
1 files changed, 6 insertions, 9 deletions
diff --git a/update-cache.c b/update-cache.c
index 7d1d8e5..7c3a143 100644
--- a/update-cache.c
+++ b/update-cache.c
@@ -14,13 +14,13 @@
*/
static int allow_add = 0, allow_remove = 0;
-static int index_fd(const char *path, int namelen, struct cache_entry *ce, int fd, struct stat *st)
+static int index_fd(unsigned char *sha1, int fd, struct stat *st)
{
z_stream stream;
unsigned long size = st->st_size;
- int max_out_bytes = namelen + size + 200;
+ int max_out_bytes = size + 200;
void *out = malloc(max_out_bytes);
- void *metadata = malloc(namelen + 200);
+ void *metadata = malloc(200);
void *in;
SHA_CTX c;
@@ -56,9 +56,9 @@ static int index_fd(const char *path, int namelen, struct cache_entry *ce, int f
SHA1_Init(&c);
SHA1_Update(&c, out, stream.total_out);
- SHA1_Final(ce->sha1, &c);
+ SHA1_Final(sha1, &c);
- return write_sha1_buffer(ce->sha1, out, stream.total_out);
+ return write_sha1_buffer(sha1, out, stream.total_out);
}
/*
@@ -109,7 +109,7 @@ static int add_file_to_cache(char *path)
ce->ce_mode = create_ce_mode(st.st_mode);
ce->ce_flags = htons(namelen);
- if (index_fd(path, namelen, ce, fd, &st) < 0)
+ if (index_fd(ce->sha1, fd, &st) < 0)
return -1;
return add_cache_entry(ce, allow_add);
@@ -244,13 +244,10 @@ static int add_cacheinfo(char *arg1, char *arg2, char *arg3)
if (sscanf(arg1, "%o", &mode) != 1)
return -1;
- printf("got mode %o\n", mode);
if (get_sha1_hex(arg2, sha1))
return -1;
- printf("got sha1 %s\n", sha1_to_hex(sha1));
if (!verify_path(arg3))
return -1;
- printf("got path %s\n", arg3);
len = strlen(arg3);
size = cache_entry_size(len);