From: Martin Burnicki <burnicki@ntp.org>
Date: Tue, 7 Apr 2020 15:48:25 +0000 (+0200)
Subject: Fix compiling refclock_palisade.c
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9b3cd5888fc421213104cbfa67e87b1ff96f23b8;p=thirdparty%2Fntp.git

Fix compiling refclock_palisade.c
Don't have variable declarations after code.

bk: 5e8ca0c9miRY1RGip2dKqyfK3OAdSQ
---

diff --git a/ntpd/refclock_palisade.c b/ntpd/refclock_palisade.c
index e698d72cc..cb68255d0 100644
--- a/ntpd/refclock_palisade.c
+++ b/ntpd/refclock_palisade.c
@@ -304,13 +304,13 @@ palisade_start (
 	int fd;
 	char gpsdev[20];
 	struct termios tio;
+	u_int speed;
 
 	snprintf(gpsdev, sizeof(gpsdev), DEVICE, unit);
 
 	/*
 	 * Open serial port. 
 	 */
-	u_int speed;
 	speed = (CLK_TYPE(peer) == CLK_COPERNICUS) ? SPEED232COP : SPEED232;
 	fd = refclock_open(gpsdev, speed, LDISC_RAW);
 	if (fd <= 0) {
@@ -941,30 +941,32 @@ TSIP_decode (
 			return 0;
 		}
 		/* Get date & time from WN & ToW minus offset */
-		TCivilDate cd;
-		TGpsDatum wd;
-		l_fp ugo; /* UTC-GPS offset, negative number */
-		ugo.Ul_i.Xl_i = (int32_t)-GPS_UTC_Offset;
-		ugo.l_uf = 0;
-		wd = gpscal_from_gpsweek((wn % 1024), (int32_t)tow, ugo);
-		gpscal_to_calendar(&cd, &wd);
-		pp->year = cd.year;
-		pp->day = cd.yearday;
-		pp->hour = cd.hour;
-		pp->minute = cd.minute;
-		pp->second = cd.second;
-		pp->nsec = 0;
-		pp->leap = LEAP_NOWARNING;
+		{
+			TCivilDate cd;
+			TGpsDatum wd;
+			l_fp ugo; /* UTC-GPS offset, negative number */
+			ugo.Ul_i.Xl_i = (int32_t)-GPS_UTC_Offset;
+			ugo.l_uf = 0;
+			wd = gpscal_from_gpsweek((wn % 1024), (int32_t)tow, ugo);
+			gpscal_to_calendar(&cd, &wd);
+			pp->year = cd.year;
+			pp->day = cd.yearday;
+			pp->hour = cd.hour;
+			pp->minute = cd.minute;
+			pp->second = cd.second;
+			pp->nsec = 0;
+			pp->leap = LEAP_NOWARNING;
 #ifdef DEBUG
-		if (debug > 1)	{
-			printf("GPS TOW: %ld\n", tow);
-			printf("GPS WN: %d\n", wn);
-			printf("GPS UTC-GPS Offset: %d\n", GPS_UTC_Offset);
-			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, cd.month, cd.monthday, pp->year);
-		}
+			if (debug > 1)	{
+				printf("GPS TOW: %ld\n", tow);
+				printf("GPS WN: %d\n", wn);
+				printf("GPS UTC-GPS Offset: %d\n", GPS_UTC_Offset);
+				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, cd.month, cd.monthday, pp->year);
+			}
 #endif
+		}
 		return 1;
 	}