X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Flibsystemd-bus%2Fbus-internal.h;h=a1d60b113353cc79e4e765c9360faec8023a648a;hb=718db96199eb307751264e4163555662c9a389fa;hp=4f9d941c6331bd4048352b875a01d2f3ed6754ba;hpb=76b543756ef69ce69784d571aefe8de65eaeb331;p=elogind.git diff --git a/src/libsystemd-bus/bus-internal.h b/src/libsystemd-bus/bus-internal.h index 4f9d941c6..a1d60b113 100644 --- a/src/libsystemd-bus/bus-internal.h +++ b/src/libsystemd-bus/bus-internal.h @@ -119,11 +119,12 @@ enum bus_state { BUS_AUTHENTICATING, BUS_HELLO, BUS_RUNNING, + BUS_CLOSING, BUS_CLOSED }; static inline bool BUS_IS_OPEN(enum bus_state state) { - return state > BUS_UNSET && state < BUS_CLOSED; + return state > BUS_UNSET && state < BUS_CLOSING; } enum bus_auth { @@ -155,7 +156,6 @@ struct sd_bus { bool anonymous_auth:1; bool prefer_readv:1; bool prefer_writev:1; - bool processing:1; bool match_callbacks_modified:1; bool filter_callbacks_modified:1; bool nodes_modified:1; @@ -307,4 +307,4 @@ char *bus_address_escape(const char *v); * bus from the callback doesn't destroy the object we are working * on */ #define BUS_DONT_DESTROY(bus) \ - _cleanup_bus_unref_ sd_bus *_dont_destroy_##bus = sd_bus_ref(bus) + _cleanup_bus_unref_ _unused_ sd_bus *_dont_destroy_##bus = sd_bus_ref(bus)