[Bug 2252] palisade: formats nanosecs to a 6-char field.

bk: 501edfe6pVpMDJDAQPvZrxQqiz6UTw

diff --git a/ChangeLog b/ChangeLog
index 59f215b7f3b086868c605f0c420ef4d189183ac9..9921254470768b3d7be80ef9954576bff844f195 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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@ntp.org>
 * [Bug 2247] (more) Get rid of the TRAK refclock - deprecated since 2006.
 * Documentation cleanup from Mike T.

diff --git a/ntpd/refclock_palisade.c b/ntpd/refclock_palisade.c
index dfa45034b185a2140aae1e411348e25bd05bda82..0f047eaabf880d4bd32061b8f1ff905c9ab3a0ee 100644 (file)
--- a/ntpd/refclock_palisade.c
+++ b/ntpd/refclock_palisade.c
@@ -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;