MDBF-348: Correct AIX cast warning (my_time.h) #2079
Closed
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
tv_usec is a (suseconds_t) so we cast to it. Prevents the warning:
include/my_time.h: In function 'void my_timeval_trunc(timeval*, uint)':
include/my_time.h:249:65: warning: conversion from 'long int' to 'suseconds_t' {aka 'int'} may change value [-Wconversion]
249 | tv->tv_usec-= my_time_fraction_remainder(tv->tv_usec, decimals);
|
(gcc-10)
On Windows suseconds_t isn't defined so we use the existing
long return type of my_time_fraction_remainder.
|
Would this fix MDEV-26136, which was originally reported for macOS? |
dr-m
reviewed
Apr 1, 2022
| @@ -244,9 +244,12 @@ static inline void my_time_trunc(MYSQL_TIME *ltime, uint decimals) | |||
| !ltime->hour && !ltime->minute && !ltime->second) | |||
| ltime->neg= FALSE; | |||
| } | |||
| #ifdef __WIN__ | |||
There was a problem hiding this comment.
_WIN32 wins the popularity contest in 10.5 over __WIN__, so perhaps we would want to use that.
|
highly probable given the timeval structure in https://developer.apple.com/library/archive/documentation/System/Conceptual/ManPages_iPhoneOS/man2/gettimeofday.2.html Given MDEV-26136, this could go back to 10.2 as well. |
grooverdan
added a commit
that referenced
this pull request
Apr 3, 2022
tv_usec is a (suseconds_t) so we cast to it. Prevents the AIX(gcc-10) warning:
include/my_time.h: In function 'void my_timeval_trunc(timeval*, uint)':
include/my_time.h:249:65: warning: conversion from 'long int' to 'suseconds_t' {aka 'int'} may change value [-Wconversion]
249 | tv->tv_usec-= my_time_fraction_remainder(tv->tv_usec, decimals);
|
macOS is: conversion from 'long int' to '__darwin_suseconds_t' {aka 'int'} may change value
On Windows suseconds_t isn't defined so we use the existing
long return type of my_time_fraction_remainder.
Reviewed by Marko Mäkelä
Closes: #2079
|
closed in #75b9014 (10.2) with Marko's change and BB passing. |
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.
tv_usec is a (suseconds_t) so we cast to it. Prevents the warning that occurs quite significantly on AIX:
include/my_time.h: In function 'void my_timeval_trunc(timeval*, uint)':
include/my_time.h:249:65: warning: conversion from 'long int' to 'suseconds_t' {aka 'int'} may change value [-Wconversion]
249 | tv->tv_usec-= my_time_fraction_remainder(tv->tv_usec, decimals);
|
(gcc-10)
On Windows suseconds_t isn't defined so we use the existing
long return type of my_time_fraction_remainder.