[Git][NTPsec/ntpsec][master] 3 commits: Fix typo
Eric S. Raymond
gitlab at mg.gitlab.com
Wed Sep 28 04:52:45 UTC 2016
Eric S. Raymond pushed to branch master at NTPsec / ntpsec
Commits:
c6159e17 by Matt Selsky at 2016-09-27T23:56:06-04:00
Fix typo
And remove stray space between tabs while we're here.
- - - - -
688dd9f7 by Matt Selsky at 2016-09-27T23:56:06-04:00
Cast tv_sec and tv_usec to long and use ld in format string.
- - - - -
4e303485 by Matt Selsky at 2016-09-28T00:00:13-04:00
tv_nsec is already a long. No need to cast it.
- - - - -
3 changed files:
- ntpd/ntp_config.c
- ntpfrob/bumpclock.c
- util/hist.c
Changes:
=====================================
ntpd/ntp_config.c
=====================================
--- a/ntpd/ntp_config.c
+++ b/ntpd/ntp_config.c
@@ -1770,9 +1770,9 @@ config_access(
break;
case T_Notrap:
- /*
+ /*
* No-op - included for backward compatibility
- * wuith all the world's boilerplate ntp.conf
+ * with all the world's boilerplate ntp.conf
* files.
*/
break;
=====================================
ntpfrob/bumpclock.c
=====================================
--- a/ntpfrob/bumpclock.c
+++ b/ntpfrob/bumpclock.c
@@ -45,16 +45,16 @@ void bumpclock(int bump)
if (rc1)
printf("Couldn't get time: %s\n", strerror(er1));
else
- printf("Was: %ld.%09ld\n", (long)was.tv_sec, (long)was.tv_nsec);
+ printf("Was: %ld.%09ld\n", (long)was.tv_sec, was.tv_nsec);
if (rc2) {
printf("Couldn't set time: %s\n", strerror(er2));
- printf("Try: %ld.%09ld\n", (long)set.tv_sec, (long)set.tv_nsec);
+ printf("Try: %ld.%09ld\n", (long)set.tv_sec, set.tv_nsec);
} else
- printf("Set: %ld.%09ld\n", (long)set.tv_sec, (long)set.tv_nsec);
+ printf("Set: %ld.%09ld\n", (long)set.tv_sec, set.tv_nsec);
if (rc3)
printf("Couldn't set time: %s\n", strerror(er3));
else
- printf("Now: %ld.%09ld\n", (long)now.tv_sec, (long)now.tv_nsec);
+ printf("Now: %ld.%09ld\n", (long)now.tv_sec, now.tv_nsec);
}
=====================================
util/hist.c
=====================================
--- a/util/hist.c
+++ b/util/hist.c
@@ -57,8 +57,9 @@ main(
w = u - t;
if (w <= 0) {
/*
- printf("error <= 0 %ld %d %d, %d %d\n", w, ts.tv_sec,
- ts.tv_usec, tr.tv_sec, tr.tv_usec);
+ printf("error <= 0 %ld %ld %ld, %ld %ld\n", w,
+ (long)ts.tv_sec, (long)ts.tv_usec,
+ (long)tr.tv_sec, (long)tr.tv_usec);
*/
} else if (w > NBUF - 1) {
ovfl[n] = w;
View it on GitLab: https://gitlab.com/NTPsec/ntpsec/compare/93376b101e822d8c630acb9d5f3684dff1632000...4e303485eb4e2e6b84ba05c4a87222fd27ed45a6
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.ntpsec.org/pipermail/vc/attachments/20160928/b54869d1/attachment.html>
More information about the vc
mailing list