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 v228: Apply more cosmetic changes found in upstream.
[elogind.git]
/
src
/
libelogind
/
sd-bus
/
bus-internal.h
diff --git
a/src/libelogind/sd-bus/bus-internal.h
b/src/libelogind/sd-bus/bus-internal.h
index e0d7c9ee78b0c8f608ffdd55bf1f968eef8fb0f7..db344ac3727a3be346a626e154d886d3729aec8f 100644
(file)
--- a/
src/libelogind/sd-bus/bus-internal.h
+++ b/
src/libelogind/sd-bus/bus-internal.h
@@
-21,21
+21,21
@@
along with systemd; If not, see <http://www.gnu.org/licenses/>.
***/
along with systemd; If not, see <http://www.gnu.org/licenses/>.
***/
-#include <sys/socket.h>
#include <pthread.h>
#include <pthread.h>
-
-#include "hashmap.h"
-#include "prioq.h"
-#include "list.h"
-#include "util.h"
-#include "refcnt.h"
-#include "socket-util.h"
+#include <sys/socket.h>
#include "sd-bus.h"
#include "sd-bus.h"
+
#include "bus-error.h"
#include "bus-error.h"
-#include "bus-match.h"
#include "bus-kernel.h"
#include "bus-kernel.h"
+#include "bus-match.h"
+#include "hashmap.h"
#include "kdbus.h"
#include "kdbus.h"
+#include "list.h"
+#include "prioq.h"
+#include "refcnt.h"
+#include "socket-util.h"
+#include "util.h"
struct reply_callback {
sd_bus_message_handler_t callback;
struct reply_callback {
sd_bus_message_handler_t callback;
@@
-396,6
+396,6
@@
int bus_maybe_reply_error(sd_bus_message *m, int r, sd_bus_error *error);
#define bus_assert_return(expr, r, error) \
do { \
#define bus_assert_return(expr, r, error) \
do { \
- if (!assert_log(expr
))
\
+ if (!assert_log(expr
, #expr))
\
return sd_bus_error_set_errno(error, r); \
} while (false)
return sd_bus_error_set_errno(error, r); \
} while (false)