Assign skip to the right variable type #2572
Open
Conversation
This file contains hidden or 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
This is for consistency with file_skip in both implementations. Furthermore, just calculate skip_bits in the branch where the calculation is used. Chances are, the compiler may have done this anyway, but it is good just in case.
kientzle
reviewed
Apr 11, 2025
| @@ -131,15 +131,22 @@ static int64_t | |||
| file_skip(struct archive *a, void *client_data, int64_t request) | |||
| { | |||
| struct read_fd_data *mine = (struct read_fd_data *)client_data; | |||
| #if HAVE__FSEEKI64 | |||
There was a problem hiding this comment.
This isn't needed here. This module works with a file descriptor, so lseek() is appropriate on all platforms. This logic is only needed in archive_read_open_file.c because it works with a FILE handle and those APIs do vary across platforms.
kientzle
reviewed
Apr 11, 2025
|
|
||
| if (!mine->use_lseek) | ||
| return (0); | ||
|
|
||
| /* Reduce a request that would overflow the 'skip' variable. */ | ||
| if (sizeof(request) > sizeof(skip)) { | ||
| const int skip_bits = sizeof(skip) * 8 - 1; /* off_t is a signed type. */ |
There was a problem hiding this comment.
Moving this definition closer to where it's used is a nice change.
|
Please remove the unnecessary change. |
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.
This is for consistency with file_skip in both implementations.
Furthermore, just calculate skip_bits in the branch where the calculation is used. Chances are, the compiler may have done this anyway, but it is good just in case.