From: Danny Mayer <mayer@ntp.org>
Date: Sat, 10 May 2003 01:46:35 +0000 (-0400)
Subject: Change C++ comment to C comment. Fix sprintf call to use SPRINTF macro in inet_ntop.c.
X-Git-Tag: NTP_4_1_80_RC1~28
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=eb64aa49c0094bd0f8acb30fb44c57000fb69743;p=thirdparty%2Fntp.git

Change C++ comment to C comment. Fix sprintf call to use SPRINTF macro in inet_ntop.c.

bk: 3ebc59fbmVql4FFShHH4FeUXyCC6CQ
---

diff --git a/libisc/inet_ntop.c b/libisc/inet_ntop.c
index 5a4845a1c..395d0e50d 100644
--- a/libisc/inet_ntop.c
+++ b/libisc/inet_ntop.c
@@ -88,7 +88,7 @@ inet_ntop4(const unsigned char *src, char *dst, size_t size)
 	static const char *fmt = "%u.%u.%u.%u";
 	char tmp[sizeof("255.255.255.255")];
 
-	if ((size_t)sprintf(tmp, fmt, src[0], src[1], src[2], src[3]) >= size)
+	if (SPRINTF((tmp, fmt, src[0], src[1], src[2], src[3])) >= size)
 	{
 		errno = ENOSPC;
 		return (NULL);
diff --git a/ntpd/refclock_hopfpci.c b/ntpd/refclock_hopfpci.c
index f23583244..1b023198d 100644
--- a/ntpd/refclock_hopfpci.c
+++ b/ntpd/refclock_hopfpci.c
@@ -191,7 +191,7 @@ hopfpci_shutdown(
 	close(fd);
 #else
 	CloseHopfDevice();
-//	UnmapViewOfFile (up);
+/*	UnmapViewOfFile (up); */
 #endif
 }
 
diff --git a/ntpd/refclock_neoclock4x.c b/ntpd/refclock_neoclock4x.c
index adcfafafd..2fea9dc6d 100644
--- a/ntpd/refclock_neoclock4x.c
+++ b/ntpd/refclock_neoclock4x.c
@@ -934,7 +934,7 @@ neol_query_firmware(int fd,
 	      continue;
 	    }
 	  
-	  //msyslog(LOG_NOTICE, "NeoClock4X(%d): firmware %c = %02Xh", unit, c, c);
+	  /*msyslog(LOG_NOTICE, "NeoClock4X(%d): firmware %c = %02Xh", unit, c, c); */
 	  if(0x0A == c || 0x0D == c)
 	    {
 	      if(last_c_was_crlf)
diff --git a/util/pps-api.c b/util/pps-api.c
index c4f44a959..60c98b84e 100644
--- a/util/pps-api.c
+++ b/util/pps-api.c
@@ -72,7 +72,7 @@ main(int argc, char **argv)
 
 	pp.mode = PPS_CAPTUREASSERT | PPS_ECHOASSERT;
 	pp.mode = PPS_CAPTUREBOTH;
-	// pp.mode = PPS_CAPTUREASSERT;
+	/* pp.mode = PPS_CAPTUREASSERT; */
 
 	i = time_pps_setparams(ph, &pp);
 	if (i < 0)
diff --git a/util/sht.c b/util/sht.c
index 4abd35050..b993de907 100644
--- a/util/sht.c
+++ b/util/sht.c
@@ -177,7 +177,7 @@ main (
 			    p->valid=1;
 		    }
 		    else {
-			    printf ("p->valid still set\n"); // not an error!
+			    printf ("p->valid still set\n"); /* not an error! */
 		    }
 	    }
 	    break;