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

core: New ot_transfer_out_value() macro 

This makes out values considerably less typing.
This commit is contained in:
Colin Walters 2011-12-02 18:17:06 -05:00
parent 32c8166b25
commit 0003e101f6
7 changed files with 59 additions and 136 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

75
src/libostree/ostree-core.c
View File

@ -204,8 +204,7 @@ checksum_directory (GFile *f,
g_variant_get_size (packed)); g_variant_get_size (packed));
ret = TRUE; ret = TRUE;
*out_checksum = ret_checksum; ot_transfer_out_value(out_checksum, ret_checksum);
ret_checksum = NULL;
out: out:
ot_clear_checksum (&ret_checksum); ot_clear_checksum (&ret_checksum);
ot_clear_gvariant (&dirmeta); ot_clear_gvariant (&dirmeta);
@ -302,13 +301,14 @@ checksum_nondirectory (GFile *f,
g_checksum_update (content_and_meta_sha256, (guint8*)g_variant_get_data (xattrs), g_variant_get_size (xattrs)); g_checksum_update (content_and_meta_sha256, (guint8*)g_variant_get_data (xattrs), g_variant_get_size (xattrs));
} }
*out_checksum = content_and_meta_sha256; ot_transfer_out_value(out_checksum, content_and_meta_sha256);
ret = TRUE; ret = TRUE;
out: out:
g_clear_object (&input); g_clear_object (&input);
g_free (basename); g_free (basename);
ot_clear_gvariant (&xattrs); ot_clear_gvariant (&xattrs);
ot_clear_checksum (&content_sha256); ot_clear_checksum (&content_sha256);
ot_clear_checksum (&content_and_meta_sha256);
return ret; return ret;
} }
@ -344,10 +344,10 @@ ostree_checksum_file (GFile *f,
} }
ret = TRUE; ret = TRUE;
*out_checksum = ret_checksum; ot_transfer_out_value(out_checksum, ret_checksum);
ret_checksum = NULL;
out: out:
g_clear_object (&file_info); g_clear_object (&file_info);
ot_clear_checksum(&ret_checksum);
return ret; return ret;
} }
@ -507,11 +507,12 @@ ostree_parse_metadata_file (GFile *file,
ot_gfile_get_path_cached (file), ret_type); ot_gfile_get_path_cached (file), ret_type);
goto out; goto out;
} }
ot_util_variant_take_ref (ret_variant);
ret = TRUE; ret = TRUE;
if (out_type)
*out_type = ret_type; *out_type = ret_type;
*out_variant = ot_util_variant_take_ref (ret_variant); ot_transfer_out_value(out_variant, ret_variant);
ret_variant = NULL;
out: out:
ot_clear_gvariant (&ret_variant); ot_clear_gvariant (&ret_variant);
ot_clear_gvariant (&container); ot_clear_gvariant (&container);
@ -667,11 +668,7 @@ ostree_pack_file_for_input (GOutputStream *output,
} }
ret = TRUE; ret = TRUE;
if (out_checksum) ot_transfer_out_value(out_checksum, ret_checksum);
{
*out_checksum = ret_checksum;
ret_checksum = NULL;
}
out: out:
if (pack_builder_initialized) if (pack_builder_initialized)
g_variant_builder_clear (&pack_builder); g_variant_builder_clear (&pack_builder);
@ -745,11 +742,7 @@ unpack_meta (GFile *file,
goto out; goto out;
ret = TRUE; ret = TRUE;
if (out_checksum) ot_transfer_out_value(out_checksum, ret_checksum);
{
*out_checksum = ret_checksum;
ret_checksum = NULL;
}
out: out:
ot_clear_checksum (&ret_checksum); ot_clear_checksum (&ret_checksum);
g_clear_object (&in); g_clear_object (&in);
@ -876,21 +869,9 @@ ostree_parse_packed_file (GFile *file,
} }
ret = TRUE; ret = TRUE;
if (out_file_info) ot_transfer_out_value(out_file_info, ret_file_info);
{ ot_transfer_out_value(out_xattrs, ret_xattrs);
*out_file_info = ret_file_info; ot_transfer_out_value(out_content, in);
ret_file_info = NULL;
}
if (out_xattrs)
{
*out_xattrs = ret_xattrs;
ret_xattrs = NULL;
}
if (out_content)
{
*out_content = (GInputStream*)in;
in = NULL;
}
out: out:
g_clear_object (&ret_file_info); g_clear_object (&ret_file_info);
ot_clear_gvariant (&ret_xattrs); ot_clear_gvariant (&ret_xattrs);
@ -1028,11 +1009,7 @@ ostree_create_file_from_input (GFile *dest_file,
} }
ret = TRUE; ret = TRUE;
if (out_checksum) ot_transfer_out_value(out_checksum, ret_checksum);
{
*out_checksum = ret_checksum;
ret_checksum = NULL;
}
out: out:
if (!ret) if (!ret)
(void) unlink (dest_path); (void) unlink (dest_path);
@ -1146,16 +1123,8 @@ ostree_create_temp_file_from_input (GFile *dir,
} }
ret = TRUE; ret = TRUE;
if (out_checksum) ot_transfer_out_value(out_checksum, ret_checksum);
{ ot_transfer_out_value(out_file, possible_file);
*out_checksum = ret_checksum;
ret_checksum = NULL;
}
if (out_file)
{
*out_file = possible_file;
possible_file = NULL;
}
out: out:
if (rand) if (rand)
g_rand_free (rand); g_rand_free (rand);
@ -1190,10 +1159,8 @@ ostree_create_temp_regular_file (GFile *dir,
goto out; goto out;
ret = TRUE; ret = TRUE;
*out_file = ret_file; ot_transfer_out_value(out_file, ret_file);
ret_file = NULL; ot_transfer_out_value(out_stream, ret_stream);
*out_stream = ret_stream;
ret_stream = NULL;
out: out:
g_clear_object (&ret_file); g_clear_object (&ret_file);
g_clear_object (&ret_stream); g_clear_object (&ret_stream);
@ -1224,11 +1191,7 @@ unpack_file (GFile *file,
goto out; goto out;
ret = TRUE; ret = TRUE;
if (out_checksum) ot_transfer_out_value (out_checksum, ret_checksum);
{
*out_checksum = ret_checksum;
ret_checksum = NULL;
}
out: out:
g_clear_object (&finfo); g_clear_object (&finfo);
ot_clear_gvariant (&xattrs); ot_clear_gvariant (&xattrs);

9
src/libostree/ostree-repo-file.c
View File

@ -327,8 +327,7 @@ _ostree_repo_file_get_xattrs (OstreeRepoFile *self,
} }
ret = TRUE; ret = TRUE;
*out_xattrs = ret_xattrs; ot_transfer_out_value(out_xattrs, ret_xattrs);
ret_xattrs = NULL;
out: out:
ot_clear_gvariant (&ret_xattrs); ot_clear_gvariant (&ret_xattrs);
g_clear_object (&local_file); g_clear_object (&local_file);
@ -740,8 +739,7 @@ query_child_info_dir (OstreeRepo *repo,
} }
ret = TRUE; ret = TRUE;
*out_info = ret_info; ot_transfer_out_value(out_info, ret_info);
ret_info = NULL;
out: out:
g_clear_object (&ret_info); g_clear_object (&ret_info);
ot_clear_gvariant (&metadata); ot_clear_gvariant (&metadata);
@ -1089,8 +1087,7 @@ _ostree_repo_file_tree_query_child (OstreeRepoFile *self,
} }
ret = TRUE; ret = TRUE;
*out_info = ret_info; ot_transfer_out_value(out_info, ret_info);
ret_info = NULL;
out: out:
g_clear_object (&ret_info); g_clear_object (&ret_info);
g_clear_object (&local_child); g_clear_object (&local_child);

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

@ -239,8 +239,7 @@ parse_rev_file (OstreeRepo *self,
goto out; goto out;
} }
*sha256 = rev; ot_transfer_out_value(sha256, rev);
rev = NULL;
ret = TRUE; ret = TRUE;
out: out:
g_free (rev); g_free (rev);
@ -356,8 +355,7 @@ ostree_repo_resolve_rev (OstreeRepo *self,
} }
} }
*sha256 = ret_rev; ot_transfer_out_value(sha256, ret_rev);
ret_rev = NULL;
ret = TRUE; ret = TRUE;
out: out:
ot_clear_gvariant (&commit); ot_clear_gvariant (&commit);
@ -608,16 +606,8 @@ stage_and_checksum (OstreeRepo *self,
g_clear_object (&tmp_f); g_clear_object (&tmp_f);
ret = TRUE; ret = TRUE;
if (out_tmpname) ot_transfer_out_value(out_tmpname, ret_tmpname);
{ ot_transfer_out_value(out_checksum, ret_checksum);
*out_tmpname = ret_tmpname;
ret_tmpname = NULL;
}
if (out_checksum)
{
*out_checksum = ret_checksum;
ret_checksum = NULL;
}
out: out:
if (tmp_f) if (tmp_f)
(void) unlink (ot_gfile_get_path_cached (tmp_f)); (void) unlink (ot_gfile_get_path_cached (tmp_f));
@ -652,16 +642,8 @@ write_gvariant_to_tmp (OstreeRepo *self,
goto out; goto out;
ret = TRUE; ret = TRUE;
if (out_tmpname) ot_transfer_out_value(out_tmpname, ret_tmpname);
{ ot_transfer_out_value(out_checksum, ret_checksum);
*out_tmpname = ret_tmpname;
ret_tmpname = NULL;
}
if (out_checksum)
{
*out_checksum = ret_checksum;
ret_checksum = NULL;
}
out: out:
g_clear_object (&ret_tmpname); g_clear_object (&ret_tmpname);
ot_clear_checksum (&ret_checksum); ot_clear_checksum (&ret_checksum);
@ -691,8 +673,7 @@ import_gvariant_object (OstreeRepo *self,
goto out; goto out;
ret = TRUE; ret = TRUE;
*out_checksum = ret_checksum; ot_transfer_out_value(out_checksum, ret_checksum);
ret_checksum = NULL;
out: out:
(void) unlink (ot_gfile_get_path_cached (tmp_path)); (void) unlink (ot_gfile_get_path_cached (tmp_path));
g_clear_object (&tmp_path); g_clear_object (&tmp_path);
@ -723,8 +704,7 @@ ostree_repo_load_variant_checked (OstreeRepo *self,
} }
ret = TRUE; ret = TRUE;
*out_variant = ret_variant; ot_transfer_out_value(out_variant, ret_variant);
ret_variant = NULL;
out: out:
ot_clear_gvariant (&ret_variant); ot_clear_gvariant (&ret_variant);
return ret; return ret;
@ -749,11 +729,7 @@ import_directory_meta (OstreeRepo *self,
goto out; goto out;
ret = TRUE; ret = TRUE;
if (out_checksum) ot_transfer_out_value(out_checksum, ret_checksum);
{
*out_checksum = ret_checksum;
ret_checksum = NULL;
}
out: out:
ot_clear_checksum (&ret_checksum); ot_clear_checksum (&ret_checksum);
ot_clear_gvariant (&dirmeta); ot_clear_gvariant (&dirmeta);
@ -797,8 +773,7 @@ prepare_dir_for_checksum_get_object_path (OstreeRepo *self,
goto out; goto out;
ret = TRUE; ret = TRUE;
*out_file = ret_file; ot_transfer_out_value(out_file, ret_file);
ret_file = NULL;
out: out:
g_clear_object (&checksum_dir); g_clear_object (&checksum_dir);
g_clear_object (&ret_file); g_clear_object (&ret_file);
@ -996,8 +971,7 @@ ostree_repo_store_file (OstreeRepo *self,
} }
ret = TRUE; ret = TRUE;
*out_checksum = ret_checksum; ot_transfer_out_value(out_checksum, ret_checksum);
ret_checksum = NULL;
out: out:
if (temp_file) if (temp_file)
(void) unlink (ot_gfile_get_path_cached (temp_file)); (void) unlink (ot_gfile_get_path_cached (temp_file));
@ -1129,11 +1103,7 @@ import_commit (OstreeRepo *self,
goto out; goto out;
ret = TRUE; ret = TRUE;
if (out_commit) ot_transfer_out_value(out_commit, ret_commit);
{
*out_commit = ret_commit;
ret_commit = NULL;
}
out: out:
ot_clear_checksum (&ret_commit); ot_clear_checksum (&ret_commit);
ot_clear_gvariant (&commit); ot_clear_gvariant (&commit);
@ -1304,10 +1274,8 @@ import_directory_recurse (OstreeRepo *self,
cancellable, error)) cancellable, error))
goto out; goto out;
*out_metadata_checksum = ret_metadata_checksum; ot_transfer_out_value(out_metadata_checksum, ret_metadata_checksum);
ret_metadata_checksum = NULL; ot_transfer_out_value(out_contents_checksum, ret_contents_checksum);
*out_contents_checksum = ret_contents_checksum;
ret_contents_checksum = NULL;
ret = TRUE; ret = TRUE;
out: out:
g_clear_object (&dir_enum); g_clear_object (&dir_enum);
@ -1371,8 +1339,7 @@ ostree_repo_commit (OstreeRepo *self,
goto out; goto out;
ret = TRUE; ret = TRUE;
*out_commit = ret_commit_checksum; ot_transfer_out_value(out_commit, ret_commit_checksum);
ret_commit_checksum = NULL;
out: out:
ot_clear_checksum (&ret_commit_checksum); ot_clear_checksum (&ret_commit_checksum);
g_free (current_head); g_free (current_head);
@ -1538,9 +1505,9 @@ ostree_repo_load_variant (OstreeRepo *self,
goto out; goto out;
ret = TRUE; ret = TRUE;
if (out_type)
*out_type = ret_type; *out_type = ret_type;
*out_variant = ret_variant; ot_transfer_out_value(out_variant, ret_variant);
ret_variant = NULL;
out: out:
ot_clear_gvariant (&ret_variant); ot_clear_gvariant (&ret_variant);
g_clear_object (&f); g_clear_object (&f);
@ -1749,8 +1716,7 @@ get_file_checksum (GFile *f,
} }
ret = TRUE; ret = TRUE;
*out_checksum = ret_checksum; ot_transfer_out_value(out_checksum, ret_checksum);
ret_checksum = NULL;
out: out:
ot_clear_checksum (&tmp_checksum); ot_clear_checksum (&tmp_checksum);
return ret; return ret;
@ -1824,8 +1790,7 @@ diff_files (GFile *a,
} }
ret = TRUE; ret = TRUE;
*out_item = ret_item; ot_transfer_out_value(out_item, ret_item);
ret_item = NULL;
out: out:
if (ret_item) if (ret_item)
ostree_repo_diff_item_unref (ret_item); ostree_repo_diff_item_unref (ret_item);
@ -2059,8 +2024,7 @@ ostree_repo_read_commit (OstreeRepo *self,
goto out; goto out;
ret = TRUE; ret = TRUE;
*out_root = ret_root; ot_transfer_out_value(out_root, ret_root);
ret_root = NULL;
out: out:
g_free (resolved_rev); g_free (resolved_rev);
g_clear_object (&ret_root); g_clear_object (&ret_root);
@ -2090,12 +2054,9 @@ ostree_repo_diff (OstreeRepo *self,
goto out; goto out;
ret = TRUE; ret = TRUE;
*out_modified = ret_modified; ot_transfer_out_value(out_modified, ret_modified);
ret_modified = NULL; ot_transfer_out_value(out_removed, ret_removed);
*out_removed = ret_removed; ot_transfer_out_value(out_added, ret_added);
ret_removed = NULL;
*out_added = ret_added;
ret_added = NULL;
out: out:
if (ret_modified) if (ret_modified)
g_ptr_array_free (ret_modified, TRUE); g_ptr_array_free (ret_modified, TRUE);

6
src/libotutil/ot-gio-utils.c
View File

@ -186,11 +186,7 @@ ot_gio_splice_and_checksum (GOutputStream *out,
} }
ret = TRUE; ret = TRUE;
if (out_checksum) ot_transfer_out_value(out_checksum, ret_checksum);
{
*out_checksum = ret_checksum;
ret_checksum = NULL;
}
out: out:
ot_clear_checksum (&ret_checksum); ot_clear_checksum (&ret_checksum);
return ret; return ret;

5
src/libotutil/ot-unix-utils.c
View File

@ -22,7 +22,7 @@
#include "config.h" #include "config.h"
#include "ot-unix-utils.h" #include "otutil.h"
#include <gio/gio.h> #include <gio/gio.h>
#include <gio/gunixoutputstream.h> #include <gio/gunixoutputstream.h>
@ -67,8 +67,7 @@ ot_util_spawn_pager (GOutputStream **out_stream,
ret_stream = (GOutputStream*)g_unix_output_stream_new (stdin_fd, TRUE); ret_stream = (GOutputStream*)g_unix_output_stream_new (stdin_fd, TRUE);
} }
*out_stream = ret_stream; ot_transfer_out_value(out_stream, ret_stream);
ret_stream = NULL;
ret = TRUE; ret = TRUE;
out: out:
g_clear_object (&ret_stream); g_clear_object (&ret_stream);

3
src/libotutil/ot-variant-utils.c
View File

@ -114,8 +114,7 @@ ot_util_variant_map (GFile *src,
g_variant_ref_sink (ret_variant); g_variant_ref_sink (ret_variant);
ret = TRUE; ret = TRUE;
*out_variant = ret_variant; ot_transfer_out_value(out_variant, ret_variant);
ret_variant = NULL;
out: out:
ot_clear_gvariant (&ret_variant); ot_clear_gvariant (&ret_variant);
if (mfile) if (mfile)

8
src/libotutil/otutil.h
View File

@ -32,6 +32,14 @@
} \ } \
} G_STMT_END; } G_STMT_END;
#define ot_transfer_out_value(outp, srcp) G_STMT_START { \
if (outp) \
{ \
*outp = srcp; \
srcp = NULL; \
} \
} G_STMT_END;
#include <ot-gio-utils.h> #include <ot-gio-utils.h>
#include <ot-glib-compat.h> #include <ot-glib-compat.h>
#include <ot-opt-utils.h> #include <ot-opt-utils.h>