Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

timeouts: move ms timeouts to timediff_t from int and long #5490

Closed
wants to merge 1 commit into from

Conversation

@mback2k
Copy link
Member

@mback2k mback2k commented May 30, 2020

Now that all functions in select.[ch] take timediff_t instead
of the limited time_t or int, we can remove type conversions
and related preprocessor checks to silence compiler warnings.

@mback2k mback2k requested a review from bagder May 30, 2020
@mback2k mback2k force-pushed the mback2k:conv-timediff_t branch from f68803c to b5cb158 May 30, 2020
mback2k added a commit to mback2k/curl that referenced this pull request May 30, 2020
Now that all functions in select.[ch] take timediff_t instead
of the limited time_t or int, we can remove type conversions
and related preprocessor checks to silence compiler warnings.

Taken from curl#5262
Supersedes curl#5214, curl#5220 and curl#5221
Follow up to curl#5343
Closes curl#5490
@mback2k mback2k self-assigned this May 30, 2020
@mback2k mback2k added the tidy-up label May 30, 2020
@bagder
Copy link
Member

@bagder bagder commented May 30, 2020

This looks like a pretty wide overlap with #5479 ...

@bagder
Copy link
Member

@bagder bagder commented May 30, 2020

I propose I merge that first and then you can rebase this to remove the duplicates and we can focus on what isn't overlaps!

@mback2k
Copy link
Member Author

@mback2k mback2k commented May 30, 2020

This looks like a pretty wide overlap with #5479 ...

Looks like that. I just took this from my now obsolete old PR #5262.

@mback2k
Copy link
Member Author

@mback2k mback2k commented May 30, 2020

I propose I merge that first and then you can rebase this to remove the duplicates and we can focus on what isn't overlaps!

I am fine with that. Thanks!

@bagder
bagder approved these changes May 31, 2020
@mback2k mback2k force-pushed the mback2k:conv-timediff_t branch from b5cb158 to 64c4883 May 31, 2020
mback2k added a commit to mback2k/curl that referenced this pull request May 31, 2020
Now that all functions in select.[ch] take timediff_t instead
of the limited time_t or int, we can remove type conversions
and related preprocessor checks to silence compiler warnings.

Based upon curl#5262
Related to curl#5479
Supersedes curl#5214, curl#5220 and curl#5221
Follow up to curl#5343
Closes curl#5490
mback2k added a commit to mback2k/curl that referenced this pull request May 31, 2020
Remove obsolete type conversions to time_t or int:

Now that all functions in select.[ch] take timediff_t instead
of the limited time_t or int, we can remove type conversions
and related preprocessor checks to silence compiler warnings.

Based upon curl#5262
Supersedes curl#5214, curl#5220 and curl#5221
Follow up to curl#5343 and curl#5479
Closes curl#5490
@mback2k mback2k force-pushed the mback2k:conv-timediff_t branch from 64c4883 to 26d55f6 May 31, 2020
@mback2k mback2k marked this pull request as ready for review May 31, 2020
@mback2k mback2k requested a review from bagder May 31, 2020
@mback2k
Copy link
Member Author

@mback2k mback2k commented May 31, 2020

@bagder please take another look. I updated this PR to include asyn-ares.c and telnet.c.

@mback2k mback2k marked this pull request as ready for review May 31, 2020
mback2k added a commit to mback2k/curl that referenced this pull request May 31, 2020
Now that all functions in select.[ch] take timediff_t instead
of the limited time_t or int, we can remove type conversions
and related preprocessor checks to silence compiler warnings.

Based upon curl#5262
Supersedes curl#5214, curl#5220 and curl#5221
Follow up to curl#5343 and curl#5479
Closes curl#5490
@mback2k mback2k force-pushed the mback2k:conv-timediff_t branch from 26d55f6 to c00807c May 31, 2020
@mback2k mback2k changed the title lib: remove obsolete type conversions to time_t or int timeouts: move ms timeouts to timediff_t from int May 31, 2020
@mback2k mback2k force-pushed the mback2k:conv-timediff_t branch from c00807c to d1ef261 Jun 1, 2020
mback2k added a commit to mback2k/curl that referenced this pull request Jun 1, 2020
Now that all functions in select.[ch] take timediff_t instead
of the limited time_t or int, we can remove type conversions
and related preprocessor checks to silence compiler warnings.

Based upon curl#5262
Supersedes curl#5214, curl#5220 and curl#5221
Follow up to curl#5343 and curl#5479
Closes curl#5490
Now that all functions in select.[ch] take timediff_t instead
of the limited int or long, we can remove type conversions
and related preprocessor checks to silence compiler warnings.

Avoiding conversions from time_t was already done in 842f73d.

Based upon #5262
Supersedes #5214, #5220 and #5221
Follow up to #5343 and #5479
Closes #5490
@mback2k mback2k force-pushed the mback2k:conv-timediff_t branch from d1ef261 to b598544 Jun 5, 2020
@mback2k mback2k changed the title timeouts: move ms timeouts to timediff_t from int timeouts: move ms timeouts to timediff_t from int and long Jun 5, 2020
@mback2k mback2k closed this in 3186f50 Jun 6, 2020
@mback2k
Copy link
Member Author

@mback2k mback2k commented Jun 6, 2020

Merged now, because except 1 unrelated Windows build all CIs were green, including the c-ares builds.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

2 participants
You can’t perform that action at this time.