X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Flogin%2Ftest-inhibit.c;h=d0727ff7c7e760b98eb381b947f30989c203f34f;hb=48a439f2dac67302f3e7d1ccb21bd93e919efd02;hp=70780c30afc18f014a68c2b7fd29f52fa02041a1;hpb=03e334a1c7dc8c20c38902aa039440763acc9b17;p=elogind.git

diff --git a/src/login/test-inhibit.c b/src/login/test-inhibit.c
index 70780c30a..d0727ff7c 100644
--- a/src/login/test-inhibit.c
+++ b/src/login/test-inhibit.c
@@ -21,11 +21,12 @@
 
 #include <unistd.h>
 
-#include "macro.h"
-#include "util.h"
 #include "sd-bus.h"
+
 #include "bus-util.h"
-#include "bus-error.h"
+#include "fd-util.h"
+#include "macro.h"
+#include "util.h"
 
 static int inhibit(sd_bus *bus, const char *what) {
         _cleanup_bus_message_unref_ sd_bus_message *reply = NULL;
@@ -42,11 +43,11 @@ static int inhibit(sd_bus *bus, const char *what) {
                         &error,
                         &reply,
                         "ssss", what, who, reason, mode);
-        assert(r >= 0);
+        assert_se(r >= 0);
 
         r = sd_bus_message_read_basic(reply, SD_BUS_TYPE_UNIX_FD, &fd);
-        assert(r >= 0);
-        assert(fd >= 0);
+        assert_se(r >= 0);
+        assert_se(fd >= 0);
 
         return dup(fd);
 }
@@ -67,18 +68,18 @@ static void print_inhibitors(sd_bus *bus) {
                         &error,
                         &reply,
                         "");
-        assert(r >= 0);
+        assert_se(r >= 0);
 
         r = sd_bus_message_enter_container(reply, SD_BUS_TYPE_ARRAY, "(ssssuu)");
-        assert(r >= 0);
+        assert_se(r >= 0);
 
         while ((r = sd_bus_message_read(reply, "(ssssuu)", &what, &who, &why, &mode, &uid, &pid)) > 0) {
-                printf("what=<%s> who=<%s> why=<%s> mode=<%s> uid=<%lu> pid=<%lu>\n",
-                       what, who, why, mode, (unsigned long) uid, (unsigned long) pid);
+                printf("what=<%s> who=<%s> why=<%s> mode=<%s> uid=<%"PRIu32"> pid=<%"PRIu32">\n",
+                       what, who, why, mode, uid, pid);
 
                 n++;
         }
-        assert(r >= 0);
+        assert_se(r >= 0);
 
         printf("%u inhibitors\n", n);
 }
@@ -89,16 +90,16 @@ int main(int argc, char*argv[]) {
         int r;
 
         r = sd_bus_open_system(&bus);
-        assert(r >= 0);
+        assert_se(r >= 0);
 
         print_inhibitors(bus);
 
         fd1 = inhibit(bus, "sleep");
-        assert(fd1 >= 0);
+        assert_se(fd1 >= 0);
         print_inhibitors(bus);
 
         fd2 = inhibit(bus, "idle:shutdown");
-        assert(fd2 >= 0);
+        assert_se(fd2 >= 0);
         print_inhibitors(bus);
 
         safe_close(fd1);