Author: dim
Date: Sun Apr 26 15:50:32 2020
New Revision: 360338
URL: https://svnweb.freebsd.org/changeset/base/360338
Log:
Add casts to work around harmless -Werror warnings from clang 10.0.0,
such as:
usr.sbin/timed/timed/networkdelta.c:160:13: error: implicit conversion from
'long' to 'float' changes value from 9223372036854775807 to 9223372036854775808
[-Werror,-Wimplicit-int-float-conversion]
float ap = LONG_MAX; /* bounds on the median */
~~ ^~~~~~~~
Direct commit to stable/{10,11,12}, since timed has been removed from
FreeBSD 13.
Modified:
stable/10/usr.sbin/timed/Makefile
stable/10/usr.sbin/timed/timed/networkdelta.c
Changes in other areas also in this revision:
Modified:
stable/11/usr.sbin/timed/timed/networkdelta.c
stable/12/usr.sbin/timed/timed/networkdelta.c
Modified: stable/10/usr.sbin/timed/Makefile
==============================================================================
--- stable/10/usr.sbin/timed/Makefile Sun Apr 26 13:02:42 2020
(r360337)
+++ stable/10/usr.sbin/timed/Makefile Sun Apr 26 15:50:32 2020
(r360338)
@@ -4,3 +4,4 @@
SUBDIR= timed timedc
.include <bsd.subdir.mk>
+# DO NOT DELETE
Modified: stable/10/usr.sbin/timed/timed/networkdelta.c
==============================================================================
--- stable/10/usr.sbin/timed/timed/networkdelta.c Sun Apr 26 13:02:42
2020 (r360337)
+++ stable/10/usr.sbin/timed/timed/networkdelta.c Sun Apr 26 15:50:32
2020 (r360338)
@@ -155,8 +155,8 @@ median(float a, float *eps_ptr, long *x, long *xlim, u
/* unsigned int gnuf; */ /* good enough estimate */
{
long *xptr;
- float ap = LONG_MAX; /* bounds on the median */
- float am = -LONG_MAX;
+ float ap = (float)LONG_MAX; /* bounds on the median */
+ float am = -(float)LONG_MAX;
float aa;
int npts; /* # of points above & below guess */
float xp; /* closet point above the guess */
@@ -178,8 +178,8 @@ median(float a, float *eps_ptr, long *x, long *xlim, u
sum = 0.0;
sumx = 0.0;
npts = 0;
- xp = LONG_MAX;
- xm = -LONG_MAX;
+ xp = (float)LONG_MAX;
+ xm = -(float)LONG_MAX;
for (xptr = x; xptr != xlim; xptr++) {
float xx = *xptr;
_______________________________________________
svn-src-stable-10@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10
To unsubscribe, send any mail to "svn-src-stable-10-unsubscr...@freebsd.org"
