@@ -2590,20 +2590,20 @@ static int setup_bus(ctx *ctx)
25902590 // Must use the default loop so that dfree() can use it without context.
25912591 rc = sd_event_default (& ctx -> event );
25922592 if (rc < 0 ) {
2593- warnx ("sd_event failed " );
2593+ warnx ("Failed creating event loop " );
25942594 goto out ;
25952595 }
25962596
25972597 rc = sd_bus_default (& ctx -> bus );
25982598 if (rc < 0 ) {
2599- warnx ("Couldn't get bus " );
2599+ warnx ("Couldn't connect to D-Bus " );
26002600 goto out ;
26012601 }
26022602
26032603 rc = sd_bus_attach_event (ctx -> bus , ctx -> event ,
26042604 SD_EVENT_PRIORITY_NORMAL );
26052605 if (rc < 0 ) {
2606- warnx ("Failed attach" );
2606+ warnx ("Failed attach to event loop " );
26072607 goto out ;
26082608 }
26092609
@@ -2616,7 +2616,7 @@ static int setup_bus(ctx *ctx)
26162616 bus_mctpd_find ,
26172617 ctx );
26182618 if (rc < 0 ) {
2619- warnx ("Failed dbus object" );
2619+ warnx ("Failed creating D-Bus object" );
26202620 goto out ;
26212621 }
26222622
@@ -2627,7 +2627,7 @@ static int setup_bus(ctx *ctx)
26272627 bus_endpoint_find ,
26282628 ctx );
26292629 if (rc < 0 ) {
2630- warnx ("Failed dbus fallback endpoint %s" , strerror (- rc ));
2630+ warnx ("Failed adding D-Bus interface: %s" , strerror (- rc ));
26312631 goto out ;
26322632 }
26332633
@@ -2638,7 +2638,7 @@ static int setup_bus(ctx *ctx)
26382638 bus_endpoint_find ,
26392639 ctx );
26402640 if (rc < 0 ) {
2641- warnx ("Failed dbus fallback endpoint %s" , strerror (- rc ));
2641+ warnx ("Failed adding extra D-Bus interface: %s" , strerror (- rc ));
26422642 goto out ;
26432643 }
26442644
@@ -2650,20 +2650,20 @@ static int setup_bus(ctx *ctx)
26502650 bus_endpoint_find_uuid ,
26512651 ctx );
26522652 if (rc < 0 ) {
2653- warnx ("Failed dbus fallback endpoint uuid %s" , strerror (- rc ));
2653+ warnx ("Failed adding uuid D-Bus interface: %s" , strerror (- rc ));
26542654 goto out ;
26552655 }
26562656
26572657 rc = sd_bus_add_object_manager (ctx -> bus , NULL , MCTP_DBUS_PATH );
26582658 if (rc < 0 ) {
2659- warnx ("%s failed %s" , __func__ , strerror (- rc ));
2659+ warnx ("Adding object manager failed: %s" , strerror (- rc ));
26602660 goto out ;
26612661 }
26622662
26632663 rc = sd_bus_add_node_enumerator (ctx -> bus , NULL ,
26642664 MCTP_DBUS_PATH , mctpd_dbus_enumerate , ctx );
26652665 if (rc < 0 ) {
2666- warnx ("Failed add enumerator" );
2666+ warnx ("Failed to add node enumerator: %s" , strerror ( - rc ) );
26672667 goto out ;
26682668 }
26692669
0 commit comments