sha1_file: convert index_fd to struct object_id
Convert all remaining callers as well. Signed-off-by: Patryk Obara <patryk.obara@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Patryk Obara committed
Aug 20, 2017 at 22:09 UTC
e3506559d476ccf94c923c30a15500b46204e146
6 files changed
+11
-11
builtin/difftool.c
+1
-1
@@ -111,7 +111,7 @@ static int use_wt_file(const char *workdir, const char *name,
111
int fd = open(buf.buf, O_RDONLY);
112
113
if (fd >= 0 &&
114
- !index_fd(wt_oid.hash, fd, &st, OBJ_BLOB, name, 0)) {
114
+ !index_fd(&wt_oid, fd, &st, OBJ_BLOB, name, 0)) {
115
if (is_null_oid(oid)) {
116
oidcpy(oid, &wt_oid);
117
use = 1;
builtin/hash-object.c
+1
-1
@@ -38,7 +38,7 @@ static void hash_fd(int fd, const char *type, const char *path, unsigned flags,
38
if (fstat(fd, &st) < 0 ||
39
(literally
40
? hash_literally(&oid, fd, type, flags)
41
- : index_fd(oid.hash, fd, &st, type_from_string(type), path, flags)))
41
+ : index_fd(&oid, fd, &st, type_from_string(type), path, flags)))
42
die((flags & HASH_WRITE_OBJECT)
43
? "Unable to add %s to database"
44
: "Unable to hash %s", path);
builtin/replace.c
+1
-1
@@ -269,7 +269,7 @@ static void import_object(struct object_id *oid, enum object_type type,
269
270
if (fstat(fd, &st) < 0)
271
die_errno("unable to fstat %s", filename);
272
- if (index_fd(oid->hash, fd, &st, type, NULL, flags) < 0)
272
+ if (index_fd(oid, fd, &st, type, NULL, flags) < 0)
273
die("unable to write object to database");
274
/* index_fd close()s fd for us */
275
}
cache.h
+1
-1
@@ -684,7 +684,7 @@ extern int ie_modified(const struct index_state *, const struct cache_entry *, s
684
685
#define HASH_WRITE_OBJECT 1
686
#define HASH_FORMAT_CHECK 2
687
-extern int index_fd(unsigned char *sha1, int fd, struct stat *st, enum object_type type, const char *path, unsigned flags);
687
+extern int index_fd(struct object_id *oid, int fd, struct stat *st, enum object_type type, const char *path, unsigned flags);
688
extern int index_path(struct object_id *oid, const char *path, struct stat *st, unsigned flags);
689
690
/*
read-cache.c
+1
-1
@@ -161,7 +161,7 @@ static int ce_compare_data(const struct cache_entry *ce, struct stat *st)
161
162
if (fd >= 0) {
163
struct object_id oid;
164
- if (!index_fd(oid.hash, fd, st, OBJ_BLOB, ce->name, 0))
164
+ if (!index_fd(&oid, fd, st, OBJ_BLOB, ce->name, 0))
165
match = oidcmp(&oid, &ce->oid);
166
/* index_fd() closed the file descriptor already */
167
}
sha1_file.c
+6
-6
@@ -3662,7 +3662,7 @@ static int index_stream(unsigned char *sha1, int fd, size_t size,
3662
return index_bulk_checkin(sha1, fd, size, type, path, flags);
3663
}
3664
3665
-int index_fd(unsigned char *sha1, int fd, struct stat *st,
3665
+int index_fd(struct object_id *oid, int fd, struct stat *st,
3666
enum object_type type, const char *path, unsigned flags)
3667
{
3668
int ret;
@@ -3672,15 +3672,15 @@ int index_fd(unsigned char *sha1, int fd, struct stat *st,
3672
* die() for large files.
3673
*/
3674
if (type == OBJ_BLOB && path && would_convert_to_git_filter_fd(path))
3675
- ret = index_stream_convert_blob(sha1, fd, path, flags);
3675
+ ret = index_stream_convert_blob(oid->hash, fd, path, flags);
3676
else if (!S_ISREG(st->st_mode))
3677
- ret = index_pipe(sha1, fd, type, path, flags);
3677
+ ret = index_pipe(oid->hash, fd, type, path, flags);
3678
else if (st->st_size <= big_file_threshold || type != OBJ_BLOB ||
3679
(path && would_convert_to_git(&the_index, path)))
3680
- ret = index_core(sha1, fd, xsize_t(st->st_size), type, path,
3680
+ ret = index_core(oid->hash, fd, xsize_t(st->st_size), type, path,
3681
flags);
3682
else
3683
- ret = index_stream(sha1, fd, xsize_t(st->st_size), type, path,
3683
+ ret = index_stream(oid->hash, fd, xsize_t(st->st_size), type, path,
3684
flags);
3685
close(fd);
3686
return ret;
@@ -3696,7 +3696,7 @@ int index_path(struct object_id *oid, const char *path, struct stat *st, unsigne
3696
fd = open(path, O_RDONLY);
3697
if (fd < 0)
3698
return error_errno("open(\"%s\")", path);
3699
- if (index_fd(oid->hash, fd, st, OBJ_BLOB, path, flags) < 0)
3699
+ if (index_fd(oid, fd, st, OBJ_BLOB, path, flags) < 0)
3700
return error("%s: failed to insert into database",
3701
path);
3702
break;