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

libglnx porting: Migrate to glnx_stream_fstat() 

I ended up deciding to move this one into libglnx, seems like
something other libglnx-using software might want to do, even though
xdg-app doesn't right now.

Closes: #282
Approved by: jlebon
This commit is contained in:
Colin Walters 2016-05-03 17:24:25 -04:00 committed by Colin Walters (automation)
parent 5a90781cd8
commit 6724519080
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libglnx

@ -1 +1 @@
Subproject commit 47ddbfa56341df3a9453854e1101e1c2f2359ddb Subproject commit 3d162e772db80f6664a78583268150d2e1d1d29e

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

@ -613,7 +613,7 @@ ostree_content_file_parse_at (gboolean compressed,
cancellable, error)) cancellable, error))
goto out; goto out;
if (!gs_stream_fstat ((GFileDescriptorBased*)file_input, &stbuf, cancellable, error)) if (!glnx_stream_fstat ((GFileDescriptorBased*)file_input, &stbuf, error))
goto out; goto out;
if (!ostree_content_stream_parse (compressed, file_input, stbuf.st_size, trusted, if (!ostree_content_stream_parse (compressed, file_input, stbuf.st_size, trusted,

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

@ -1067,7 +1067,7 @@ _ostree_fetcher_bytes_transferred (OstreeFetcher *self)
if (G_IS_FILE_DESCRIPTOR_BASED (stream)) if (G_IS_FILE_DESCRIPTOR_BASED (stream))
{ {
if (gs_stream_fstat ((GFileDescriptorBased*)stream, &stbuf, NULL, NULL)) if (glnx_stream_fstat ((GFileDescriptorBased*)stream, &stbuf, NULL))
ret += stbuf.st_size; ret += stbuf.st_size;
} }
} }

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

@ -2925,7 +2925,7 @@ load_metadata_internal (OstreeRepo *self,
{ {
struct stat stbuf; struct stat stbuf;
if (!gs_stream_fstat ((GFileDescriptorBased*)ret_stream, &stbuf, cancellable, error)) if (!glnx_stream_fstat ((GFileDescriptorBased*)ret_stream, &stbuf, error))
goto out; goto out;
*out_size = stbuf.st_size; *out_size = stbuf.st_size;
} }
@ -3100,8 +3100,8 @@ ostree_repo_load_file (OstreeRepo *self,
tmp_stream = g_unix_input_stream_new (fd, TRUE); tmp_stream = g_unix_input_stream_new (fd, TRUE);
fd = -1; /* Transfer ownership */ fd = -1; /* Transfer ownership */
if (!gs_stream_fstat ((GFileDescriptorBased*) tmp_stream, &stbuf, if (!glnx_stream_fstat ((GFileDescriptorBased*) tmp_stream, &stbuf,
cancellable, error)) error))
goto out; goto out;
if (!ostree_content_stream_parse (TRUE, tmp_stream, stbuf.st_size, TRUE, if (!ostree_content_stream_parse (TRUE, tmp_stream, stbuf.st_size, TRUE,