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

libglnx porting: gs_fd_close -> glnx_fd_close 

I'd like to eventually kill libgsystem.
This commit is contained in:
Colin Walters 2016-03-17 10:17:47 -04:00
parent a02b425fc2
commit ac4c298061
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -795,7 +795,7 @@ meta_fetch_on_complete (GObject *object,
OstreeObjectType objtype; OstreeObjectType objtype;
GError *local_error = NULL; GError *local_error = NULL;
GError **error = &local_error; GError **error = &local_error;
gs_fd_close int fd = -1; glnx_fd_close int fd = -1;
ostree_object_name_deserialize (fetch_data->object, &checksum, &objtype); ostree_object_name_deserialize (fetch_data->object, &checksum, &objtype);
g_debug ("fetch of %s%s complete", ostree_object_to_string (checksum, objtype), g_debug ("fetch of %s%s complete", ostree_object_to_string (checksum, objtype),
@ -950,7 +950,7 @@ static_deltapart_fetch_on_complete (GObject *object,
g_autoptr(GVariant) part = NULL; g_autoptr(GVariant) part = NULL;
GError *local_error = NULL; GError *local_error = NULL;
GError **error = &local_error; GError **error = &local_error;
gs_fd_close int fd = -1; glnx_fd_close int fd = -1;
g_debug ("fetch static delta part %s complete", fetch_data->expected_checksum); g_debug ("fetch static delta part %s complete", fetch_data->expected_checksum);

2
src/libostree/ostree-repo-static-delta-compilation.c
View File

@ -456,7 +456,7 @@ get_unpacked_unlinked_content (OstreeRepo *repo,
{ {
gboolean ret = FALSE; gboolean ret = FALSE;
g_autofree char *tmpname = g_strdup ("tmpostree-deltaobj-XXXXXX"); g_autofree char *tmpname = g_strdup ("tmpostree-deltaobj-XXXXXX");
gs_fd_close int fd = -1; glnx_fd_close int fd = -1;
g_autoptr(GBytes) ret_content = NULL; g_autoptr(GBytes) ret_content = NULL;
g_autoptr(GInputStream) istream = NULL; g_autoptr(GInputStream) istream = NULL;
g_autoptr(GFileInfo) ret_finfo = NULL; g_autoptr(GFileInfo) ret_finfo = NULL;

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

@ -2884,7 +2884,7 @@ ostree_repo_load_file (OstreeRepo *self,
guint32 mode; guint32 mode;
g_autoptr(GVariant) metadata = NULL; g_autoptr(GVariant) metadata = NULL;
g_autoptr(GBytes) bytes = NULL; g_autoptr(GBytes) bytes = NULL;
gs_fd_close int fd = -1; glnx_fd_close int fd = -1;
bytes = ot_lgetxattrat (self->objects_dir_fd, loose_path_buf, bytes = ot_lgetxattrat (self->objects_dir_fd, loose_path_buf,
"user.ostreemeta", error); "user.ostreemeta", error);
@ -2943,7 +2943,7 @@ ostree_repo_load_file (OstreeRepo *self,
if (g_file_info_get_file_type (ret_file_info) == G_FILE_TYPE_REGULAR if (g_file_info_get_file_type (ret_file_info) == G_FILE_TYPE_REGULAR
&& (out_input || out_xattrs)) && (out_input || out_xattrs))
{ {
gs_fd_close int fd = -1; glnx_fd_close int fd = -1;
if (!gs_file_openat_noatime (self->objects_dir_fd, loose_path_buf, &fd, if (!gs_file_openat_noatime (self->objects_dir_fd, loose_path_buf, &fd,
cancellable, error)) cancellable, error))
@ -4630,7 +4630,7 @@ ostree_repo_regenerate_summary (OstreeRepo *self,
gs_free char *to = NULL; gs_free char *to = NULL;
gs_free guchar *csum = NULL; gs_free guchar *csum = NULL;
gs_free char *superblock = NULL; gs_free char *superblock = NULL;
gs_fd_close int superblock_file_fd = -1; glnx_fd_close int superblock_file_fd = -1;
g_autoptr(GInputStream) in_stream = NULL; g_autoptr(GInputStream) in_stream = NULL;
_ostree_parse_delta_name (delta_names->pdata[i], &from, &to); _ostree_parse_delta_name (delta_names->pdata[i], &from, &to);