@@ -3767,10 +3767,8 @@ static struct meta_queue *meta_queue_new(void)
37673767
37683768 new = XCALLOC (MTYPE_WORK_QUEUE , sizeof (struct meta_queue ));
37693769
3770- for (i = 0 ; i < MQ_SIZE ; i ++ ) {
3770+ for (i = 0 ; i < MQ_SIZE ; i ++ )
37713771 new -> subq [i ] = list_new ();
3772- assert (new -> subq [i ]);
3773- }
37743772
37753773 return new ;
37763774}
@@ -3956,12 +3954,7 @@ void meta_queue_free(struct meta_queue *mq, struct zebra_vrf *zvrf)
39563954/* initialise zebra rib work queue */
39573955static void rib_queue_init (void )
39583956{
3959- if (!(zrouter .ribq = work_queue_new (zrouter .master ,
3960- "route_node processing" ))) {
3961- flog_err (EC_ZEBRA_WQ_NONEXISTENT ,
3962- "%s: could not initialise work queue!" , __func__ );
3963- return ;
3964- }
3957+ zrouter .ribq = work_queue_new (zrouter .master , "route_node processing" );
39653958
39663959 /* fill in the work queue spec */
39673960 zrouter .ribq -> spec .workfunc = & meta_queue_process ;
@@ -3971,11 +3964,8 @@ static void rib_queue_init(void)
39713964 zrouter .ribq -> spec .hold = ZEBRA_RIB_PROCESS_HOLD_TIME ;
39723965 zrouter .ribq -> spec .retry = ZEBRA_RIB_PROCESS_RETRY_TIME ;
39733966
3974- if (!(zrouter .mq = meta_queue_new ())) {
3975- flog_err (EC_ZEBRA_WQ_NONEXISTENT ,
3976- "%s: could not initialise meta queue!" , __func__ );
3977- return ;
3978- }
3967+ zrouter .mq = meta_queue_new ();
3968+
39793969 return ;
39803970}
39813971
0 commit comments