diff options
| author | Lou Berger <lberger@labn.net> | 2018-03-28 10:30:54 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-03-28 10:30:54 -0400 |
| commit | 615e608d76bd3e1acf1769c914142210ac88e3f7 (patch) | |
| tree | 1159398cc86aa18901a73480303fb52e09b1f9cc /ospfd/ospf_interface.c | |
| parent | 79968d2e0bb21485f47934fe4110ab33da8803c7 (diff) | |
| parent | d7c0a89a3a5697783a6dd89333ab660074790890 (diff) | |
Merge pull request #1854 from qlyoung/integer-standards-compliance
*: use C99 standard fixed-width integer types
Diffstat (limited to 'ospfd/ospf_interface.c')
| -rw-r--r-- | ospfd/ospf_interface.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/ospfd/ospf_interface.c b/ospfd/ospf_interface.c index 0305305b81..52b954d6a1 100644 --- a/ospfd/ospf_interface.c +++ b/ospfd/ospf_interface.c @@ -76,8 +76,8 @@ int ospf_interface_neighbor_count(struct ospf_interface *oi) int ospf_if_get_output_cost(struct ospf_interface *oi) { /* If all else fails, use default OSPF cost */ - u_int32_t cost; - u_int32_t bw, refbw; + uint32_t cost; + uint32_t bw, refbw; /* ifp speed and bw can be 0 in some platforms, use ospf default bw if bw is configured under interface it would be used. @@ -96,7 +96,7 @@ int ospf_if_get_output_cost(struct ospf_interface *oi) /* See if a cost can be calculated from the zebra processes interface bandwidth field. */ else { - cost = (u_int32_t)((double)refbw / (double)bw + (double)0.5); + cost = (uint32_t)((double)refbw / (double)bw + (double)0.5); if (cost < 1) cost = 1; else if (cost > 65535) @@ -108,7 +108,7 @@ int ospf_if_get_output_cost(struct ospf_interface *oi) void ospf_if_recalculate_output_cost(struct interface *ifp) { - u_int32_t newcost; + uint32_t newcost; struct route_node *rn; for (rn = route_top(IF_OIFS(ifp)); rn; rn = route_next(rn)) { @@ -825,7 +825,7 @@ void ospf_vl_data_free(struct ospf_vl_data *vl_data) XFREE(MTYPE_OSPF_VL_DATA, vl_data); } -u_int vlink_count = 0; +unsigned int vlink_count = 0; struct ospf_interface *ospf_vl_new(struct ospf *ospf, struct ospf_vl_data *vl_data) @@ -1174,7 +1174,7 @@ void ospf_crypt_key_add(struct list *crypt, struct crypt_key *ck) listnode_add(crypt, ck); } -struct crypt_key *ospf_crypt_key_lookup(struct list *auth_crypt, u_char key_id) +struct crypt_key *ospf_crypt_key_lookup(struct list *auth_crypt, uint8_t key_id) { struct listnode *node; struct crypt_key *ck; @@ -1186,7 +1186,7 @@ struct crypt_key *ospf_crypt_key_lookup(struct list *auth_crypt, u_char key_id) return NULL; } -int ospf_crypt_key_delete(struct list *auth_crypt, u_char key_id) +int ospf_crypt_key_delete(struct list *auth_crypt, uint8_t key_id) { struct listnode *node, *nnode; struct crypt_key *ck; @@ -1202,7 +1202,7 @@ int ospf_crypt_key_delete(struct list *auth_crypt, u_char key_id) return 0; } -u_char ospf_default_iftype(struct interface *ifp) +uint8_t ospf_default_iftype(struct interface *ifp) { if (if_is_pointopoint(ifp)) return OSPF_IFTYPE_POINTOPOINT; |