Change u_int64_t to uint64_t, etc in rabinpoly

These were throwing doxygen off.

Author: ongardie

src/shared/msb.h

@@ -45,9 +45,9 @@ const char bytemsb[0x100] = {
 };
 
 /* Find last set (most significant bit) */
-static inline u_int fls32 (u_int32_t) __attribute__ ((const));
-static inline u_int
-fls32 (u_int32_t v)
+static inline unsigned int fls32 (uint32_t) __attribute__ ((const));
+static inline unsigned int
+fls32 (uint32_t v)
 {
   if (v & 0xffff0000) {
     if (v & 0xff000000)
@@ -62,27 +62,27 @@ fls32 (u_int32_t v)
 }
 
 /* Ceiling of log base 2 */
-static inline int log2c32 (u_int32_t) __attribute__ ((const));
+static inline int log2c32 (uint32_t) __attribute__ ((const));
 static inline int
-log2c32 (u_int32_t v)
+log2c32 (uint32_t v)
 {
   return v ? (int) fls32 (v - 1) : -1;
 }
 
-static inline u_int fls64 (u_int64_t) __attribute__ ((const));
-static inline u_int
-fls64 (u_int64_t v)
+static inline unsigned int fls64 (uint64_t) __attribute__ ((const));
+static inline unsigned int
+fls64 (uint64_t v)
 {
-  u_int32_t h;
+  uint32_t h;
   if ((h = v >> 32))
     return 32 + fls32 (h);
   else
-    return fls32 ((u_int32_t) v);
+    return fls32 ((uint32_t) v);
 }
 
-static inline int log2c64 (u_int64_t) __attribute__ ((const));
+static inline int log2c64 (uint64_t) __attribute__ ((const));
 static inline int
-log2c64 (u_int64_t v)
+log2c64 (uint64_t v)
 {
   return v ? (int) fls64 (v - 1) : -1;
 }
@@ -97,8 +97,8 @@ log2c64 (u_int64_t v)
 
 EXTERN_C const char bytelsb[];
 
-static inline u_int
-ffs32 (u_int32_t v)
+static inline unsigned int
+ffs32 (uint32_t v)
 {
   if (v & 0xffff) {
     if (int vv = v & 0xff)
@@ -114,10 +114,10 @@ ffs32 (u_int32_t v)
     return 0;
 }
 
-static inline u_int
-ffs64 (u_int64_t v)
+static inline unsigned int
+ffs64 (uint64_t v)
 {
-  u_int32_t l;
+  uint32_t l;
   if ((l = v & 0xffffffff))
     return fls32 (l);
   else if ((l = v >> 32))

src/shared/rabinpoly.cc

@@ -18,8 +18,8 @@
 
 #include <inttypes.h>
 
-#include "rabinpoly.h"
-#include "msb.h"
+#include <shared/rabinpoly.h>
+#include <shared/msb.h>
 #ifndef INT64
 # define INT64(n) n##LL
 #endif

src/shared/rabinpoly.h

@@ -22,22 +22,21 @@
 #include <sys/types.h>
 #include <string.h>
 
-u_int64_t polymod (u_int64_t nh, u_int64_t nl, u_int64_t d);
-u_int64_t polygcd (u_int64_t x, u_int64_t y);
-void polymult (u_int64_t *php, u_int64_t *plp, u_int64_t x, u_int64_t y);
-u_int64_t polymmult (u_int64_t x, u_int64_t y, u_int64_t d);
-bool polyirreducible (u_int64_t f);
-u_int64_t polygen (u_int degree);
+uint64_t polymod (uint64_t nh, uint64_t nl, uint64_t d);
+uint64_t polygcd (uint64_t x, uint64_t y);
+void polymult (uint64_t *php, uint64_t *plp, uint64_t x, uint64_t y);
+uint64_t polymmult (uint64_t x, uint64_t y, uint64_t d);
+bool polyirreducible (uint64_t f);
 
 class rabinpoly {
   int shift;
-  u_int64_t T[256];		// Lookup table for mod
+  uint64_t T[256];		// Lookup table for mod
   void calcT ();
 public:
-  const u_int64_t poly;		// Actual polynomial
+  const uint64_t poly;		// Actual polynomial
 
-  explicit rabinpoly (u_int64_t poly);
-  u_int64_t append8 (u_int64_t p, u_char m) const
+  explicit rabinpoly (uint64_t poly);
+  uint64_t append8 (uint64_t p, uint8_t m) const
     { return ((p << 8) | m) ^ T[p >> shift]; }
 };
 
@@ -46,17 +45,17 @@ class window : public rabinpoly {
   enum {size = 48};
   //enum {size = 24};
 private:
-  u_int64_t fingerprint;
+  uint64_t fingerprint;
   int bufpos;
-  u_int64_t U[256];
-  u_char buf[size];
+  uint64_t U[256];
+  uint8_t buf[size];
 
 public:
-  window (u_int64_t poly);
-  u_int64_t slide8 (u_char m) {
+  window (uint64_t poly);
+  uint64_t slide8 (uint8_t m) {
     if (++bufpos >= size)
       bufpos = 0;
-    u_char om = buf[bufpos];
+    uint8_t om = buf[bufpos];
     buf[bufpos] = m;
     return fingerprint = append8 (fingerprint ^ U[om], m);
   }