ntp_fp.h: HTONL_MFP() uses ntohl(), should use htonl() (benign error)

bk: 4cc3146fwSyy-mm6089UZXM04tYskw

diff --git a/include/ntp_fp.h b/include/ntp_fp.h
index 63b0f5dfb4e2070d88685a789214cffcdd39f257..99d4df37025fe164eca1836fbdcf9c2caf3fc9fa 100644 (file)
--- a/include/ntp_fp.h
+++ b/include/ntp_fp.h
@@ -70,7 +70,7 @@ typedef int32 s_fp;
 typedef u_int32 u_fp;
 
 /*
- * A unit second in fp format.  Actually 2**(half_the_bits_in_a_long)
+ * A unit second in fp format. Actually 2**(half_the_bits_in_a_long)
  */
 #define        FP_SECOND       (0x10000)
 
@@ -86,9 +86,9 @@ typedef u_int32 u_fp;
 #define        NTOHL_MFP(ni, nf, hi, hf) \
        do { (hi) = ntohl(ni); (hf) = ntohl(nf); } while (0)
 #define        HTONL_MFP(hi, hf, ni, nf) \
-       do { (ni) = ntohl(hi); (nf) = ntohl(hf); } while (0)
+       do { (ni) = htonl(hi); (nf) = htonl(hf); } while (0)
 
-/* funny ones.  Converts ts fractions to net order ts */
+/* funny ones. Converts ts fractions to net order ts */
 #define        HTONL_UF(uf, nts) \
        do { (nts)->l_ui = 0; (nts)->l_uf = htonl(uf); } while (0)
 #define        HTONL_F(f, nts) do { (nts)->l_uf = htonl(f); \
@@ -118,7 +118,7 @@ typedef u_int32 u_fp;
  * be replaced by inline assembler for particular machines someday.
  * These are the (kind of inefficient) run-anywhere versions.
  */
-#define        M_NEG(v_i, v_f)         /* v = -v */ \
+#define        M_NEG(v_i, v_f)         /* v = -v */ \
        do { \
                if ((v_f) == 0) \
                        (v_i) = -((s_fp)(v_i)); \
@@ -128,7 +128,7 @@ typedef u_int32 u_fp;
                } \
        } while(0)
 
-#define        M_NEGM(r_i, r_f, a_i, a_f)      /* r = -a */ \
+#define        M_NEGM(r_i, r_f, a_i, a_f)      /* r = -a */ \
        do { \
                if ((a_f) == 0) { \
                        (r_f) = 0; \
@@ -139,7 +139,7 @@ typedef u_int32 u_fp;
                } \
        } while(0)
 
-#define M_ADD(r_i, r_f, a_i, a_f)      /* r += a */ \
+#define M_ADD(r_i, r_f, a_i, a_f)      /* r += a */ \
        do { \
                register u_int32 lo_tmp; \
                register u_int32 hi_tmp; \
@@ -238,7 +238,7 @@ typedef u_int32 u_fp;
                (v_f) <<= 1; \
        } while (0)
 
-#define        M_ADDUF(r_i, r_f, uf)           /* r += uf, uf is u_int32 fraction */ \
+#define        M_ADDUF(r_i, r_f, uf)           /* r += uf, uf is u_int32 fraction */ \
        M_ADD((r_i), (r_f), 0, (uf))    /* let optimizer worry about it */
 
 #define        M_SUBUF(r_i, r_f, uf)           /* r -= uf, uf is u_int32 fraction */ \
@@ -252,7 +252,7 @@ typedef u_int32 u_fp;
                        M_ADD((r_i), (r_f), (-1), (f));\
        } while(0)
 
-#define        M_ISNEG(v_i, v_f)               /* v < 0 */ \
+#define        M_ISNEG(v_i, v_f)               /* v < 0 */ \
        (((v_i) & 0x80000000) != 0)
 
 #define        M_ISHIS(a_i, a_f, b_i, b_f)     /* a >= b unsigned */ \
@@ -291,7 +291,7 @@ typedef u_int32 u_fp;
 /*
  * s_fp/double and u_fp/double conversions
  */
-#define FRIC           65536.                  /* 2^16 as a double */
+#define FRIC           65536.                  /* 2^16 as a double */
 #define DTOFP(r)       ((s_fp)((r) * FRIC))
 #define DTOUFP(r)      ((u_fp)((r) * FRIC))
 #define FPTOD(r)       ((double)(r) / FRIC)
@@ -299,8 +299,8 @@ typedef u_int32 u_fp;
 /*
  * l_fp/double conversions
  */
-#define FRAC           4294967296.             /* 2^32 as a double */
-#define M_DTOLFP(d, r_i, r_uf)                         /* double to l_fp */ \
+#define FRAC           4294967296.             /* 2^32 as a double */
+#define M_DTOLFP(d, r_i, r_uf)                 /* double to l_fp */ \
        do { \
                register double d_tmp; \
                \
@@ -315,7 +315,7 @@ typedef u_int32 u_fp;
                        (r_uf) = (u_int32)(((d_tmp) - (double)(r_i)) * FRAC); \
                } \
        } while (0)
-#define M_LFPTOD(r_i, r_uf, d)                         /* l_fp to double */ \
+#define M_LFPTOD(r_i, r_uf, d)                 /* l_fp to double */ \
        do { \
                register l_fp l_tmp; \
                \
@@ -328,8 +328,8 @@ typedef u_int32 u_fp;
                        (d) = (double)l_tmp.l_i + ((double)l_tmp.l_uf) / FRAC; \
                } \
        } while (0)
-#define DTOLFP(d, v)   M_DTOLFP((d), (v)->l_ui, (v)->l_uf)
-#define LFPTOD(v, d)   M_LFPTOD((v)->l_ui, (v)->l_uf, (d))
+#define DTOLFP(d, v)   M_DTOLFP((d), (v)->l_ui, (v)->l_uf)
+#define LFPTOD(v, d)   M_LFPTOD((v)->l_ui, (v)->l_uf, (d))
 
 /*
  * Prototypes
@@ -342,12 +342,12 @@ extern    int     buftvtots       (const char *, l_fp *);
 extern char *  fptoa           (s_fp, short);
 extern char *  fptoms          (s_fp, short);
 extern int     hextolfp        (const char *, l_fp *);
-extern  void    gpstolfp        (int, int, unsigned long, l_fp *);
+extern void    gpstolfp        (int, int, unsigned long, l_fp *);
 extern int     mstolfp         (const char *, l_fp *);
 extern char *  prettydate      (l_fp *);
 extern char *  gmprettydate    (l_fp *);
 extern char *  uglydate        (l_fp *);
-extern  void    mfp_mul         (int32 *, u_int32 *, int32, u_int32, int32, u_int32);
+extern void    mfp_mul         (int32 *, u_int32 *, int32, u_int32, int32, u_int32);
 
 extern void    get_systime     (l_fp *);
 extern int     step_systime    (double);