Merge pull request #4624 from qlyoung/use-standard-bools

*: s/TRUE/true/, s/FALSE/false/

7 files changed, 23 insertions, 26 deletions

diff --git a/zebra/interface.h b/zebra/interface.h
index 6a3914451..e134b9b42 100644
--- a/zebra/interface.h
+++ b/zebra/interface.h
@@ -46,7 +46,7 @@ extern "C" {
 struct rtadvconf {
 	/* A flag indicating whether or not the router sends periodic Router
 	   Advertisements and responds to Router Solicitations.
-	   Default: FALSE */
+	   Default: false */
 	int AdvSendAdvertisements;
 
 	/* The maximum time allowed between sending unsolicited multicast
@@ -70,19 +70,19 @@ struct rtadvconf {
 	/* Unsolicited Router Advertisements' interval timer. */
 	int AdvIntervalTimer;
 
-	/* The TRUE/FALSE value to be placed in the "Managed address
+	/* The true/false value to be placed in the "Managed address
 	   configuration" flag field in the Router Advertisement.  See
 	   [ADDRCONF].
 
-	   Default: FALSE */
+	   Default: false */
 	int AdvManagedFlag;
 
 
-	/* The TRUE/FALSE value to be placed in the "Other stateful
+	/* The true/false value to be placed in the "Other stateful
 	   configuration" flag field in the Router Advertisement.  See
 	   [ADDRCONF].
 
-	   Default: FALSE */
+	   Default: false */
 	int AdvOtherConfigFlag;
 
 	/* The value to be placed in MTU options sent by the router.  A
@@ -136,10 +136,10 @@ struct rtadvconf {
 	   included in the list of advertised prefixes. */
 	struct list *AdvPrefixList;
 
-	/* The TRUE/FALSE value to be placed in the "Home agent"
+	/* The true/false value to be placed in the "Home agent"
 	   flag field in the Router Advertisement.  See [RFC6275 7.1].
 
-	   Default: FALSE */
+	   Default: false */
 	int AdvHomeAgentFlag;
 #ifndef ND_RA_FLAG_HOME_AGENT
 #define ND_RA_FLAG_HOME_AGENT 	0x20
@@ -159,10 +159,10 @@ struct rtadvconf {
 	int HomeAgentLifetime;
 #define RTADV_MAX_HALIFETIME 65520 /* 18.2 hours */
 
-	/* The TRUE/FALSE value to insert or not an Advertisement Interval
+	/* The true/false value to insert or not an Advertisement Interval
 	   option. See [RFC 6275 7.3]
 
-	   Default: FALSE */
+	   Default: false */
 	int AdvIntervalOption;
 
 	/* The value to be placed in the Default Router Preference field of
diff --git a/zebra/irdp.h b/zebra/irdp.h
index 3f4fa9346..ff4ab8dfb 100644
--- a/zebra/irdp.h
+++ b/zebra/irdp.h
@@ -32,9 +32,6 @@
 extern "C" {
 #endif
 
-#define TRUE 1
-#define FALSE 0
-
 /* ICMP Messages */
 #ifndef ICMP_ROUTERADVERT
 #define ICMP_ROUTERADVERT 9
diff --git a/zebra/irdp_interface.c b/zebra/irdp_interface.c
index c0b772cd0..8e1ca122d 100644
--- a/zebra/irdp_interface.c
+++ b/zebra/irdp_interface.c
@@ -352,7 +352,7 @@ static void irdp_if_no_shutdown(struct interface *ifp)
 
 	irdp->flags &= ~IF_SHUTDOWN;
 
-	irdp_if_start(ifp, irdp->flags & IF_BROADCAST ? FALSE : TRUE, FALSE);
+	irdp_if_start(ifp, irdp->flags & IF_BROADCAST ? false : true, false);
 }
 
 
@@ -407,7 +407,7 @@ DEFUN (ip_irdp_multicast,
 	VTY_DECLVAR_CONTEXT(interface, ifp);
 	irdp_if_get(ifp);
 
-	irdp_if_start(ifp, TRUE, TRUE);
+	irdp_if_start(ifp, true, true);
 	return CMD_SUCCESS;
 }
 
@@ -421,7 +421,7 @@ DEFUN (ip_irdp_broadcast,
 	VTY_DECLVAR_CONTEXT(interface, ifp);
 	irdp_if_get(ifp);
 
-	irdp_if_start(ifp, FALSE, TRUE);
+	irdp_if_start(ifp, false, true);
 	return CMD_SUCCESS;
 }
 
diff --git a/zebra/rib.h b/zebra/rib.h
index 292f6bc60..9d8cee8bf 100644
--- a/zebra/rib.h
+++ b/zebra/rib.h
@@ -500,7 +500,7 @@ static inline void rib_tables_iter_init(rib_tables_iter_t *iter)
 /*
  * rib_tables_iter_started
  *
- * Returns TRUE if this iterator has started iterating over the set of
+ * Returns true if this iterator has started iterating over the set of
  * tables.
  */
 static inline int rib_tables_iter_started(rib_tables_iter_t *iter)
diff --git a/zebra/zebra_fpm.c b/zebra/zebra_fpm.c
index 32b9763c5..eaf43095b 100644
--- a/zebra/zebra_fpm.c
+++ b/zebra/zebra_fpm.c
@@ -829,7 +829,7 @@ static bool zfpm_updates_pending(void)
 /*
  * zfpm_writes_pending
  *
- * Returns TRUE if we may have something to write to the FPM.
+ * Returns true if we may have something to write to the FPM.
  */
 static int zfpm_writes_pending(void)
 {
@@ -1403,7 +1403,7 @@ static void zfpm_start_connect_timer(const char *reason)
 /*
  * zfpm_is_enabled
  *
- * Returns TRUE if the zebra FPM module has been enabled.
+ * Returns true if the zebra FPM module has been enabled.
  */
 static inline int zfpm_is_enabled(void)
 {
@@ -1413,7 +1413,7 @@ static inline int zfpm_is_enabled(void)
 /*
  * zfpm_conn_is_up
  *
- * Returns TRUE if the connection to the FPM is up.
+ * Returns true if the connection to the FPM is up.
  */
 static inline int zfpm_conn_is_up(void)
 {
@@ -1969,10 +1969,10 @@ static struct cmd_node zebra_node = {ZEBRA_NODE, "", 1};
  * One-time initialization of the Zebra FPM module.
  *
  * @param[in] port port at which FPM is running.
- * @param[in] enable TRUE if the zebra FPM module should be enabled
+ * @param[in] enable true if the zebra FPM module should be enabled
  * @param[in] format to use to talk to the FPM. Can be 'netink' or 'protobuf'.
  *
- * Returns TRUE on success.
+ * Returns true on success.
  */
 static int zfpm_init(struct thread_master *master)
 {
diff --git a/zebra/zebra_fpm_netlink.c b/zebra/zebra_fpm_netlink.c
index d5479bc62..822def318 100644
--- a/zebra/zebra_fpm_netlink.c
+++ b/zebra/zebra_fpm_netlink.c
@@ -195,7 +195,7 @@ typedef struct netlink_route_info_t_ {
  * Add information about the given nexthop to the given route info
  * structure.
  *
- * Returns TRUE if a nexthop was added, FALSE otherwise.
+ * Returns true if a nexthop was added, false otherwise.
  */
 static int netlink_route_info_add_nh(netlink_route_info_t *ri,
 				     struct nexthop *nexthop,
@@ -278,7 +278,7 @@ static uint8_t netlink_proto_from_route_type(int type)
  *
  * Fill out the route information object from the given route.
  *
- * Returns TRUE on success and FALSE on failure.
+ * Returns true on success and false on failure.
  */
 static int netlink_route_info_fill(netlink_route_info_t *ri, int cmd,
 				   rib_dest_t *dest, struct route_entry *re)
diff --git a/zebra/zebra_rib.c b/zebra/zebra_rib.c
index 2df24f75c..bef0c2cf3 100644
--- a/zebra/zebra_rib.c
+++ b/zebra/zebra_rib.c
@@ -697,7 +697,7 @@ static void rib_uninstall(struct route_node *rn, struct route_entry *re)
 /*
  * rib_can_delete_dest
  *
- * Returns TRUE if the given dest can be deleted from the table.
+ * Returns true if the given dest can be deleted from the table.
  */
 static int rib_can_delete_dest(rib_dest_t *dest)
 {
@@ -815,7 +815,7 @@ void zebra_rib_evaluate_rn_nexthops(struct route_node *rn, uint32_t seq)
  * Garbage collect the rib dest corresponding to the given route node
  * if appropriate.
  *
- * Returns TRUE if the dest was deleted, FALSE otherwise.
+ * Returns true if the dest was deleted, false otherwise.
  */
 int rib_gc_dest(struct route_node *rn)
 {
@@ -3383,7 +3383,7 @@ void rib_init(void)
  *
  * Get the first vrf id that is greater than the given vrf id if any.
  *
- * Returns TRUE if a vrf id was found, FALSE otherwise.
+ * Returns true if a vrf id was found, false otherwise.
  */
 static inline int vrf_id_get_next(vrf_id_t vrf_id, vrf_id_t *next_id_p)
 {