database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

MDEV-26136: Correct AIX/macOS cast warning (my_time.h)

Browse Source 
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
This commit is contained in:
Daniel Black
2022-04-01 16:07:12 +11:00
parent c1ab0e6fc6
commit 75b9014fed
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
include/my_time.h
View File

@@ -220,9 +220,12 @@ static inline void my_time_trunc(MYSQL_TIME *ltime, uint decimals)
{ {
ltime->second_part-= my_time_fraction_remainder(ltime->second_part, decimals); ltime->second_part-= my_time_fraction_remainder(ltime->second_part, decimals);
} }
#ifdef _WIN32
#define suseconds_t long
#endif
static inline void my_timeval_trunc(struct timeval *tv, uint decimals) static inline void my_timeval_trunc(struct timeval *tv, uint decimals)
{ {
tv->tv_usec-= my_time_fraction_remainder(tv->tv_usec, decimals); tv->tv_usec-= (suseconds_t) my_time_fraction_remainder(tv->tv_usec, decimals);
} }