*: use C99 standard fixed-width integer types

The following types are nonstandard:
- u_char
- u_short
- u_int
- u_long
- u_int8_t
- u_int16_t
- u_int32_t

Replace them with the C99 standard types:
- uint8_t
- unsigned short
- unsigned int
- unsigned long
- uint8_t
- uint16_t
- uint32_t

Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>

1 files changed, 10 insertions, 10 deletions

diff --git a/lib/checksum.c b/lib/checksum.c
index 8eef73e243..18e3850474 100644
--- a/lib/checksum.c
+++ b/lib/checksum.c
@@ -12,10 +12,10 @@
 int /* return checksum in low-order 16 bits */
 	in_cksum(void *parg, int nbytes)
 {
-	u_short *ptr = parg;
+	unsigned short *ptr = parg;
 	register long sum; /* assumes long == 32 bits */
-	u_short oddbyte;
-	register u_short answer; /* assumes u_short == 16 bits */
+	unsigned short oddbyte;
+	register unsigned short answer; /* assumes unsigned short == 16 bits */
 
 	/*
 	 * Our algorithm is simple, using a 32-bit accumulator (sum),
@@ -32,7 +32,7 @@ int /* return checksum in low-order 16 bits */
 	/* mop up an odd byte, if necessary */
 	if (nbytes == 1) {
 		oddbyte = 0; /* make sure top half is zero */
-		*((u_char *)&oddbyte) = *(u_char *)ptr; /* one byte only */
+		*((uint8_t *)&oddbyte) = *(uint8_t *)ptr; /* one byte only */
 		sum += oddbyte;
 	}
 
@@ -53,13 +53,13 @@ int /* return checksum in low-order 16 bits */
    index required in the specification ISO 8473, Annex C.1 */
 /* calling with offset == FLETCHER_CHECKSUM_VALIDATE will validate the checksum
    without modifying the buffer; a valid checksum returns 0 */
-u_int16_t fletcher_checksum(u_char *buffer, const size_t len,
-			    const uint16_t offset)
+uint16_t fletcher_checksum(uint8_t *buffer, const size_t len,
+			   const uint16_t offset)
 {
-	u_int8_t *p;
+	uint8_t *p;
 	int x, y, c0, c1;
-	u_int16_t checksum = 0;
-	u_int16_t *csum;
+	uint16_t checksum = 0;
+	uint16_t *csum;
 	size_t partial_len, i, left = len;
 
 	if (offset != FLETCHER_CHECKSUM_VALIDATE)
@@ -67,7 +67,7 @@ u_int16_t fletcher_checksum(u_char *buffer, const size_t len,
 	{
 		assert(offset
 		       < (len - 1)); /* account for two bytes of checksum */
-		csum = (u_int16_t *)(buffer + offset);
+		csum = (uint16_t *)(buffer + offset);
 		*(csum) = 0;
 	}