[Git][NTPsec/ntpsec][master] 3 commits: change type of ntpcal_get_build_date to be bool

[Hal Murray]

Hal Murray pushed to branch master at NTPsec / ntpsec


Commits:
b0f9d525 by Hal Murray at 2020-02-08T05:48:32-08:00
change type of ntpcal_get_build_date to be bool

- - - - -
f8119747 by Hal Murray at 2020-02-08T05:48:32-08:00
Fix tests/option-tester.sh to use --disable-doc

- - - - -
acaa9832 by Hal Murray at 2020-02-08T05:48:32-08:00
Remove unused arg to leap_smear_add_offs

- - - - -


4 changed files:

- include/ntp_calendar.h
- libntp/ntp_calendar.c
- ntpd/ntp_proto.c
- tests/option-tester.sh


Changes:

=====================================
include/ntp_calendar.h
=====================================
@@ -50,7 +50,7 @@ typedef time_t (*systime_func_ptr)(time_t *);
  * Get the build date & time in UTC.  This depends on the BUILD_EPOCH
  * which is fixed at configure time.
  */
-extern int
+extern bool
 ntpcal_get_build_date(struct calendar * /* jd */);
 
 /*


=====================================
libntp/ntp_calendar.c
=====================================
@@ -33,7 +33,7 @@ ntpcal_edate_to_yeardays(int32_t, int32_t, int32_t);
  * Get the build date & time
  *---------------------------------------------------------------------
  */
-int
+bool
 ntpcal_get_build_date(
 	struct calendar * jd
 	)


=====================================
ntpd/ntp_proto.c
=====================================
@@ -2201,8 +2201,7 @@ peer_xmit(
 #ifdef ENABLE_LEAP_SMEAR
 
 static void
-leap_smear_add_offs(l_fp *t, l_fp *t_recv) {
-	UNUSED_ARG(t_recv);
+leap_smear_add_offs(l_fp *t) {
 	t += leap_smear.offset;
 }
 
@@ -2291,7 +2290,7 @@ fast_xmit(
 #ifdef ENABLE_LEAP_SMEAR
 		this_ref_time = sys_vars.sys_reftime;
 		if (leap_smear.in_progress) {
-			leap_smear_add_offs(&this_ref_time, NULL);
+			leap_smear_add_offs(&this_ref_time);
 			xpkt.refid = convertLFPToRefID(leap_smear.offset);
 			DPRINT(2, ("fast_xmit: leap_smear.in_progress: refid %8x, smear %s\n",
 				ntohl(xpkt.refid),
@@ -2309,7 +2308,7 @@ fast_xmit(
 #ifdef ENABLE_LEAP_SMEAR
 		this_recv_time = rbufp->recv_time;
 		if (leap_smear.in_progress)
-			leap_smear_add_offs(&this_recv_time, NULL);
+			leap_smear_add_offs(&this_recv_time);
 		xpkt.rec = htonl_fp(this_recv_time);
 #else
 		xpkt.rec = htonl_fp(rbufp->recv_time);
@@ -2318,7 +2317,7 @@ fast_xmit(
 		get_systime(&xmt_tx);
 #ifdef ENABLE_LEAP_SMEAR
 		if (leap_smear.in_progress)
-			leap_smear_add_offs(&xmt_tx, &this_recv_time);
+			leap_smear_add_offs(&xmt_tx);
 #endif
 		xpkt.xmt = htonl_fp(xmt_tx);
 	}


=====================================
tests/option-tester.sh
=====================================
@@ -54,17 +54,17 @@ doit ()
 
 # no --disable-manpage on default and all
 doit default ""
-doit minimal "--disable-droproot --disable-mdns-registration --disable-manpage"
+doit minimal "--disable-droproot --disable-mdns-registration --disable-doc --disable-manpage"
 
 # This also tests refclocks without DEBUG
-doit classic "--enable-classic-mode --refclock=all --disable-manpage"
+doit classic "--enable-classic-mode --refclock=all --disable-doc --disable-manpage"
 
-doit all     "--enable-warnings --enable-debug --enable-debug-gdb --enable-debug-timing --refclock=all --enable-leap-smear --enable-mssntp --enable-early-droproot --disable-fuzz $LINUX"
+doit all     "--enable-warnings --enable-debug --enable-debug-gdb --enable-debug-timing --refclock=all --enable-leap-smear --enable-mssntp --enable-early-droproot --disable-fuzz $LINUX --disable-doc --disable-manpage"
 
 if [ "`which asciidoc 2>/dev/null`" != "" -a \
      "`which xsltproc 2>/dev/null`" != "" ]
 then
-doit doc     "--enable-doc --disable-manpage"
+doit doc     ""
 fi
 
 # should try cross compile



View it on GitLab: https://gitlab.com/NTPsec/ntpsec/-/compare/823bcf1abf8a57b12fc0a2ab3ac45ce86f24a65d...acaa9832b901e29f46810670b524a02f2a8dc55b

-- 
View it on GitLab: https://gitlab.com/NTPsec/ntpsec/-/compare/823bcf1abf8a57b12fc0a2ab3ac45ce86f24a65d...acaa9832b901e29f46810670b524a02f2a8dc55b
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/20200208/c8d8fec8/attachment-0001.htm>