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

libglnx porting: gs_free -> g_autofree 

There were surprisingly few uses left.
This commit is contained in:
Colin Walters 2016-03-17 10:19:12 -04:00
parent ac4c298061
commit 684029daa3
5 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/libostree/ostree-kernel-args.c
View File

@ -65,7 +65,7 @@ _ostree_kernel_args_new (void)
}
void
_ostree_kernel_args_free (OstreeKernelArgs *kargs)
_ostree_kernel_arg_autofree (OstreeKernelArgs *kargs)
{
if (!kargs)
return;
@ -77,7 +77,7 @@ _ostree_kernel_args_free (OstreeKernelArgs *kargs)
void
_ostree_kernel_args_cleanup (void *loc)
{
_ostree_kernel_args_free (*((OstreeKernelArgs**)loc));
_ostree_kernel_arg_autofree (*((OstreeKernelArgs**)loc));
}
void

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

@ -1399,8 +1399,8 @@ request_static_delta_superblock_sync (OtPullData *pull_data,
if (delta_superblock_data)
{
{
gs_free gchar *delta = NULL;
gs_free guchar *ret_csum = NULL;
g_autofree gchar *delta = NULL;
g_autofree guchar *ret_csum = NULL;
guchar *summary_csum;
g_autoptr (GInputStream) summary_is = NULL;

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

@ -4626,10 +4626,10 @@ ostree_repo_regenerate_summary (OstreeRepo *self,
g_variant_dict_init (&deltas_builder, NULL);
for (i = 0; i < delta_names->len; i++)
{
gs_free char *from = NULL;
gs_free char *to = NULL;
gs_free guchar *csum = NULL;
gs_free char *superblock = NULL;
g_autofree char *from = NULL;
g_autofree char *to = NULL;
g_autofree guchar *csum = NULL;
g_autofree char *superblock = NULL;
glnx_fd_close int superblock_file_fd = -1;
g_autoptr(GInputStream) in_stream = NULL;

4
src/libostree/ostree-sysroot-deploy.c
View File

@ -941,8 +941,8 @@ get_kernel_from_tree (int deployment_dfd,
g_auto(GLnxDirFdIterator) dfditer = { 0, };
g_autofree char *ret_kernel_name = NULL;
g_autofree char *ret_initramfs_name = NULL;
gs_free char *kernel_checksum = NULL;
gs_free char *initramfs_checksum = NULL;
g_autofree char *kernel_checksum = NULL;
g_autofree char *initramfs_checksum = NULL;
ret_boot_dfd = glnx_opendirat_with_errno (deployment_dfd, "usr/lib/ostree-boot", TRUE);
if (ret_boot_dfd == -1)

12
tests/test-checksum.c
View File

@ -31,24 +31,24 @@ static void
test_ostree_parse_delta_name (void)
{
{
gs_free char *from;
gs_free char *to;
g_autofree char *from;
g_autofree char *to;
_ostree_parse_delta_name ("30d13b73cfe1e6988ffc345eac905f82a18def8ef1f0666fc392019e9eac388d", &from, &to);
g_assert_cmpstr (to, ==, "30d13b73cfe1e6988ffc345eac905f82a18def8ef1f0666fc392019e9eac388d");
g_assert_null (from);
}
{
gs_free char *from;
gs_free char *to;
g_autofree char *from;
g_autofree char *to;
_ostree_parse_delta_name ("30d13b73cfe1e6988ffc345eac905f82a18def8ef1f0666fc392019e9eac388d-5891b5b522d5df086d0ff0b110fbd9d21bb4fc7163af34d08286a2e846f6be03", &from, &to);
g_assert_cmpstr (from, ==, "30d13b73cfe1e6988ffc345eac905f82a18def8ef1f0666fc392019e9eac388d");
g_assert_cmpstr (to, ==, "5891b5b522d5df086d0ff0b110fbd9d21bb4fc7163af34d08286a2e846f6be03");
}
{
gs_free char *from;
gs_free char *to;
g_autofree char *from;
g_autofree char *to;
_ostree_parse_delta_name ("", &from, &to);
g_assert_null (from);
g_assert_null (to);