shaba/ostree
1
0
Fork 0
mirror of https://github.com/ostreedev/ostree.git synced 2025-01-09 01:18:35 +03:00
Code Issues Projects Releases Wiki Activity

repo: Deduplicate some code in load_file

Browse Source
This commit is contained in:
Colin Walters 2015-01-12 12:10:02 -05:00
parent 865fab7653
commit 25a5909500
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/libostree/ostree-repo.c
View File

@ -1875,18 +1875,18 @@ ostree_repo_load_file (OstreeRepo *self,
gs_unref_object GInputStream *ret_input = NULL; gs_unref_object GInputStream *ret_input = NULL;
gs_unref_object GFileInfo *ret_file_info = NULL; gs_unref_object GFileInfo *ret_file_info = NULL;
gs_unref_variant GVariant *ret_xattrs = NULL; gs_unref_variant GVariant *ret_xattrs = NULL;
char loose_path_buf[_OSTREE_LOOSE_PATH_MAX];
repo_mode = ostree_repo_get_mode (self); repo_mode = ostree_repo_get_mode (self);
_ostree_loose_path (loose_path_buf, checksum, OSTREE_OBJECT_TYPE_FILE, repo_mode);
if (repo_mode == OSTREE_REPO_MODE_ARCHIVE_Z2) if (repo_mode == OSTREE_REPO_MODE_ARCHIVE_Z2)
{ {
char loose_path_buf[_OSTREE_LOOSE_PATH_MAX];
int fd = -1; int fd = -1;
struct stat stbuf; struct stat stbuf;
gs_unref_object GInputStream *tmp_stream = NULL; gs_unref_object GInputStream *tmp_stream = NULL;
_ostree_loose_path (loose_path_buf, checksum, OSTREE_OBJECT_TYPE_FILE, self->mode);
if (!openat_allow_noent (self->objects_dir_fd, loose_path_buf, &fd, if (!openat_allow_noent (self->objects_dir_fd, loose_path_buf, &fd,
cancellable, error)) cancellable, error))
goto out; goto out;
@ -1911,10 +1911,6 @@ ostree_repo_load_file (OstreeRepo *self,
} }
else else
{ {
char loose_path_buf[_OSTREE_LOOSE_PATH_MAX];
_ostree_loose_path (loose_path_buf, checksum, OSTREE_OBJECT_TYPE_FILE, self->mode);
if (!query_info_for_bare_content_object (self, loose_path_buf, if (!query_info_for_bare_content_object (self, loose_path_buf,
&ret_file_info, &ret_file_info,
cancellable, error)) cancellable, error))