use oidcpy() for copying hashes between instances of struct object_id
Patch generated by Coccinelle and contrib/coccinelle/object_id.cocci. Signed-off-by: Rene Scharfe <l.s.r@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
René Scharfe committed
Jan 28, 2017 at 23:03 UTC
8694769f3ce9e77994a67e3ff8973dfe01fbe37c
2 files changed
+3
-3
refs/files-backend.c
+1
-1
@@ -697,7 +697,7 @@ static int cache_ref_iterator_peel(struct ref_iterator *ref_iterator,
697
698
if (peel_entry(entry, 0))
699
return -1;
700
- hashcpy(peeled->hash, entry->u.value.peeled.hash);
700
+ oidcpy(peeled, &entry->u.value.peeled);
701
return 0;
702
}
703
wt-status.c
+2
-2
@@ -628,7 +628,7 @@ static void wt_status_collect_changes_initial(struct wt_status *s)
628
d->index_status = DIFF_STATUS_ADDED;
629
/* Leave {mode,oid}_head zero for adds. */
630
d->mode_index = ce->ce_mode;
631
- hashcpy(d->oid_index.hash, ce->oid.hash);
631
+ oidcpy(&d->oid_index, &ce->oid);
632
}
633
}
634
}
@@ -2096,7 +2096,7 @@ static void wt_porcelain_v2_print_unmerged_entry(
2096
if (strcmp(ce->name, it->string) || !stage)
2097
break;
2098
stages[stage - 1].mode = ce->ce_mode;
2099
- hashcpy(stages[stage - 1].oid.hash, ce->oid.hash);
2099
+ oidcpy(&stages[stage - 1].oid, &ce->oid);
2100
sum |= (1 << (stage - 1));
2101
}
2102
if (sum != d->stagemask)