proxmox-mirrors/libgit2
1
0
Fork 0
mirror of https://git.proxmox.com/git/libgit2 synced 2025-08-12 05:26:05 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

index: use git_futils_readbuffer_updated

Browse Source 
This helps readability a bit as well.

Signed-off-by: Carlos Martín Nieto <cmn@elego.de>
This commit is contained in:
Carlos Martín Nieto 2011-07-23 13:57:06 +02:00
parent c498232812
commit 7db40d450d
1 changed files with 11 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/index.c
View File

@ -248,8 +248,9 @@ void git_index_clear(git_index *index)
int git_index_read(git_index *index) int git_index_read(git_index *index)
{ {
struct stat indexst; int error = GIT_SUCCESS, updated;
int error = GIT_SUCCESS; git_fbuffer buffer = GIT_FBUFFER_INIT;
time_t mtime;
assert(index->index_file_path); assert(index->index_file_path);
@ -259,30 +260,24 @@ int git_index_read(git_index *index)
return GIT_SUCCESS; return GIT_SUCCESS;
} }
if (p_stat(index->index_file_path, &indexst) < 0) /* We don't want to update the mtime if we fail to parse the index */
return git__throw(GIT_EOSERR, "Failed to read index. %s does not exist or is corrupted", index->index_file_path); mtime = index->last_modified;
error = git_futils_readbuffer_updated(&buffer, index->index_file_path, &mtime, &updated);
if (!S_ISREG(indexst.st_mode)) if (error < GIT_SUCCESS)
return git__throw(GIT_ENOTFOUND, "Failed to read index. %s is not an index file", index->index_file_path); return git__rethrow(error, "Failed to read index");
if (indexst.st_mtime != index->last_modified) {
git_fbuffer buffer;
if ((error = git_futils_readbuffer(&buffer, index->index_file_path)) < GIT_SUCCESS)
return git__rethrow(error, "Failed to read index");
if (updated) {
git_index_clear(index); git_index_clear(index);
error = parse_index(index, buffer.data, buffer.len); error = parse_index(index, buffer.data, buffer.len);
if (error == GIT_SUCCESS) if (error == GIT_SUCCESS)
index->last_modified = indexst.st_mtime; index->last_modified = mtime;
git_futils_freebuffer(&buffer); git_futils_freebuffer(&buffer);
} }
if (error < GIT_SUCCESS) if (error < GIT_SUCCESS)
return git__rethrow(error, "Failed to read index"); return git__rethrow(error, "Failed to parse index");
return error; return error;
} }