[ntp:bk-ntp-dev-send] BitKeeper diffs

Harlan Stenn stenn at deacon.udel.edu
Wed Aug 8 01:55:43 UTC 2012


#### ChangeSet ####
2012-08-06 04:22:39+00:00, davehart at dlh-7551.ad.hartbrothers.com
  Attempt to resolve strict-aliasing violation in refclock_tsyncpci.c.
  Force prior config.cache files to be flushed due to [Bug 2242] fix
    invalidating getifaddrs() cached result.

==== ChangeLog ====
2012-08-06 04:22:37+00:00, davehart at dlh-7551.ad.hartbrothers.com +1 -0
  Attempt to resolve strict-aliasing violation in refclock_tsyncpci.c.

--- 1.1211/ChangeLog	2012-08-05 17:14:59 -04:00
+++ 1.1212/ChangeLog	2012-08-06 00:22:37 -04:00
@@ -1,6 +1,7 @@
 * [Bug 2242] configure fails to detect getifaddrs function on Solaris.
 * [Bug 2249] Bad operator for 'test' in 'make check' of libevent.
 * [Bug 2252] palisade: formats nanosecs to a 6-char field.
+* Attempt to resolve strict-aliasing violation in refclock_tsyncpci.c.
 (4.2.7p293) 2012/08/04 Released by Harlan Stenn <stenn at ntp.org>
 * [Bug 2247] (more) Get rid of the TRAK refclock - deprecated since 2006.
 * Documentation cleanup from Mike T.

==== configure.ac ====
2012-08-06 04:22:38+00:00, davehart at dlh-7551.ad.hartbrothers.com +1 -1
  Force prior config.cache files to be flushed due to [Bug 2242] fix
    invalidating getifaddrs() cached result.

--- 1.548/configure.ac	2012-08-02 04:40:49 -04:00
+++ 1.549/configure.ac	2012-08-06 00:22:38 -04:00
@@ -34,7 +34,7 @@ AC_PRESERVE_HELP_ORDER
 # the date YYYYMMDD optionally with -HHMM if there is more than one
 # bump in a day.
 
-ntp_configure_cache_version=20110219
+ntp_configure_cache_version=20120806
 
 # When the cache version of config.cache and configure do not
 # match, NTP_CACHEVERSION will flush the cache.

==== ntpd/refclock_tsyncpci.c ====
2012-08-06 04:22:38+00:00, davehart at dlh-7551.ad.hartbrothers.com +5 -3
  Attempt to resolve strict-aliasing violation in refclock_tsyncpci.c.

--- 1.6/ntpd/refclock_tsyncpci.c	2012-06-02 08:51:47 -04:00
+++ 1.7/ntpd/refclock_tsyncpci.c	2012-08-06 00:22:38 -04:00
@@ -423,6 +423,7 @@ static void tsync_poll(int unit, struct 
     ioctl_trans_di      *it2;
     l_fp                 offset;
     l_fp                 ltemp;
+    ReferenceObj *	 pRefObj;
 
 
     /* Construct the device name */
@@ -552,9 +553,10 @@ static void tsync_poll(int unit, struct 
 
     // Extract reference identifiers from ioctl payload
     memset(timeRef, '\0', sizeof(timeRef));
-    memset(ppsRef,  '\0', sizeof(ppsRef));
-    memcpy(timeRef, ((ReferenceObj*)(it->payloads))->time, TSYNC_REF_LEN);
-    memcpy(ppsRef,  ((ReferenceObj*)(it->payloads))->pps,  TSYNC_REF_LEN);
+    memset(ppsRef, '\0', sizeof(ppsRef));
+    pRefObj = (void *)it->payloads;
+    memcpy(timeRef, pRefObj->time, TSYNC_REF_LEN);
+    memcpy(ppsRef, pRefObj->pps, TSYNC_REF_LEN);
 
     // Extract the Clock Service Time Scale and convert to correct byte order
     memcpy(&tmscl, ((TIME_SCALE*)(it1->payloads)), sizeof(tmscl));

==== sntp/configure.ac ====
2012-08-06 04:22:38+00:00, davehart at dlh-7551.ad.hartbrothers.com +1 -1
  Force prior config.cache files to be flushed due to [Bug 2242] fix
    invalidating getifaddrs() cached result.

--- 1.69/sntp/configure.ac	2012-06-18 03:49:12 -04:00
+++ 1.70/sntp/configure.ac	2012-08-06 00:22:38 -04:00
@@ -32,7 +32,7 @@ AC_CONFIG_AUX_DIR([libevent/build-aux])
 # the date YYYYMMDD optionally with -HHMM if there is more than one
 # bump in a day.
 
-sntp_configure_cache_version=20110219
+sntp_configure_cache_version=20120806
 
 # When the version of config.cache and configure do not
 # match, NTP_CACHEVERSION will flush the cache.

#### ChangeSet ####
2012-08-05 21:15:00+00:00, davehart at dlh-7551.ad.hartbrothers.com
  [Bug 2242] configure fails to detect getifaddrs function on Solaris.

==== ChangeLog ====
2012-08-05 21:14:59+00:00, davehart at dlh-7551.ad.hartbrothers.com +1 -0
  [Bug 2242] configure fails to detect getifaddrs function on Solaris.

--- 1.1210/ChangeLog	2012-08-05 17:04:37 -04:00
+++ 1.1211/ChangeLog	2012-08-05 17:14:59 -04:00
@@ -1,3 +1,4 @@
+* [Bug 2242] configure fails to detect getifaddrs function on Solaris.
 * [Bug 2249] Bad operator for 'test' in 'make check' of libevent.
 * [Bug 2252] palisade: formats nanosecs to a 6-char field.
 (4.2.7p293) 2012/08/04 Released by Harlan Stenn <stenn at ntp.org>

==== sntp/m4/ntp_ipv6.m4 ====
2012-08-05 21:14:59+00:00, davehart at dlh-7551.ad.hartbrothers.com +7 -3
  [Bug 2242] configure fails to detect getifaddrs function on Solaris.

--- 1.6/sntp/m4/ntp_ipv6.m4	2012-06-03 03:18:46 -04:00
+++ 1.7/sntp/m4/ntp_ipv6.m4	2012-08-05 17:14:59 -04:00
@@ -491,14 +491,18 @@ AC_ARG_ENABLE(
 )
 
 case $want_getifaddrs in
- no)
-    ;;
  glibc)
     AC_MSG_WARN([--enable-getifaddrs=glibc is no longer required])
-    AC_CHECK_FUNCS([getifaddrs])
+esac
+case $want_getifaddrs in
+ no)
     ;;
  *)
+    SAVED_LIBS="$LIBS"
+    LIBS="$LDADD_LIBNTP $LIBS"
     AC_CHECK_FUNCS([getifaddrs])
+    LIBS="$SAVED_LIBS"
+    AS_UNSET([SAVED_LIBS])
     ;;
 esac
 

#### ChangeSet ####
2012-08-05 21:04:38+00:00, davehart at dlh-7551.ad.hartbrothers.com
  [Bug 2252] palisade: formats nanosecs to a 6-char field.

==== ChangeLog ====
2012-08-05 21:04:37+00:00, davehart at dlh-7551.ad.hartbrothers.com +1 -0
  [Bug 2252] palisade: formats nanosecs to a 6-char field.

--- 1.1209/ChangeLog	2012-08-05 15:09:37 -04:00
+++ 1.1210/ChangeLog	2012-08-05 17:04:37 -04:00
@@ -1,4 +1,5 @@
 * [Bug 2249] Bad operator for 'test' in 'make check' of libevent.
+* [Bug 2252] palisade: formats nanosecs to a 6-char field.
 (4.2.7p293) 2012/08/04 Released by Harlan Stenn <stenn at ntp.org>
 * [Bug 2247] (more) Get rid of the TRAK refclock - deprecated since 2006.
 * Documentation cleanup from Mike T.

==== ntpd/refclock_palisade.c ====
2012-08-05 21:04:38+00:00, davehart at dlh-7551.ad.hartbrothers.com +5 -5
  [Bug 2252] palisade: formats nanosecs to a 6-char field.

--- 1.38/ntpd/refclock_palisade.c	2011-02-20 15:22:40 -05:00
+++ 1.39/ntpd/refclock_palisade.c	2012-08-05 17:04:38 -04:00
@@ -542,7 +542,7 @@ TSIP_decode (
 
 #ifdef DEBUG
 			if (debug > 1)
-				printf("TSIP_decode: unit %d: %02X #%d %02d:%02d:%02d.%06ld %02d/%02d/%04d UTC %02d\n",
+				printf("TSIP_decode: unit %d: %02X #%d %02d:%02d:%02d.%09ld %02d/%02d/%04d UTC %02d\n",
 				       up->unit, mb(0) & 0xff, event, pp->hour, pp->minute, 
 				       pp->second, pp->nsec, mb(12), mb(11), pp->year, GPS_UTC_Offset);
 #endif
@@ -618,7 +618,7 @@ TSIP_decode (
 
 #ifdef DEBUG
 			if (debug > 1)
-				printf("TSIP_decode: unit %d: %02X #%d %02d:%02d:%02d.%06ld %02d/%02d/%04d UTC %02x %s\n",
+				printf("TSIP_decode: unit %d: %02X #%d %02d:%02d:%02d.%09ld %02d/%02d/%04d UTC %02x %s\n",
 				       up->unit, mb(0) & 0xff, event, pp->hour, pp->minute, 
 				       pp->second, pp->nsec, mb(15), mb(14), pp->year,
 				       mb(19), *Tracking_Status[st]);
@@ -762,7 +762,7 @@ TSIP_decode (
 
 #ifdef DEBUG
 			if (debug > 1)
-				printf("TSIP_decode: unit %d: %02X #%d %02d:%02d:%02d.%06ld %02d/%02d/%04d ",up->unit, mb(0) & 0xff, event, pp->hour, pp->minute, pp->second, pp->nsec, mb(14), mb(13), pp->year);
+				printf("TSIP_decode: unit %d: %02X #%d %02d:%02d:%02d.%09ld %02d/%02d/%04d ",up->unit, mb(0) & 0xff, event, pp->hour, pp->minute, pp->second, pp->nsec, mb(14), mb(13), pp->year);
 #endif
 			return 1;
 			break;
@@ -910,7 +910,7 @@ palisade_receive (
 #ifdef DEBUG
 	if (debug) 
 		printf(
-			"palisade_receive: unit %d: %4d %03d %02d:%02d:%02d.%06ld\n",
+			"palisade_receive: unit %d: %4d %03d %02d:%02d:%02d.%09ld\n",
 			up->unit, pp->year, pp->day, pp->hour, pp->minute, 
 			pp->second, pp->nsec);
 #endif
@@ -922,7 +922,7 @@ palisade_receive (
 	 */
 
 	snprintf(pp->a_lastcode, sizeof(pp->a_lastcode),
-		 "%4d %03d %02d:%02d:%02d.%06ld",
+		 "%4d %03d %02d:%02d:%02d.%09ld",
 		 pp->year, pp->day,
 		 pp->hour,pp->minute, pp->second, pp->nsec); 
 	pp->lencode = 24;

#### ChangeSet ####
2012-08-05 20:48:27+00:00, davehart at dlh-7551.ad.hartbrothers.com
  Remove unneeded \ line continuation in ntp_config.c if condition.
  Use INSIST() instead of equivalent NTP_INSIST in a few places.

==== ntpd/ntp_config.c ====
2012-08-05 20:48:26+00:00, davehart at dlh-7551.ad.hartbrothers.com +4 -4
  Remove unneeded \ line continuation in ntp_config.c if condition.
  Use INSIST() instead of equivalent NTP_INSIST in a few places.

--- 1.300/ntpd/ntp_config.c	2012-06-28 02:42:57 -04:00
+++ 1.301/ntpd/ntp_config.c	2012-08-05 16:48:26 -04:00
@@ -2693,7 +2693,7 @@ config_nic_rules(
 			 * other reason.
 			 */
 			match_type = MATCH_ALL;
-			NTP_INSIST(0);
+			INSIST(FALSE);
 			break;
 
 		case 0:
@@ -2703,13 +2703,13 @@ config_nic_rules(
 			 * interface descriptor is either a name or
 			 * address, stored in if_name in either case.
 			 */
-			NTP_INSIST(if_name != NULL);
+			INSIST(if_name != NULL);
 			pchSlash = strchr(if_name, '/');
 			if (pchSlash != NULL)
 				*pchSlash = '\0';
 			if (is_ip_address(if_name, AF_UNSPEC, &addr)) {
 				match_type = MATCH_IFADDR;
-				if (pchSlash != NULL	\
+				if (pchSlash != NULL
 				    && 1 == sscanf(pchSlash + 1, "%d",
 					    &prefixlen)) {
 					addrbits = 8 *
@@ -2751,7 +2751,7 @@ config_nic_rules(
 			 * other reason.
 			 */
 			action = ACTION_LISTEN;
-			NTP_INSIST(0);
+			INSIST(FALSE);
 			break;
 
 		case T_Listen:

#### ChangeSet ####
2012-08-05 19:09:38+00:00, davehart at dlh-7551.ad.hartbrothers.com
  [Bug 2249] Bad operator for 'test' in 'make check' of libevent.

==== ChangeLog ====
2012-08-05 19:09:37+00:00, davehart at dlh-7551.ad.hartbrothers.com +1 -0
  [Bug 2249] Bad operator for 'test' in 'make check' of libevent.

--- 1.1208/ChangeLog	2012-08-04 07:34:01 -04:00
+++ 1.1209/ChangeLog	2012-08-05 15:09:37 -04:00
@@ -1,3 +1,4 @@
+* [Bug 2249] Bad operator for 'test' in 'make check' of libevent.
 (4.2.7p293) 2012/08/04 Released by Harlan Stenn <stenn at ntp.org>
 * [Bug 2247] (more) Get rid of the TRAK refclock - deprecated since 2006.
 * Documentation cleanup from Mike T.

==== sntp/libevent/test/test.sh ====
2012-08-05 19:09:37+00:00, davehart at dlh-7551.ad.hartbrothers.com +1 -1
  [Bug 2249] Bad operator for 'test' in 'make check' of libevent.

--- 1.5/sntp/libevent/test/test.sh	2012-06-14 18:31:08 -04:00
+++ 1.6/sntp/libevent/test/test.sh	2012-08-05 15:09:37 -04:00
@@ -32,7 +32,7 @@ if test -x "$T/test-init"
 then
 	TEST_DIR="$T"
 fi
-if test -e "$T/check-dumpevents.py"
+if test -f "$T/check-dumpevents.py"
 then
 	TEST_SRC_DIR="$T"
 fi


More information about the bk-ntp-dev-send mailing list