packaging
/
ostree
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

lib: Drop GFiles for self->{objects_dir,state_dir} 

Everything that used to reference these is now fd-relative.

Closes: #432
Approved by: giuseppe
This commit is contained in:
Colin Walters 2016-08-04 21:31:39 -04:00 committed by Atomic Bot
parent 308c75e281
commit 18a576c390
2 changed files with 0 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/libostree/ostree-repo-private.h
View File

@ -73,8 +73,6 @@ struct OstreeRepo {
int tmp_dir_fd; int tmp_dir_fd;
int cache_dir_fd; int cache_dir_fd;
char *cache_dir; char *cache_dir;
GFile *objects_dir;
GFile *state_dir;
int objects_dir_fd; int objects_dir_fd;
GFile *deltas_dir; GFile *deltas_dir;
GFile *uncompressed_objects_dir; GFile *uncompressed_objects_dir;

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

@ -520,11 +520,9 @@ ostree_repo_finalize (GObject *object)
(void) close (self->tmp_dir_fd); (void) close (self->tmp_dir_fd);
if (self->cache_dir_fd) if (self->cache_dir_fd)
(void) close (self->cache_dir_fd); (void) close (self->cache_dir_fd);
g_clear_object (&self->objects_dir);
if (self->objects_dir_fd != -1) if (self->objects_dir_fd != -1)
(void) close (self->objects_dir_fd); (void) close (self->objects_dir_fd);
g_clear_object (&self->deltas_dir); g_clear_object (&self->deltas_dir);
g_clear_object (&self->state_dir);
g_clear_object (&self->uncompressed_objects_dir); g_clear_object (&self->uncompressed_objects_dir);
if (self->uncompressed_objects_dir_fd != -1) if (self->uncompressed_objects_dir_fd != -1)
(void) close (self->uncompressed_objects_dir_fd); (void) close (self->uncompressed_objects_dir_fd);
@ -613,10 +611,8 @@ ostree_repo_constructed (GObject *object)
self->tmp_dir = g_file_resolve_relative_path (self->repodir, "tmp"); self->tmp_dir = g_file_resolve_relative_path (self->repodir, "tmp");
self->objects_dir = g_file_get_child (self->repodir, "objects");
self->deltas_dir = g_file_get_child (self->repodir, "deltas"); self->deltas_dir = g_file_get_child (self->repodir, "deltas");
self->uncompressed_objects_dir = g_file_get_child (self->repodir, "uncompressed-objects-cache"); self->uncompressed_objects_dir = g_file_get_child (self->repodir, "uncompressed-objects-cache");
self->state_dir = g_file_get_child (self->repodir, "state");
self->config_file = g_file_get_child (self->repodir, "config"); self->config_file = g_file_get_child (self->repodir, "config");
/* Ensure the "sysroot-path" property is set. */ /* Ensure the "sysroot-path" property is set. */