X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fshared%2Fbarrier.h;h=b8954694d3bb2149f4928f047095b755dec630ff;hb=999463d14994808ff15fc4dd66c540d8a29f8121;hp=53b4439fb2b5c78d03960dbc97e32914e463f670;hpb=7566e26721ee95d6fc864e9e6654fb61bd3cd603;p=elogind.git

diff --git a/src/shared/barrier.h b/src/shared/barrier.h
index 53b4439fb..b8954694d 100644
--- a/src/shared/barrier.h
+++ b/src/shared/barrier.h
@@ -21,14 +21,9 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include <errno.h>
-#include <inttypes.h>
-#include <stdlib.h>
-#include <string.h>
 #include <sys/types.h>
 
 #include "macro.h"
-#include "util.h"
 
 /* See source file for an API description. */
 
@@ -62,6 +57,8 @@ struct Barrier {
 int barrier_create(Barrier *obj);
 void barrier_destroy(Barrier *b);
 
+DEFINE_TRIVIAL_CLEANUP_FUNC(Barrier*, barrier_destroy);
+
 void barrier_set_role(Barrier *b, unsigned int role);
 
 bool barrier_place(Barrier *b);
@@ -89,6 +86,6 @@ static inline bool barrier_is_aborted(Barrier *b) {
 }
 
 static inline bool barrier_place_and_sync(Barrier *b) {
-        barrier_place(b);
+        (void) barrier_place(b);
         return barrier_sync(b);
 }