*: Use true/false instead of 1/0 when assigning variable for bool type

Signed-off-by: Donatas Abraitis <donatas.abraitis@gmail.com>

diff --git a/bgpd/bgp_route.c b/bgpd/bgp_route.c
index 1cd0bbe5786226cfbf58101ed9692bbe2a4755d4..996746bf82e7402b3704dea93d69e1700a4d1d29 100644 (file)
--- a/bgpd/bgp_route.c
+++ b/bgpd/bgp_route.c
@@ -299,7 +299,7 @@ static int bgp_node_set_defer_flag(struct bgp_node *rn, bool delete)
 {
        struct peer *peer;
        struct bgp_path_info *old_pi, *nextpi;
-       bool set_flag = 0;
+       bool set_flag = false;
        struct bgp *bgp = NULL;
        struct bgp_table *table = NULL;
        afi_t afi = 0;
@@ -339,7 +339,7 @@ static int bgp_node_set_defer_flag(struct bgp_node *rn, bool delete)
                 */
                if (CHECK_FLAG(old_pi->flags, BGP_PATH_STALE)
                    && (old_pi->sub_type == BGP_ROUTE_NORMAL)) {
-                       set_flag = 1;
+                       set_flag = true;
                } else {
                        /* If the peer is graceful restart capable and peer is
                         * restarting mode, set the flag BGP_NODE_SELECT_DEFER
@@ -349,7 +349,7 @@ static int bgp_node_set_defer_flag(struct bgp_node *rn, bool delete)
                            && BGP_PEER_RESTARTING_MODE(peer)
                            && (old_pi
                                && old_pi->sub_type == BGP_ROUTE_NORMAL)) {
-                               set_flag = 1;
+                               set_flag = true;
                        }
                }
                if (set_flag)

diff --git a/bgpd/bgp_vty.c b/bgpd/bgp_vty.c
index 28e22b685d85baf5401c6984df45cedbbd5b4760..29d3b3878ab270b615fb139a5c9f9868c9cf32bd 100644 (file)
--- a/bgpd/bgp_vty.c
+++ b/bgpd/bgp_vty.c
@@ -9440,7 +9440,7 @@ static void bgp_show_neighnor_graceful_restart_rbit(struct vty *vty,
                                                    bool use_json,
                                                    json_object *json)
 {
-       bool rbit_status = 0;
+       bool rbit_status = false;
 
        if (!use_json)
                vty_out(vty, "\n    R bit: ");
@@ -9450,9 +9450,9 @@ static void bgp_show_neighnor_graceful_restart_rbit(struct vty *vty,
            && (p->status == Established)) {
 
                if (CHECK_FLAG(p->cap, PEER_CAP_RESTART_BIT_RCV))
-                       rbit_status = 1;
+                       rbit_status = true;
                else
-                       rbit_status = 0;
+                       rbit_status = false;
        }
 
        if (rbit_status) {

diff --git a/lib/frr_zmq.c b/lib/frr_zmq.c
index 7781beae5e95535a9762605e7ef2178d84321e51..565936a41026d209b920cb7a714bb46fecaade45 100644 (file)
--- a/lib/frr_zmq.c
+++ b/lib/frr_zmq.c
@@ -177,7 +177,7 @@ int funcname_frrzmq_thread_add_read(struct thread_master *master,
        else {
                cb = XCALLOC(MTYPE_ZEROMQ_CB, sizeof(struct frrzmq_cb));
 
-               cb->write.cancelled = 1;
+               cb->write.cancelled = true;
                *cbp = cb;
        }
 
@@ -187,7 +187,7 @@ int funcname_frrzmq_thread_add_read(struct thread_master *master,
        cb->read.cb_msg = msgfunc;
        cb->read.cb_part = partfunc;
        cb->read.cb_error = errfunc;
-       cb->read.cancelled = 0;
+       cb->read.cancelled = false;
 
        if (events & ZMQ_POLLIN) {
                if (cb->read.thread) {
@@ -285,7 +285,7 @@ int funcname_frrzmq_thread_add_write(struct thread_master *master,
        else {
                cb = XCALLOC(MTYPE_ZEROMQ_CB, sizeof(struct frrzmq_cb));
 
-               cb->read.cancelled = 1;
+               cb->read.cancelled = true;
                *cbp = cb;
        }
 
@@ -295,7 +295,7 @@ int funcname_frrzmq_thread_add_write(struct thread_master *master,
        cb->write.cb_msg = msgfunc;
        cb->write.cb_part = NULL;
        cb->write.cb_error = errfunc;
-       cb->write.cancelled = 0;
+       cb->write.cancelled = false;
 
        if (events & ZMQ_POLLOUT) {
                if (cb->write.thread) {
@@ -316,7 +316,7 @@ void frrzmq_thread_cancel(struct frrzmq_cb **cb, struct cb_core *core)
 {
        if (!cb || !*cb)
                return;
-       core->cancelled = 1;
+       core->cancelled = true;
        if (core->thread) {
                thread_cancel(core->thread);
                core->thread = NULL;

diff --git a/lib/libfrr.c b/lib/libfrr.c
index 4fb43edff28e3d88b431d173313ad35fab2961d9..3622890e46585bd3dec2640af4bba159144f103c 100644 (file)
--- a/lib/libfrr.c
+++ b/lib/libfrr.c
@@ -383,7 +383,7 @@ static int frr_opt(int opt)
                exit(0);
                break;
        case 'd':
-               di->daemon_mode = 1;
+               di->daemon_mode = true;
                break;
        case 'M':
                oc = XMALLOC(MTYPE_TMP, sizeof(*oc));
@@ -467,12 +467,12 @@ static int frr_opt(int opt)
        case 'C':
                if (di->flags & FRR_NO_CFG_PID_DRY)
                        return 1;
-               di->dryrun = 1;
+               di->dryrun = true;
                break;
        case 't':
                if (di->flags & FRR_NO_CFG_PID_DRY)
                        return 1;
-               di->terminal = 1;
+               di->terminal = true;
                break;
        case 'z':
                di->zpathspace = true;

diff --git a/lib/module.c b/lib/module.c
index 098c5506846a5e13606511db48ebc545d8963f1d..14d5cfd44ff0d73f08fd72ce1e7ad94652f19b3f 100644 (file)
--- a/lib/module.c
+++ b/lib/module.c
@@ -58,7 +58,7 @@ static const char *execname = NULL;
 
 void frrmod_init(struct frrmod_runtime *modinfo)
 {
-       modinfo->finished_loading = 1;
+       modinfo->finished_loading = true;
        *frrmod_last = modinfo;
        frrmod_last = &modinfo->next;
 
@@ -134,7 +134,7 @@ struct frrmod_runtime *frrmod_load(const char *spec, const char *dir, char *err,
                goto out_fail;
        }
 
-       rtinfo->finished_loading = 1;
+       rtinfo->finished_loading = true;
 
        *frrmod_last = rtinfo;
        frrmod_last = &rtinfo->next;

diff --git a/lib/plist.c b/lib/plist.c
index e465963f21322c1cb63a6041edb48bb021bae4e8..40131aebed5c4e45e73481a974736370066386c7 100644 (file)
--- a/lib/plist.c
+++ b/lib/plist.c
@@ -2039,7 +2039,7 @@ static void prefix_list_reset_afi(afi_t afi, int orf)
        assert(master->str.head == NULL);
        assert(master->str.tail == NULL);
 
-       master->seqnum = 1;
+       master->seqnum = true;
        master->recent = NULL;
 }