repo/checkout: Finish conversion to new code style #792
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
I plan to make some future changes here, and wanted to do this first. Random side note; how about converting the do/while loops for `EINTR` to `TEMP_FAILURE_RETRY()`? We're very inconsistent about that...
jlebon
reviewed
Apr 19, 2017
src/libostree/ostree-repo-checkout.c
Outdated
| checksum = ostree_repo_file_get_checksum ((OstreeRepoFile*)source); | ||
|
|
||
| is_whiteout = !is_symlink && options->process_whiteouts && | ||
| const gboolean is_symlink = g_file_info_get_file_type (source_info) == G_FILE_TYPE_SYMBOLIC_LINK; |
src/libostree/ostree-repo-checkout.c
Outdated
| is_whiteout = !is_symlink && options->process_whiteouts && | ||
| const gboolean is_symlink = g_file_info_get_file_type (source_info) == G_FILE_TYPE_SYMBOLIC_LINK; | ||
| const char *checksum = ostree_repo_file_get_checksum ((OstreeRepoFile*)source); | ||
| const gboolean is_whiteout = !is_symlink && options->process_whiteouts && |
There was a problem hiding this comment.
Note this was just a moved hunk 🧀, not net new code. But sure. Fixups ⬇️
|
|
||
| if (hardlink_res == HARDLINK_RESULT_LINKED && options->devino_to_csum_cache) | ||
| { | ||
| struct stat stbuf; | ||
| OstreeDevIno *key; | ||
|
|
||
|
|
||
| if (TEMP_FAILURE_RETRY (fstatat (destination_dfd, destination_name, &stbuf, AT_SYMLINK_NOFOLLOW)) != 0) |
There was a problem hiding this comment.
Re. your comment, I think my vote is for TEMP_FAILURE_RETRY. I find it easier to read (plus, it's even less boilerplate!).
src/libostree/ostree-repo-checkout.c
Outdated
| g_file_info_get_name (source_info), | ||
| cancellable, error); | ||
| goto out; | ||
| if (!checkout_one_file_at (self, options, |
There was a problem hiding this comment.
We can just return the value directly, right?
|
☀️ Test successful - status-atomicjenkins |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
I plan to make some future changes here, and wanted to do this
first.
Random side note; how about converting the do/while loops for
EINTRtoTEMP_FAILURE_RETRY()? We're very inconsistent about that...