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 5a4845a1c75fb1508abd2b0b4a876a13e97f0db1..395d0e50db60d66154ac8010bf756c0010b069c2 100644 (file)
--- 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 f2358324416dc912353d24c50f0bdd8de59b4829..1b023198d8db51839cf86e0d5fa4b1f349198787 100644 (file)
--- 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 adcfafafd649d57c3cbb70ae8422c7fe3f2bb59c..2fea9dc6d99baeff60803daff9d13e0ed7049987 100644 (file)
--- 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 c4f44a959bc80a85407ade0a6e200ff73e108033..60c98b84ebafbb578a25203bcf6ec255f604f378 100644 (file)
--- 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 4abd350505e1ba7f0026d361a28c8acc79dc6900..b993de907d0819265b27868d2770b382c001fb67 100644 (file)
--- 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;