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

mtree: Use declare-and-initialize style

Browse Source 
Prep for further work.
This commit is contained in:
Colin Walters
2022-02-18 10:22:26 -05:00
parent 4066b0ab45
commit 929f62c59e
1 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/libostree/ostree-mutable-tree.c
View File

@ -463,13 +463,11 @@ ostree_mutable_tree_ensure_parent_dirs (OstreeMutableTree *self,
OstreeMutableTree *subdir = self; /* nofree */ OstreeMutableTree *subdir = self; /* nofree */
for (guint i = 0; i+1 < split_path->len; i++) for (guint i = 0; i+1 < split_path->len; i++)
{ {
OstreeMutableTree *next;
const char *name = split_path->pdata[i]; const char *name = split_path->pdata[i];
if (g_hash_table_lookup (subdir->files, name)) if (g_hash_table_lookup (subdir->files, name))
return glnx_throw (error, "Can't replace file with directory: %s", name); return glnx_throw (error, "Can't replace file with directory: %s", name);
next = g_hash_table_lookup (subdir->subdirs, name); OstreeMutableTree *next = g_hash_table_lookup (subdir->subdirs, name);
if (!next) if (!next)
{ {
invalidate_contents_checksum (subdir); invalidate_contents_checksum (subdir);
@ -580,11 +578,9 @@ ostree_mutable_tree_walk (OstreeMutableTree *self,
} }
else else
{ {
OstreeMutableTree *subdir;
if (!_ostree_mutable_tree_make_whole (self, NULL, error)) if (!_ostree_mutable_tree_make_whole (self, NULL, error))
return FALSE; return FALSE;
OstreeMutableTree *subdir = g_hash_table_lookup (self->subdirs, split_path->pdata[start]);
subdir = g_hash_table_lookup (self->subdirs, split_path->pdata[start]);
if (!subdir) if (!subdir)
return set_error_noent (error, (char*)split_path->pdata[start]); return set_error_noent (error, (char*)split_path->pdata[start]);