chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
tree-wide: expose "p"-suffix unref calls in public APIs to make gcc cleanup easy
[elogind.git]
/
src
/
login
/
test-inhibit.c
diff --git
a/src/login/test-inhibit.c
b/src/login/test-inhibit.c
index 274687d20f38abf22edf6b153d8c6d98db096c4e..702208707622076dacbb65c9bacabd67d0e76483 100644
(file)
--- a/
src/login/test-inhibit.c
+++ b/
src/login/test-inhibit.c
@@
-21,15
+21,16
@@
#include <unistd.h>
#include <unistd.h>
-#include "macro.h"
-#include "util.h"
#include "sd-bus.h"
#include "sd-bus.h"
+
#include "bus-util.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) {
static int inhibit(sd_bus *bus, const char *what) {
- _cleanup_
bus_message_unref_
sd_bus_message *reply = NULL;
- _cleanup_
bus_error_free_
sd_bus_error error = SD_BUS_ERROR_NULL;
+ _cleanup_
(sd_bus_message_unrefp)
sd_bus_message *reply = NULL;
+ _cleanup_
(sd_bus_error_free)
sd_bus_error error = SD_BUS_ERROR_NULL;
const char *who = "Test Tool", *reason = "Just because!", *mode = "block";
int fd;
int r;
const char *who = "Test Tool", *reason = "Just because!", *mode = "block";
int fd;
int r;
@@
-52,8
+53,8
@@
static int inhibit(sd_bus *bus, const char *what) {
}
static void print_inhibitors(sd_bus *bus) {
}
static void print_inhibitors(sd_bus *bus) {
- _cleanup_
bus_message_unref_
sd_bus_message *reply = NULL;
- _cleanup_
bus_error_free_
sd_bus_error error = SD_BUS_ERROR_NULL;
+ _cleanup_
(sd_bus_message_unrefp)
sd_bus_message *reply = NULL;
+ _cleanup_
(sd_bus_error_free)
sd_bus_error error = SD_BUS_ERROR_NULL;
const char *what, *who, *why, *mode;
uint32_t uid, pid;
unsigned n = 0;
const char *what, *who, *why, *mode;
uint32_t uid, pid;
unsigned n = 0;
@@
-84,7
+85,7
@@
static void print_inhibitors(sd_bus *bus) {
}
int main(int argc, char*argv[]) {
}
int main(int argc, char*argv[]) {
- _cleanup_
bus_unref_
sd_bus *bus = NULL;
+ _cleanup_
(sd_bus_unrefp)
sd_bus *bus = NULL;
int fd1, fd2;
int r;
int fd1, fd2;
int r;