mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

attr.c: extract read_index_data() as read_blob_data_from_index()

Browse Source 
Extract the read_index_data() function from attr.c and move it to
read-cache.c; rename it to read_blob_data_from_index() and update
the function signature of it to align better with index/cache API
functions.

This allows for reusing the function in convert.c later.

Signed-off-by: Lukas Fleischer <git@cryptocrack.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Lukas Fleischer
2013-04-13 15:28:30 +02:00
committed by Junio C Hamano
parent 04a74b6cfa
commit 29fb37b272
3 changed files with 35 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
read-cache.c
View File

@ -1895,3 +1895,35 @@ int index_name_is_other(const struct index_state *istate, const char *name,
}
return 1;
}
void *read_blob_data_from_index(struct index_state *istate, const char *path)
{
int pos, len;
unsigned long sz;
enum object_type type;
void *data;
len = strlen(path);
pos = index_name_pos(istate, path, len);
if (pos < 0) {
/*
* We might be in the middle of a merge, in which
* case we would read stage #2 (ours).
*/
int i;
for (i = -pos - 1;
(pos < 0 && i < istate->cache_nr &&
!strcmp(istate->cache[i]->name, path));
i++)
if (ce_stage(istate->cache[i]) == 2)
pos = i;
}
if (pos < 0)
return NULL;
data = read_sha1_file(istate->cache[pos]->sha1, &type, &sz);
if (!data || type != OBJ_BLOB) {
free(data);
return NULL;
}
return data;
}