summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNeale Ranns <nranns@cisco.com>2017-11-10 02:34:04 -0800
committerNeale Ranns <nranns@cisco.com>2017-11-10 02:34:04 -0800
commita2a7db8c604f625b9205bcf721dd556292b6c297 (patch)
treeb66242b26faf0c520806cf074b639ca5c43ef195
parentad0c77f163472e0715c167aec59a26bcd34d649b (diff)
BIER: replace uintXX_t with uXX
Change-Id: I0ba698da9739c11de3a368fe4cf3617167a8d854 Signed-off-by: Neale Ranns <nranns@cisco.com>
-rw-r--r--src/vnet/bier/bier_bit_string.c4
-rw-r--r--src/vnet/bier/bier_bit_string.h6
-rw-r--r--src/vnet/bier/bier_fmask.h2
-rw-r--r--src/vnet/bier/bier_types.c12
4 files changed, 12 insertions, 12 deletions
diff --git a/src/vnet/bier/bier_bit_string.c b/src/vnet/bier/bier_bit_string.c
index aa42e083be8..c22a24286e8 100644
--- a/src/vnet/bier/bier_bit_string.c
+++ b/src/vnet/bier/bier_bit_string.c
@@ -53,7 +53,7 @@ bier_bit_string_set_bit (bier_bit_string_t *bit_string,
bier_bp_t bp)
{
bier_bit_mask_bucket_t bmask;
- uint16_t byte_pos, bit_pos;
+ u16 byte_pos, bit_pos;
BIER_BIT_POS_IS_VALID(bp, bit_string);
BIER_GET_STRING_POS(bp, byte_pos, bit_pos, bit_string);
@@ -66,7 +66,7 @@ void
bier_bit_string_clear_bit (bier_bit_string_t *bit_string,
bier_bp_t bp)
{
- uint16_t byte_pos, bit_pos;
+ u16 byte_pos, bit_pos;
BIER_BIT_POS_IS_VALID(bp, bit_string);
BIER_GET_STRING_POS(bp, byte_pos, bit_pos, bit_string);
diff --git a/src/vnet/bier/bier_bit_string.h b/src/vnet/bier/bier_bit_string.h
index 9baebfa6e69..fa42e6a62a8 100644
--- a/src/vnet/bier/bier_bit_string.h
+++ b/src/vnet/bier/bier_bit_string.h
@@ -53,7 +53,7 @@ extern u8 *format_bier_bit_string(u8 * s, va_list * args);
always_inline int
bier_bit_string_is_zero (const bier_bit_string_t *src)
{
- uint16_t index;
+ u16 index;
for (index = 0;
index < BIER_BBS_NUM_INT_BUKCETS(src);
@@ -69,7 +69,7 @@ always_inline void
bier_bit_string_clear_string (const bier_bit_string_t *src,
bier_bit_string_t *dest)
{
- uint16_t index;
+ u16 index;
ASSERT(src->bbs_len == dest->bbs_len);
@@ -84,7 +84,7 @@ always_inline void
bier_bit_string_logical_and_string (const bier_bit_string_t *src,
bier_bit_string_t *dest)
{
- uint16_t index;
+ u16 index;
ASSERT(src->bbs_len == dest->bbs_len);
diff --git a/src/vnet/bier/bier_fmask.h b/src/vnet/bier/bier_fmask.h
index d5ff4590ffe..13eab5360e1 100644
--- a/src/vnet/bier/bier_fmask.h
+++ b/src/vnet/bier/bier_fmask.h
@@ -54,7 +54,7 @@ typedef struct bier_fmask_bits_t_ {
* The total number of references to bits set on this mask
* in effect a count of the number of children.
*/
- uint32_t bfmb_count;
+ u32 bfmb_count;
} bier_fmask_bits_t;
/**
diff --git a/src/vnet/bier/bier_types.c b/src/vnet/bier/bier_types.c
index 0d27524aeb1..680182de597 100644
--- a/src/vnet/bier/bier_types.c
+++ b/src/vnet/bier/bier_types.c
@@ -56,37 +56,37 @@ const static u16 bier_hdr_len_prefix_len[] = {
[BIER_HDR_LEN_4096] = 13,
};
-uint32_t
+u32
bier_hdr_len_id_to_num_buckets (bier_hdr_len_id_t id)
{
return (bier_hdr_len_num_buckets[id]);
}
-uint32_t
+u32
bier_hdr_len_id_to_num_bytes (bier_hdr_len_id_t id)
{
return (bier_hdr_len_id_to_num_buckets(id));
}
-uint32_t
+u32
bier_hdr_len_id_to_max_bucket (bier_hdr_len_id_t id)
{
return (bier_hdr_len_id_to_num_buckets(id) - 1);
}
-uint32_t
+u32
bier_hdr_len_id_to_num_bits (bier_hdr_len_id_t id)
{
return (bier_hdr_len_num_bits[id]);
}
-uint32_t
+u32
bier_hdr_len_id_to_max_bit (bier_hdr_len_id_t id)
{
return (bier_hdr_len_id_to_num_bits(id));
}
-uint32_t
+u32
bier_hdr_len_id_to_prefix_len (bier_hdr_len_id_t id)
{
return (bier_hdr_len_prefix_len[id]);