From: Junio C Hamano <junkio@cox.net>
To: Linus Torvalds <torvalds@osdl.org>
Cc: git@vger.kernel.org
Subject: [PATCH] Remove unused arguments from index_fd()
Date: Sun, 17 Apr 2005 03:31:00 -0700 [thread overview]
Message-ID: <7vu0m5wv8b.fsf@assigned-by-dhcp.cox.net> (raw)
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>
---
update-cache.c | 15 ++++++---------
1 files changed, 6 insertions(+), 9 deletions(-)
update-cache.c: 5afecd1a4fd90d2505753ce2d5044d780fe69a7f
--- update-cache.c
+++ update-cache.c 2005-04-17 03:22:39.000000000 -0700
@@ -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 @@
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 @@
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 @@
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);
reply other threads:[~2005-04-17 10:27 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=7vu0m5wv8b.fsf@assigned-by-dhcp.cox.net \
--to=junkio@cox.net \
--cc=git@vger.kernel.org \
--cc=torvalds@osdl.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox