Merge branch 'gl/cleanup-next'
* gl/cleanup-next: hashcpy/hashcmp remaining bits. Convert memcpy(a,b,20) to hashcpy(a,b).
This commit is contained in:
commit
5ff9d11409
@ -56,7 +56,7 @@ static int sha_eq(const unsigned char *a, const unsigned char *b)
|
||||
{
|
||||
if (!a && !b)
|
||||
return 2;
|
||||
return a && b && memcmp(a, b, 20) == 0;
|
||||
return a && b && hashcmp(a, b) == 0;
|
||||
}
|
||||
|
||||
/*
|
||||
@ -158,7 +158,7 @@ static struct cache_entry *make_cache_entry(unsigned int mode,
|
||||
size = cache_entry_size(len);
|
||||
ce = xcalloc(1, size);
|
||||
|
||||
memcpy(ce->sha1, sha1, 20);
|
||||
hashcpy(ce->sha1, sha1);
|
||||
memcpy(ce->name, path, len);
|
||||
ce->ce_flags = create_ce_flags(len, stage);
|
||||
ce->ce_mode = create_ce_mode(mode);
|
||||
@ -355,7 +355,7 @@ static struct path_list *get_unmerged(void)
|
||||
}
|
||||
e = item->util;
|
||||
e->stages[ce_stage(ce)].mode = ntohl(ce->ce_mode);
|
||||
memcpy(e->stages[ce_stage(ce)].sha, ce->sha1, 20);
|
||||
hashcpy(e->stages[ce_stage(ce)].sha, ce->sha1);
|
||||
}
|
||||
|
||||
return unmerged;
|
||||
@ -636,10 +636,10 @@ static struct merge_file_info merge_file(struct diff_filespec *o,
|
||||
result.clean = 0;
|
||||
if (S_ISREG(a->mode)) {
|
||||
result.mode = a->mode;
|
||||
memcpy(result.sha, a->sha1, 20);
|
||||
hashcpy(result.sha, a->sha1);
|
||||
} else {
|
||||
result.mode = b->mode;
|
||||
memcpy(result.sha, b->sha1, 20);
|
||||
hashcpy(result.sha, b->sha1);
|
||||
}
|
||||
} else {
|
||||
if (!sha_eq(a->sha1, o->sha1) && !sha_eq(b->sha1, o->sha1))
|
||||
@ -648,9 +648,9 @@ static struct merge_file_info merge_file(struct diff_filespec *o,
|
||||
result.mode = a->mode == o->mode ? b->mode: a->mode;
|
||||
|
||||
if (sha_eq(a->sha1, o->sha1))
|
||||
memcpy(result.sha, b->sha1, 20);
|
||||
hashcpy(result.sha, b->sha1);
|
||||
else if (sha_eq(b->sha1, o->sha1))
|
||||
memcpy(result.sha, a->sha1, 20);
|
||||
hashcpy(result.sha, a->sha1);
|
||||
else if (S_ISREG(a->mode)) {
|
||||
int code = 1, fd;
|
||||
struct stat st;
|
||||
@ -699,7 +699,7 @@ static struct merge_file_info merge_file(struct diff_filespec *o,
|
||||
if (!(S_ISLNK(a->mode) || S_ISLNK(b->mode)))
|
||||
die("cannot merge modes?");
|
||||
|
||||
memcpy(result.sha, a->sha1, 20);
|
||||
hashcpy(result.sha, a->sha1);
|
||||
|
||||
if (!sha_eq(a->sha1, b->sha1))
|
||||
result.clean = 0;
|
||||
@ -891,11 +891,9 @@ static int process_renames(struct path_list *a_renames,
|
||||
|
||||
remove_file(1, ren1_src);
|
||||
|
||||
memcpy(src_other.sha1,
|
||||
ren1->src_entry->stages[stage].sha, 20);
|
||||
hashcpy(src_other.sha1, ren1->src_entry->stages[stage].sha);
|
||||
src_other.mode = ren1->src_entry->stages[stage].mode;
|
||||
memcpy(dst_other.sha1,
|
||||
ren1->dst_entry->stages[stage].sha, 20);
|
||||
hashcpy(dst_other.sha1, ren1->dst_entry->stages[stage].sha);
|
||||
dst_other.mode = ren1->dst_entry->stages[stage].mode;
|
||||
|
||||
try_merge = 0;
|
||||
@ -980,7 +978,7 @@ static int process_renames(struct path_list *a_renames,
|
||||
|
||||
static unsigned char *has_sha(const unsigned char *sha)
|
||||
{
|
||||
return memcmp(sha, null_sha1, 20) == 0 ? NULL: (unsigned char *)sha;
|
||||
return is_null_sha1(sha) ? NULL: (unsigned char *)sha;
|
||||
}
|
||||
|
||||
/* Per entry merge function */
|
||||
@ -1096,11 +1094,11 @@ static int process_entry(const char *path, struct stage_data *entry,
|
||||
|
||||
output("Auto-merging %s", path);
|
||||
o.path = a.path = b.path = (char *)path;
|
||||
memcpy(o.sha1, o_sha, 20);
|
||||
hashcpy(o.sha1, o_sha);
|
||||
o.mode = o_mode;
|
||||
memcpy(a.sha1, a_sha, 20);
|
||||
hashcpy(a.sha1, a_sha);
|
||||
a.mode = a_mode;
|
||||
memcpy(b.sha1, b_sha, 20);
|
||||
hashcpy(b.sha1, b_sha);
|
||||
b.mode = b_mode;
|
||||
|
||||
mfi = merge_file(&o, &a, &b,
|
||||
|
Loading…
Reference in New Issue
Block a user