undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'sh/use-hashcpy'

Browse Source 
* sh/use-hashcpy:
  Use hashcpy() when copying object names
This commit is contained in:
Junio C Hamano 2014-03-18 13:51:04 -07:00
commit 006f678780
5 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bundle.c
View File

@ -15,7 +15,7 @@ static void add_to_ref_list(const unsigned char *sha1, const char *name,
struct ref_list *list) struct ref_list *list)
{ {
ALLOC_GROW(list->list, list->nr + 1, list->alloc); ALLOC_GROW(list->list, list->nr + 1, list->alloc);
memcpy(list->list[list->nr].sha1, sha1, 20); hashcpy(list->list[list->nr].sha1, sha1);
list->list[list->nr].name = xstrdup(name); list->list[list->nr].name = xstrdup(name);
list->nr++; list->nr++;
} }

2
grep.c
View File

@ -1650,7 +1650,7 @@ void grep_source_init(struct grep_source *gs, enum grep_source_type type,
break; break;
case GREP_SOURCE_SHA1: case GREP_SOURCE_SHA1:
gs->identifier = xmalloc(20); gs->identifier = xmalloc(20);
memcpy(gs->identifier, identifier, 20); hashcpy(gs->identifier, identifier);
break; break;
case GREP_SOURCE_BUF: case GREP_SOURCE_BUF:
gs->identifier = NULL; gs->identifier = NULL;

2
pack-bitmap-write.c
View File

@ -530,7 +530,7 @@ void bitmap_writer_finish(struct pack_idx_entry **index,
header.version = htons(default_version); header.version = htons(default_version);
header.options = htons(flags | options); header.options = htons(flags | options);
header.entry_count = htonl(writer.selected_nr); header.entry_count = htonl(writer.selected_nr);
memcpy(header.checksum, writer.pack_checksum, 20); hashcpy(header.checksum, writer.pack_checksum);
sha1write(f, &header, sizeof(header)); sha1write(f, &header, sizeof(header));
dump_bitmap(f, writer.commits); dump_bitmap(f, writer.commits);

4
reflog-walk.c
View File

@ -28,8 +28,8 @@ static int read_one_reflog(unsigned char *osha1, unsigned char *nsha1,
ALLOC_GROW(array->items, array->nr + 1, array->alloc); ALLOC_GROW(array->items, array->nr + 1, array->alloc);
item = array->items + array->nr; item = array->items + array->nr;
memcpy(item->osha1, osha1, 20); hashcpy(item->osha1, osha1);
memcpy(item->nsha1, nsha1, 20); hashcpy(item->nsha1, nsha1);
item->email = xstrdup(email); item->email = xstrdup(email);
item->timestamp = timestamp; item->timestamp = timestamp;
item->tz = tz; item->tz = tz;

2
refs.c
View File

@ -1222,7 +1222,7 @@ static int resolve_gitlink_packed_ref(struct ref_cache *refs,
if (ref == NULL) if (ref == NULL)
return -1; return -1;
memcpy(sha1, ref->u.value.sha1, 20); hashcpy(sha1, ref->u.value.sha1);
return 0; return 0;
} }