[Git][NTPsec/ntpsec][master] 2 commits: Remove define of HAS_ROUTING_SOCKET - never referenced

[Hal Murray]

Hal Murray pushed to branch master at NTPsec / ntpsec


Commits:
6919cfdf by Hal Murray at 2017-04-14T02:23:54-07:00
Remove define of HAS_ROUTING_SOCKET - never referenced

- - - - -
268e97cc by Hal Murray at 2017-04-14T02:28:37-07:00
Fix another shadow warning: stime in ntpd/ntp_util.c

- - - - -


2 changed files:

- ntpd/ntp_util.c
- wafhelpers/configure.py


Changes:

=====================================
ntpd/ntp_util.c
=====================================
--- a/ntpd/ntp_util.c
+++ b/ntpd/ntp_util.c
@@ -622,18 +622,18 @@ void record_use_stats(void)
 	clock_gettime(CLOCK_REALTIME, &now);
 	filegen_setup(&usestats, now.tv_sec);
 	if (usestats.fp != NULL) {
-		double utime, stime;
+		double utime, stimex;
 		getrusage(RUSAGE_SELF, &usage);
 		utime =  usage.ru_utime.tv_usec - oldusage.ru_utime.tv_usec;
 		utime /= 1E6;
 		utime += usage.ru_utime.tv_sec -  oldusage.ru_utime.tv_sec;
-		stime =  usage.ru_stime.tv_usec - oldusage.ru_stime.tv_usec;
-		stime /= 1E6;
-		stime += usage.ru_stime.tv_sec -  oldusage.ru_stime.tv_sec;
+		stimex =  usage.ru_stime.tv_usec - oldusage.ru_stime.tv_usec;
+		stimex /= 1E6;
+		stimex += usage.ru_stime.tv_sec -  oldusage.ru_stime.tv_sec;
 		fprintf(usestats.fp,
 		    "%s %lu %.3f %.3f %ld %ld %ld %ld %ld %ld %ld %ld %ld\n",
 		    timespec_to_MJDtime(&now), current_time - use_stattime,
-		    utime, stime,
+		    utime, stimex,
 		    usage.ru_minflt -   oldusage.ru_minflt,
 		    usage.ru_majflt -   oldusage.ru_majflt,
 		    usage.ru_nswap -    oldusage.ru_nswap,


=====================================
wafhelpers/configure.py
=====================================
--- a/wafhelpers/configure.py
+++ b/wafhelpers/configure.py
@@ -508,8 +508,6 @@ int main(int argc, char **argv) {
     # These are helpful and don't break Linux or *BSD
     ctx.define("OPEN_BCAST_SOCKET", 1,
                comment="Whether to open a broadcast socket")
-    ctx.define("HAS_ROUTING_SOCKET", 1,
-               comment="Whether a routing socket exists")
 
 
     # Find OpenSSL. Must happen before function checks



View it on GitLab: https://gitlab.com/NTPsec/ntpsec/compare/72346a76562f2c6e5c86beadcd82b03e4b3f06ad...268e97cc7b11da36a186b7a38b85ca9ba54a6486

---
View it on GitLab: https://gitlab.com/NTPsec/ntpsec/compare/72346a76562f2c6e5c86beadcd82b03e4b3f06ad...268e97cc7b11da36a186b7a38b85ca9ba54a6486
You're receiving this email because of your account on gitlab.com.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.ntpsec.org/pipermail/vc/attachments/20170414/4077bdc8/attachment.html>