@@ -544,38 +544,23 @@ rsc_managed_recursive(const pcmk_resource_t *rsc)
544544}
545545
546546bool
547- pcmk__is_set_recursive (const pcmk_resource_t * rsc , uint64_t flag , bool any )
547+ pcmk__is_set_recursive (const pcmk_resource_t * rsc , uint64_t flag )
548548{
549- const bool all = !any ;
550- bool is_set = pcmk__is_set (rsc -> flags , flag );
551-
552- if (any && is_set ) {
549+ if (pcmk__is_set (rsc -> flags , flag )) {
553550 return true;
554551 }
555552
556- if (all && !is_set ) {
557- return false;
558- }
559-
560553 for (const GList * iter = rsc -> priv -> children ; iter != NULL ;
561554 iter = iter -> next ) {
562555
563- is_set = pcmk__is_set_recursive ( iter -> data , flag , any ) ;
556+ const pcmk_resource_t * child_rsc = iter -> data ;
564557
565- if (any && is_set ) {
558+ if (pcmk__is_set_recursive ( child_rsc , flag ) ) {
566559 return true;
567560 }
568-
569- if (all && !is_set ) {
570- return false;
571- }
572561 }
573562
574- /* If all is true, then flag was set for rsc and all of its descendants.
575- * Otherwise, any is true, and flag was not set for rsc or any of its
576- * descendants.
577- */
578- return all ;
563+ return false;
579564}
580565
581566PCMK__OUTPUT_ARGS ("clone" , "uint32_t" , "pcmk_resource_t *" , "GList *" ,
@@ -744,10 +729,9 @@ pe__clone_default(pcmk__output_t *out, va_list args)
744729 pcmk__insert_dup (stopped , child_rsc -> id , "Stopped" );
745730 }
746731
747- } else if (pcmk__is_set_recursive (child_rsc , pcmk__rsc_removed , true )
732+ } else if (pcmk__is_set_recursive (child_rsc , pcmk__rsc_removed )
748733 || !rsc_managed_recursive (child_rsc )
749- || pcmk__is_set_recursive (child_rsc , pcmk__rsc_failed ,
750- true)) {
734+ || pcmk__is_set_recursive (child_rsc , pcmk__rsc_failed )) {
751735
752736 // Print individual instance when active removed/unmanaged/failed
753737 print_full = TRUE;
0 commit comments