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

core: Remove ot_clear_checksum() in favor of g_clear_pointer()

This commit is contained in:
Colin Walters 2012-07-17 08:08:57 -04:00
parent c8d7fc216d
commit 57fcafd1ab
4 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -563,7 +563,7 @@ ostree_checksum_file_from_input (GFileInfo *file_info,
ret = TRUE; ret = TRUE;
ot_transfer_out_value (out_csum, &ret_csum); ot_transfer_out_value (out_csum, &ret_csum);
out: out:
ot_clear_checksum (&checksum); g_clear_pointer (&checksum, (GDestroyNotify)g_checksum_free);
return ret; return ret;
} }

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

@ -1056,7 +1056,7 @@ stage_object_internal (OstreeRepo *self,
(void) unlink (ot_gfile_get_path_cached (temp_file)); (void) unlink (ot_gfile_get_path_cached (temp_file));
if (raw_temp_file) if (raw_temp_file)
(void) unlink (ot_gfile_get_path_cached (raw_temp_file)); (void) unlink (ot_gfile_get_path_cached (raw_temp_file));
ot_clear_checksum (&checksum); g_clear_pointer (&checksum, (GDestroyNotify) g_checksum_free);
return ret; return ret;
} }

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

@ -336,7 +336,7 @@ ot_gio_splice_get_checksum (GOutputStream *out,
ret = TRUE; ret = TRUE;
ot_transfer_out_value (out_csum, &ret_csum); ot_transfer_out_value (out_csum, &ret_csum);
out: out:
ot_clear_checksum (&checksum); g_clear_pointer (&checksum, (GDestroyNotify) g_checksum_free);
return ret; return ret;
} }

8
src/libotutil/otutil.h
View File

@ -26,14 +26,6 @@
#include <gio/gio.h> #include <gio/gio.h>
#define ot_gobject_refz(o) (o ? g_object_ref (o) : o) #define ot_gobject_refz(o) (o ? g_object_ref (o) : o)
#define ot_clear_checksum(c) G_STMT_START { \
typeof(c) __tmp_chksum = c; \
if (__tmp_chksum) \
{ \
g_checksum_free (*__tmp_chksum); \
*__tmp_chksum = NULL; \
} \
} G_STMT_END;
#define ot_transfer_out_value(outp, srcp) G_STMT_START { \ #define ot_transfer_out_value(outp, srcp) G_STMT_START { \
if (outp) \ if (outp) \