*: 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, 24 insertions, 23 deletions

diff --git a/isisd/isis_vty.c b/isisd/isis_vty.c
index 66d79b2e9f..ce2952c135 100644
--- a/isisd/isis_vty.c
+++ b/isisd/isis_vty.c
@@ -635,8 +635,8 @@ DEFUN (isis_hello_interval,
 		return CMD_WARNING_CONFIG_FAILED;
 	}
 
-	circuit->hello_interval[0] = (u_int16_t)interval;
-	circuit->hello_interval[1] = (u_int16_t)interval;
+	circuit->hello_interval[0] = (uint16_t)interval;
+	circuit->hello_interval[1] = (uint16_t)interval;
 
 	return CMD_SUCCESS;
 }
@@ -682,7 +682,7 @@ DEFUN (isis_hello_interval_l1,
 		return CMD_WARNING_CONFIG_FAILED;
 	}
 
-	circuit->hello_interval[0] = (u_int16_t)interval;
+	circuit->hello_interval[0] = (uint16_t)interval;
 
 	return CMD_SUCCESS;
 }
@@ -728,7 +728,7 @@ DEFUN (isis_hello_interval_l2,
 		return CMD_WARNING_CONFIG_FAILED;
 	}
 
-	circuit->hello_interval[1] = (u_int16_t)interval;
+	circuit->hello_interval[1] = (uint16_t)interval;
 
 	return CMD_SUCCESS;
 }
@@ -774,8 +774,8 @@ DEFUN (isis_hello_multiplier,
 		return CMD_WARNING_CONFIG_FAILED;
 	}
 
-	circuit->hello_multiplier[0] = (u_int16_t)mult;
-	circuit->hello_multiplier[1] = (u_int16_t)mult;
+	circuit->hello_multiplier[0] = (uint16_t)mult;
+	circuit->hello_multiplier[1] = (uint16_t)mult;
 
 	return CMD_SUCCESS;
 }
@@ -822,7 +822,7 @@ DEFUN (isis_hello_multiplier_l1,
 		return CMD_WARNING_CONFIG_FAILED;
 	}
 
-	circuit->hello_multiplier[0] = (u_int16_t)mult;
+	circuit->hello_multiplier[0] = (uint16_t)mult;
 
 	return CMD_SUCCESS;
 }
@@ -869,7 +869,7 @@ DEFUN (isis_hello_multiplier_l2,
 		return CMD_WARNING_CONFIG_FAILED;
 	}
 
-	circuit->hello_multiplier[1] = (u_int16_t)mult;
+	circuit->hello_multiplier[1] = (uint16_t)mult;
 
 	return CMD_SUCCESS;
 }
@@ -962,8 +962,8 @@ DEFUN (csnp_interval,
 		return CMD_WARNING_CONFIG_FAILED;
 	}
 
-	circuit->csnp_interval[0] = (u_int16_t)interval;
-	circuit->csnp_interval[1] = (u_int16_t)interval;
+	circuit->csnp_interval[0] = (uint16_t)interval;
+	circuit->csnp_interval[1] = (uint16_t)interval;
 
 	return CMD_SUCCESS;
 }
@@ -1009,7 +1009,7 @@ DEFUN (csnp_interval_l1,
 		return CMD_WARNING_CONFIG_FAILED;
 	}
 
-	circuit->csnp_interval[0] = (u_int16_t)interval;
+	circuit->csnp_interval[0] = (uint16_t)interval;
 
 	return CMD_SUCCESS;
 }
@@ -1055,7 +1055,7 @@ DEFUN (csnp_interval_l2,
 		return CMD_WARNING_CONFIG_FAILED;
 	}
 
-	circuit->csnp_interval[1] = (u_int16_t)interval;
+	circuit->csnp_interval[1] = (uint16_t)interval;
 
 	return CMD_SUCCESS;
 }
@@ -1100,8 +1100,8 @@ DEFUN (psnp_interval,
 		return CMD_WARNING_CONFIG_FAILED;
 	}
 
-	circuit->psnp_interval[0] = (u_int16_t)interval;
-	circuit->psnp_interval[1] = (u_int16_t)interval;
+	circuit->psnp_interval[0] = (uint16_t)interval;
+	circuit->psnp_interval[1] = (uint16_t)interval;
 
 	return CMD_SUCCESS;
 }
@@ -1147,7 +1147,7 @@ DEFUN (psnp_interval_l1,
 		return CMD_WARNING_CONFIG_FAILED;
 	}
 
-	circuit->psnp_interval[0] = (u_int16_t)interval;
+	circuit->psnp_interval[0] = (uint16_t)interval;
 
 	return CMD_SUCCESS;
 }
@@ -1193,7 +1193,7 @@ DEFUN (psnp_interval_l2,
 		return CMD_WARNING_CONFIG_FAILED;
 	}
 
-	circuit->psnp_interval[1] = (u_int16_t)interval;
+	circuit->psnp_interval[1] = (uint16_t)interval;
 
 	return CMD_SUCCESS;
 }
@@ -1618,7 +1618,7 @@ DEFUN (spf_interval,
 {
 	int idx_number = 1;
 	VTY_DECLVAR_CONTEXT(isis_area, area);
-	u_int16_t interval;
+	uint16_t interval;
 
 	interval = atoi(argv[idx_number]->arg);
 	area->min_spf_interval[0] = interval;
@@ -1655,7 +1655,7 @@ DEFUN (spf_interval_l1,
 {
 	int idx_number = 2;
 	VTY_DECLVAR_CONTEXT(isis_area, area);
-	u_int16_t interval;
+	uint16_t interval;
 
 	interval = atoi(argv[idx_number]->arg);
 	area->min_spf_interval[0] = interval;
@@ -1687,7 +1687,7 @@ DEFUN (spf_interval_l2,
 {
 	int idx_number = 2;
 	VTY_DECLVAR_CONTEXT(isis_area, area);
-	u_int16_t interval;
+	uint16_t interval;
 
 	interval = atoi(argv[idx_number]->arg);
 	area->min_spf_interval[1] = interval;
@@ -1934,8 +1934,9 @@ DEFUN (no_lsp_refresh_interval,
 
 static int area_passwd_set(struct vty *vty, int level,
 			   int (*type_set)(struct isis_area *area, int level,
-					   const char *passwd, u_char snp_auth),
-			   const char *passwd, u_char snp_auth)
+					   const char *passwd,
+					   uint8_t snp_auth),
+			   const char *passwd, uint8_t snp_auth)
 {
 	VTY_DECLVAR_CONTEXT(isis_area, area);
 
@@ -1963,7 +1964,7 @@ DEFUN (area_passwd_md5,
 	int idx_password = 0;
 	int idx_word = 2;
 	int idx_type = 5;
-	u_char snp_auth = 0;
+	uint8_t snp_auth = 0;
 	int level = strmatch(argv[idx_password]->text, "domain-password")
 			    ? IS_LEVEL_2
 			    : IS_LEVEL_1;
@@ -2006,7 +2007,7 @@ DEFUN (area_passwd_clear,
 	int idx_password = 0;
 	int idx_word = 2;
 	int idx_type = 5;
-	u_char snp_auth = 0;
+	uint8_t snp_auth = 0;
 	int level = strmatch(argv[idx_password]->text, "domain-password")
 			    ? IS_LEVEL_2
 			    : IS_LEVEL_1;