chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Prep v229: Remove remaining emacs settings [3/6] src/libelogind
[elogind.git]
/
src
/
libelogind
/
sd-bus
/
bus-message.c
diff --git
a/src/libelogind/sd-bus/bus-message.c
b/src/libelogind/sd-bus/bus-message.c
index 08cecfb2853b509501ff9ddfd10d87eb9224aa4d..03b188d4ea0c81c6347a0dc8d45c1e377955cd62 100644
(file)
--- a/
src/libelogind/sd-bus/bus-message.c
+++ b/
src/libelogind/sd-bus/bus-message.c
@@
-1,5
+1,3
@@
-/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
-
/***
This file is part of systemd.
/***
This file is part of systemd.
@@
-802,7
+800,7
@@
_public_ int sd_bus_message_new_method_errorf(
const char *format,
...) {
const char *format,
...) {
- _cleanup_
bus_error_free_
sd_bus_error error = SD_BUS_ERROR_NULL;
+ _cleanup_
(sd_bus_error_free)
sd_bus_error error = SD_BUS_ERROR_NULL;
va_list ap;
assert_return(name, -EINVAL);
va_list ap;
assert_return(name, -EINVAL);
@@
-821,7
+819,7
@@
_public_ int sd_bus_message_new_method_errno(
int error,
const sd_bus_error *p) {
int error,
const sd_bus_error *p) {
- _cleanup_
bus_error_free_
sd_bus_error berror = SD_BUS_ERROR_NULL;
+ _cleanup_
(sd_bus_error_free)
sd_bus_error berror = SD_BUS_ERROR_NULL;
if (sd_bus_error_is_set(p))
return sd_bus_message_new_method_error(call, m, p);
if (sd_bus_error_is_set(p))
return sd_bus_message_new_method_error(call, m, p);
@@
-839,7
+837,7
@@
_public_ int sd_bus_message_new_method_errnof(
const char *format,
...) {
const char *format,
...) {
- _cleanup_
bus_error_free_
sd_bus_error berror = SD_BUS_ERROR_NULL;
+ _cleanup_
(sd_bus_error_free)
sd_bus_error berror = SD_BUS_ERROR_NULL;
va_list ap;
va_start(ap, format);
va_list ap;
va_start(ap, format);
@@
-921,7
+919,9
@@
fail:
}
_public_ sd_bus_message* sd_bus_message_ref(sd_bus_message *m) {
}
_public_ sd_bus_message* sd_bus_message_ref(sd_bus_message *m) {
- assert_return(m, NULL);
+
+ if (!m)
+ return NULL;
assert(m->n_ref > 0);
m->n_ref++;
assert(m->n_ref > 0);
m->n_ref++;
@@
-5860,7
+5860,7
@@
_public_ sd_bus *sd_bus_message_get_bus(sd_bus_message *m) {
}
int bus_message_remarshal(sd_bus *bus, sd_bus_message **m) {
}
int bus_message_remarshal(sd_bus *bus, sd_bus_message **m) {
- _cleanup_
bus_message_unref_
sd_bus_message *n = NULL;
+ _cleanup_
(sd_bus_message_unrefp)
sd_bus_message *n = NULL;
usec_t timeout;
int r;
usec_t timeout;
int r;