chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
50f74de
)
dbus: simplify some dbus error messages a bit
author
Lennart Poettering
<lennart@poettering.net>
Wed, 25 Aug 2010 17:49:23 +0000
(19:49 +0200)
committer
Lennart Poettering
<lennart@poettering.net>
Wed, 25 Aug 2010 17:50:06 +0000
(19:50 +0200)
src/auto-serial-getty.c
patch
|
blob
|
history
src/cgroups-agent.c
patch
|
blob
|
history
src/dbus-common.c
patch
|
blob
|
history
src/dbus-common.h
patch
|
blob
|
history
src/initctl.c
patch
|
blob
|
history
src/systemctl.c
patch
|
blob
|
history
src/update-utmp.c
patch
|
blob
|
history
diff --git
a/src/auto-serial-getty.c
b/src/auto-serial-getty.c
index 7bc2fba8da6fc6d787b8e9db4f9b5fbfdf24afab..355cdfd6a638e862ee5c8710d969b9d382aa9125 100644
(file)
--- a/
src/auto-serial-getty.c
+++ b/
src/auto-serial-getty.c
@@
-59,7
+59,7
@@
static int spawn_getty(DBusConnection *bus, const char *console) {
}
if (!(reply = dbus_connection_send_with_reply_and_block(bus, m, -1, &error))) {
}
if (!(reply = dbus_connection_send_with_reply_and_block(bus, m, -1, &error))) {
- log_error("Failed to start unit: %s",
error.message
);
+ log_error("Failed to start unit: %s",
bus_error_message(&error)
);
goto finish;
}
goto finish;
}
@@
-160,7
+160,7
@@
int main(int argc, char *argv[]) {
log_open();
if (bus_connect(DBUS_BUS_SYSTEM, &bus, NULL, &error) < 0) {
log_open();
if (bus_connect(DBUS_BUS_SYSTEM, &bus, NULL, &error) < 0) {
- log_error("Failed to get D-Bus connection: %s",
error.message
);
+ log_error("Failed to get D-Bus connection: %s",
bus_error_message(&error)
);
goto finish;
}
goto finish;
}
diff --git
a/src/cgroups-agent.c
b/src/cgroups-agent.c
index 92b56c5fbd7f080c37f33a6abf033002ca870f95..af458b25e49963c154b7f78accee9e24504e6fc5 100644
(file)
--- a/
src/cgroups-agent.c
+++ b/
src/cgroups-agent.c
@@
-49,7
+49,7
@@
int main(int argc, char *argv[]) {
dbus_error_free(&error);
if (!(bus = dbus_connection_open_private("unix:abstract=/org/freedesktop/systemd1/private", &error))) {
dbus_error_free(&error);
if (!(bus = dbus_connection_open_private("unix:abstract=/org/freedesktop/systemd1/private", &error))) {
- log_error("Failed to get D-Bus connection: %s",
error.message
);
+ log_error("Failed to get D-Bus connection: %s",
bus_error_message(&error)
);
goto finish;
}
goto finish;
}
diff --git
a/src/dbus-common.c
b/src/dbus-common.c
index 628efae4cfdcb0a16d3118c09bbf8347b66c3925..69593cd183312cf123167f56d8e67dac0cc55e61 100644
(file)
--- a/
src/dbus-common.c
+++ b/
src/dbus-common.c
@@
-88,3
+88,14
@@
int bus_connect(DBusBusType t, DBusConnection **_bus, bool *private, DBusError *
*_bus = bus;
return 0;
}
*_bus = bus;
return 0;
}
+
+const char *bus_error_message(const DBusError *error) {
+ assert(error);
+
+ /* Sometimes the D-Bus server is a little bit too verbose with
+ * its error messages, so let's override them here */
+ if (dbus_error_has_name(error, DBUS_ERROR_ACCESS_DENIED))
+ return "Access denied";
+
+ return error->message;
+}
diff --git
a/src/dbus-common.h
b/src/dbus-common.h
index ebcddec2450593a45354cc00bcb2a33cb5edc59f..9a66b7874434af616b7bae9e63f1ab9125b1761a 100644
(file)
--- a/
src/dbus-common.h
+++ b/
src/dbus-common.h
@@
-28,4
+28,6
@@
int bus_check_peercred(DBusConnection *c);
int bus_connect(DBusBusType t, DBusConnection **_bus, bool *private_bus, DBusError *error);
int bus_connect(DBusBusType t, DBusConnection **_bus, bool *private_bus, DBusError *error);
+const char *bus_error_message(const DBusError *error);
+
#endif
#endif
diff --git
a/src/initctl.c
b/src/initctl.c
index 7b478a75d577fc7d308308baeca2e903b2e1a59b..12b0e894fe6cc33e5d0f56cd9c5e50e9d22f1841 100644
(file)
--- a/
src/initctl.c
+++ b/
src/initctl.c
@@
-124,7
+124,7
@@
static void change_runlevel(Server *s, int runlevel) {
}
if (!(reply = dbus_connection_send_with_reply_and_block(s->bus, m, -1, &error))) {
}
if (!(reply = dbus_connection_send_with_reply_and_block(s->bus, m, -1, &error))) {
- log_error("Failed to start unit: %s",
error.message
);
+ log_error("Failed to start unit: %s",
bus_error_message(&error)
);
goto finish;
}
goto finish;
}
@@
-298,7
+298,7
@@
static int server_init(Server *s, unsigned n_sockets) {
}
if (bus_connect(DBUS_BUS_SYSTEM, &s->bus, NULL, &error) < 0) {
}
if (bus_connect(DBUS_BUS_SYSTEM, &s->bus, NULL, &error) < 0) {
- log_error("Failed to get D-Bus connection: %s",
error.message
);
+ log_error("Failed to get D-Bus connection: %s",
bus_error_message(&error)
);
goto fail;
}
goto fail;
}
diff --git
a/src/systemctl.c
b/src/systemctl.c
index 9da8303b2e997d8b1df80e66a91f5c249bf30709..bfb7001efc0b7f58e6f901bdb1161686f2351c19 100644
(file)
--- a/
src/systemctl.c
+++ b/
src/systemctl.c
@@
-249,7
+249,7
@@
static int list_units(DBusConnection *bus, char **args, unsigned n) {
}
if (!(reply = dbus_connection_send_with_reply_and_block(bus, m, -1, &error))) {
}
if (!(reply = dbus_connection_send_with_reply_and_block(bus, m, -1, &error))) {
- log_error("Failed to issue method call: %s",
error.message
);
+ log_error("Failed to issue method call: %s",
bus_error_message(&error)
);
r = -EIO;
goto finish;
}
r = -EIO;
goto finish;
}
@@
-473,7
+473,7
@@
static int dot_one(DBusConnection *bus, const char *name, const char *path) {
}
if (!(reply = dbus_connection_send_with_reply_and_block(bus, m, -1, &error))) {
}
if (!(reply = dbus_connection_send_with_reply_and_block(bus, m, -1, &error))) {
- log_error("Failed to issue method call: %s",
error.message
);
+ log_error("Failed to issue method call: %s",
bus_error_message(&error)
);
r = -EIO;
goto finish;
}
r = -EIO;
goto finish;
}
@@
-556,7
+556,7
@@
static int dot(DBusConnection *bus, char **args, unsigned n) {
}
if (!(reply = dbus_connection_send_with_reply_and_block(bus, m, -1, &error))) {
}
if (!(reply = dbus_connection_send_with_reply_and_block(bus, m, -1, &error))) {
- log_error("Failed to issue method call: %s",
error.message
);
+ log_error("Failed to issue method call: %s",
bus_error_message(&error)
);
r = -EIO;
goto finish;
}
r = -EIO;
goto finish;
}
@@
-649,7
+649,7
@@
static int list_jobs(DBusConnection *bus, char **args, unsigned n) {
}
if (!(reply = dbus_connection_send_with_reply_and_block(bus, m, -1, &error))) {
}
if (!(reply = dbus_connection_send_with_reply_and_block(bus, m, -1, &error))) {
- log_error("Failed to issue method call: %s",
error.message
);
+ log_error("Failed to issue method call: %s",
bus_error_message(&error)
);
r = -EIO;
goto finish;
}
r = -EIO;
goto finish;
}
@@
-746,7
+746,7
@@
static int load_unit(DBusConnection *bus, char **args, unsigned n) {
}
if (!(reply = dbus_connection_send_with_reply_and_block(bus, m, -1, &error))) {
}
if (!(reply = dbus_connection_send_with_reply_and_block(bus, m, -1, &error))) {
- log_error("Failed to issue method call: %s",
error.message
);
+ log_error("Failed to issue method call: %s",
bus_error_message(&error)
);
r = -EIO;
goto finish;
}
r = -EIO;
goto finish;
}
@@
-814,7
+814,7
@@
static int cancel_job(DBusConnection *bus, char **args, unsigned n) {
}
if (!(reply = dbus_connection_send_with_reply_and_block(bus, m, -1, &error))) {
}
if (!(reply = dbus_connection_send_with_reply_and_block(bus, m, -1, &error))) {
- log_error("Failed to issue method call: %s",
error.message
);
+ log_error("Failed to issue method call: %s",
bus_error_message(&error)
);
r = -EIO;
goto finish;
}
r = -EIO;
goto finish;
}
@@
-822,7
+822,7
@@
static int cancel_job(DBusConnection *bus, char **args, unsigned n) {
if (!dbus_message_get_args(reply, &error,
DBUS_TYPE_OBJECT_PATH, &path,
DBUS_TYPE_INVALID)) {
if (!dbus_message_get_args(reply, &error,
DBUS_TYPE_OBJECT_PATH, &path,
DBUS_TYPE_INVALID)) {
- log_error("Failed to parse reply: %s",
error.message
);
+ log_error("Failed to parse reply: %s",
bus_error_message(&error)
);
r = -EIO;
goto finish;
}
r = -EIO;
goto finish;
}
@@
-840,7
+840,7
@@
static int cancel_job(DBusConnection *bus, char **args, unsigned n) {
dbus_message_unref(reply);
if (!(reply = dbus_connection_send_with_reply_and_block(bus, m, -1, &error))) {
dbus_message_unref(reply);
if (!(reply = dbus_connection_send_with_reply_and_block(bus, m, -1, &error))) {
- log_error("Failed to issue method call: %s",
error.message
);
+ log_error("Failed to issue method call: %s",
bus_error_message(&error)
);
r = -EIO;
goto finish;
}
r = -EIO;
goto finish;
}
@@
-969,7
+969,7
@@
static DBusHandlerResult wait_filter(DBusConnection *connection, DBusMessage *me
DBUS_TYPE_OBJECT_PATH, &path,
DBUS_TYPE_BOOLEAN, &success,
DBUS_TYPE_INVALID))
DBUS_TYPE_OBJECT_PATH, &path,
DBUS_TYPE_BOOLEAN, &success,
DBUS_TYPE_INVALID))
- log_error("Failed to parse message: %s",
error.message
);
+ log_error("Failed to parse message: %s",
bus_error_message(&error)
);
else {
char *p;
else {
char *p;
@@
-1003,7
+1003,7
@@
static int enable_wait_for_jobs(DBusConnection *bus) {
&error);
if (dbus_error_is_set(&error)) {
&error);
if (dbus_error_is_set(&error)) {
- log_error("Failed to add match: %s",
error.message
);
+ log_error("Failed to add match: %s",
bus_error_message(&error)
);
dbus_error_free(&error);
return -EIO;
}
dbus_error_free(&error);
return -EIO;
}
@@
-1092,7
+1092,7
@@
static int start_unit_one(
goto finish;
}
goto finish;
}
- log_error("Failed to issue method call: %s",
error.message
);
+ log_error("Failed to issue method call: %s",
bus_error_message(&error)
);
r = -EIO;
goto finish;
}
r = -EIO;
goto finish;
}
@@
-1100,7
+1100,7
@@
static int start_unit_one(
if (!dbus_message_get_args(reply, &error,
DBUS_TYPE_OBJECT_PATH, &path,
DBUS_TYPE_INVALID)) {
if (!dbus_message_get_args(reply, &error,
DBUS_TYPE_OBJECT_PATH, &path,
DBUS_TYPE_INVALID)) {
- log_error("Failed to parse reply: %s",
error.message
);
+ log_error("Failed to parse reply: %s",
bus_error_message(&error)
);
r = -EIO;
goto finish;
}
r = -EIO;
goto finish;
}
@@
-1312,7
+1312,7
@@
static int check_unit(DBusConnection *bus, char **args, unsigned n) {
if (!dbus_message_get_args(reply, &error,
DBUS_TYPE_OBJECT_PATH, &path,
DBUS_TYPE_INVALID)) {
if (!dbus_message_get_args(reply, &error,
DBUS_TYPE_OBJECT_PATH, &path,
DBUS_TYPE_INVALID)) {
- log_error("Failed to parse reply: %s",
error.message
);
+ log_error("Failed to parse reply: %s",
bus_error_message(&error)
);
r = -EIO;
goto finish;
}
r = -EIO;
goto finish;
}
@@
-1339,7
+1339,7
@@
static int check_unit(DBusConnection *bus, char **args, unsigned n) {
dbus_message_unref(reply);
if (!(reply = dbus_connection_send_with_reply_and_block(bus, m, -1, &error))) {
dbus_message_unref(reply);
if (!(reply = dbus_connection_send_with_reply_and_block(bus, m, -1, &error))) {
- log_error("Failed to issue method call: %s",
error.message
);
+ log_error("Failed to issue method call: %s",
bus_error_message(&error)
);
r = -EIO;
goto finish;
}
r = -EIO;
goto finish;
}
@@
-2129,7
+2129,7
@@
static int show_one(DBusConnection *bus, const char *path, bool show_properties,
}
if (!(reply = dbus_connection_send_with_reply_and_block(bus, m, -1, &error))) {
}
if (!(reply = dbus_connection_send_with_reply_and_block(bus, m, -1, &error))) {
- log_error("Failed to issue method call: %s",
error.message
);
+ log_error("Failed to issue method call: %s",
bus_error_message(&error)
);
r = -EIO;
goto finish;
}
r = -EIO;
goto finish;
}
@@
-2272,7
+2272,7
@@
static int show(DBusConnection *bus, char **args, unsigned n) {
if (!(reply = dbus_connection_send_with_reply_and_block(bus, m, -1, &error))) {
if (!dbus_error_has_name(&error, DBUS_ERROR_ACCESS_DENIED)) {
if (!(reply = dbus_connection_send_with_reply_and_block(bus, m, -1, &error))) {
if (!dbus_error_has_name(&error, DBUS_ERROR_ACCESS_DENIED)) {
- log_error("Failed to issue method call: %s",
error.message
);
+ log_error("Failed to issue method call: %s",
bus_error_message(&error)
);
r = -EIO;
goto finish;
}
r = -EIO;
goto finish;
}
@@
-2299,7
+2299,7
@@
static int show(DBusConnection *bus, char **args, unsigned n) {
}
if (!(reply = dbus_connection_send_with_reply_and_block(bus, m, -1, &error))) {
}
if (!(reply = dbus_connection_send_with_reply_and_block(bus, m, -1, &error))) {
- log_error("Failed to issue method call: %s",
error.message
);
+ log_error("Failed to issue method call: %s",
bus_error_message(&error)
);
r = -EIO;
goto finish;
}
r = -EIO;
goto finish;
}
@@
-2328,7
+2328,7
@@
static int show(DBusConnection *bus, char **args, unsigned n) {
}
if (!(reply = dbus_connection_send_with_reply_and_block(bus, m, -1, &error))) {
}
if (!(reply = dbus_connection_send_with_reply_and_block(bus, m, -1, &error))) {
- log_error("Failed to issue method call: %s",
error.message
);
+ log_error("Failed to issue method call: %s",
bus_error_message(&error)
);
r = -EIO;
goto finish;
}
r = -EIO;
goto finish;
}
@@
-2355,7
+2355,7
@@
static int show(DBusConnection *bus, char **args, unsigned n) {
}
if (!(reply = dbus_connection_send_with_reply_and_block(bus, m, -1, &error))) {
}
if (!(reply = dbus_connection_send_with_reply_and_block(bus, m, -1, &error))) {
- log_error("Failed to issue method call: %s",
error.message
);
+ log_error("Failed to issue method call: %s",
bus_error_message(&error)
);
r = -EIO;
goto finish;
}
r = -EIO;
goto finish;
}
@@
-2364,7
+2364,7
@@
static int show(DBusConnection *bus, char **args, unsigned n) {
if (!dbus_message_get_args(reply, &error,
DBUS_TYPE_OBJECT_PATH, &path,
DBUS_TYPE_INVALID)) {
if (!dbus_message_get_args(reply, &error,
DBUS_TYPE_OBJECT_PATH, &path,
DBUS_TYPE_INVALID)) {
- log_error("Failed to parse reply: %s",
error.message
);
+ log_error("Failed to parse reply: %s",
bus_error_message(&error)
);
r = -EIO;
goto finish;
}
r = -EIO;
goto finish;
}
@@
-2417,7
+2417,7
@@
static DBusHandlerResult monitor_filter(DBusConnection *connection, DBusMessage
DBUS_TYPE_STRING, &id,
DBUS_TYPE_OBJECT_PATH, &path,
DBUS_TYPE_INVALID))
DBUS_TYPE_STRING, &id,
DBUS_TYPE_OBJECT_PATH, &path,
DBUS_TYPE_INVALID))
- log_error("Failed to parse message: %s",
error.message
);
+ log_error("Failed to parse message: %s",
bus_error_message(&error)
);
else if (streq(dbus_message_get_member(message), "UnitNew"))
printf("Unit %s added.\n", id);
else
else if (streq(dbus_message_get_member(message), "UnitNew"))
printf("Unit %s added.\n", id);
else
@@
-2432,7
+2432,7
@@
static DBusHandlerResult monitor_filter(DBusConnection *connection, DBusMessage
DBUS_TYPE_UINT32, &id,
DBUS_TYPE_OBJECT_PATH, &path,
DBUS_TYPE_INVALID))
DBUS_TYPE_UINT32, &id,
DBUS_TYPE_OBJECT_PATH, &path,
DBUS_TYPE_INVALID))
- log_error("Failed to parse message: %s",
error.message
);
+ log_error("Failed to parse message: %s",
bus_error_message(&error)
);
else if (streq(dbus_message_get_member(message), "JobNew"))
printf("Job %u added.\n", id);
else
else if (streq(dbus_message_get_member(message), "JobNew"))
printf("Job %u added.\n", id);
else
@@
-2449,7
+2449,7
@@
static DBusHandlerResult monitor_filter(DBusConnection *connection, DBusMessage
if (!dbus_message_get_args(message, &error,
DBUS_TYPE_STRING, &interface,
DBUS_TYPE_INVALID)) {
if (!dbus_message_get_args(message, &error,
DBUS_TYPE_STRING, &interface,
DBUS_TYPE_INVALID)) {
- log_error("Failed to parse message: %s",
error.message
);
+ log_error("Failed to parse message: %s",
bus_error_message(&error)
);
goto finish;
}
goto finish;
}
@@
-2475,7
+2475,7
@@
static DBusHandlerResult monitor_filter(DBusConnection *connection, DBusMessage
}
if (!(reply = dbus_connection_send_with_reply_and_block(connection, m, -1, &error))) {
}
if (!(reply = dbus_connection_send_with_reply_and_block(connection, m, -1, &error))) {
- log_error("Failed to issue method call: %s",
error.message
);
+ log_error("Failed to issue method call: %s",
bus_error_message(&error)
);
goto finish;
}
goto finish;
}
@@
-2547,7
+2547,7
@@
static int monitor(DBusConnection *bus, char **args, unsigned n) {
&error);
if (dbus_error_is_set(&error)) {
&error);
if (dbus_error_is_set(&error)) {
- log_error("Failed to add match: %s",
error.message
);
+ log_error("Failed to add match: %s",
bus_error_message(&error)
);
r = -EIO;
goto finish;
}
r = -EIO;
goto finish;
}
@@
-2560,7
+2560,7
@@
static int monitor(DBusConnection *bus, char **args, unsigned n) {
&error);
if (dbus_error_is_set(&error)) {
&error);
if (dbus_error_is_set(&error)) {
- log_error("Failed to add match: %s",
error.message
);
+ log_error("Failed to add match: %s",
bus_error_message(&error)
);
r = -EIO;
goto finish;
}
r = -EIO;
goto finish;
}
@@
-2583,7
+2583,7
@@
static int monitor(DBusConnection *bus, char **args, unsigned n) {
}
if (!(reply = dbus_connection_send_with_reply_and_block(bus, m, -1, &error))) {
}
if (!(reply = dbus_connection_send_with_reply_and_block(bus, m, -1, &error))) {
- log_error("Failed to issue method call: %s",
error.message
);
+ log_error("Failed to issue method call: %s",
bus_error_message(&error)
);
r = -EIO;
goto finish;
}
r = -EIO;
goto finish;
}
@@
-2626,7
+2626,7
@@
static int dump(DBusConnection *bus, char **args, unsigned n) {
}
if (!(reply = dbus_connection_send_with_reply_and_block(bus, m, -1, &error))) {
}
if (!(reply = dbus_connection_send_with_reply_and_block(bus, m, -1, &error))) {
- log_error("Failed to issue method call: %s",
error.message
);
+ log_error("Failed to issue method call: %s",
bus_error_message(&error)
);
r = -EIO;
goto finish;
}
r = -EIO;
goto finish;
}
@@
-2634,7
+2634,7
@@
static int dump(DBusConnection *bus, char **args, unsigned n) {
if (!dbus_message_get_args(reply, &error,
DBUS_TYPE_STRING, &text,
DBUS_TYPE_INVALID)) {
if (!dbus_message_get_args(reply, &error,
DBUS_TYPE_STRING, &text,
DBUS_TYPE_INVALID)) {
- log_error("Failed to parse reply: %s",
error.message
);
+ log_error("Failed to parse reply: %s",
bus_error_message(&error)
);
r = -EIO;
goto finish;
}
r = -EIO;
goto finish;
}
@@
-2690,7
+2690,7
@@
static int snapshot(DBusConnection *bus, char **args, unsigned n) {
}
if (!(reply = dbus_connection_send_with_reply_and_block(bus, m, -1, &error))) {
}
if (!(reply = dbus_connection_send_with_reply_and_block(bus, m, -1, &error))) {
- log_error("Failed to issue method call: %s",
error.message
);
+ log_error("Failed to issue method call: %s",
bus_error_message(&error)
);
r = -EIO;
goto finish;
}
r = -EIO;
goto finish;
}
@@
-2698,7
+2698,7
@@
static int snapshot(DBusConnection *bus, char **args, unsigned n) {
if (!dbus_message_get_args(reply, &error,
DBUS_TYPE_OBJECT_PATH, &path,
DBUS_TYPE_INVALID)) {
if (!dbus_message_get_args(reply, &error,
DBUS_TYPE_OBJECT_PATH, &path,
DBUS_TYPE_INVALID)) {
- log_error("Failed to parse reply: %s",
error.message
);
+ log_error("Failed to parse reply: %s",
bus_error_message(&error)
);
r = -EIO;
goto finish;
}
r = -EIO;
goto finish;
}
@@
-2724,7
+2724,7
@@
static int snapshot(DBusConnection *bus, char **args, unsigned n) {
dbus_message_unref(reply);
if (!(reply = dbus_connection_send_with_reply_and_block(bus, m, -1, &error))) {
dbus_message_unref(reply);
if (!(reply = dbus_connection_send_with_reply_and_block(bus, m, -1, &error))) {
- log_error("Failed to issue method call: %s",
error.message
);
+ log_error("Failed to issue method call: %s",
bus_error_message(&error)
);
r = -EIO;
goto finish;
}
r = -EIO;
goto finish;
}
@@
-2795,7
+2795,7
@@
static int delete_snapshot(DBusConnection *bus, char **args, unsigned n) {
}
if (!(reply = dbus_connection_send_with_reply_and_block(bus, m, -1, &error))) {
}
if (!(reply = dbus_connection_send_with_reply_and_block(bus, m, -1, &error))) {
- log_error("Failed to issue method call: %s",
error.message
);
+ log_error("Failed to issue method call: %s",
bus_error_message(&error)
);
r = -EIO;
goto finish;
}
r = -EIO;
goto finish;
}
@@
-2803,7
+2803,7
@@
static int delete_snapshot(DBusConnection *bus, char **args, unsigned n) {
if (!dbus_message_get_args(reply, &error,
DBUS_TYPE_OBJECT_PATH, &path,
DBUS_TYPE_INVALID)) {
if (!dbus_message_get_args(reply, &error,
DBUS_TYPE_OBJECT_PATH, &path,
DBUS_TYPE_INVALID)) {
- log_error("Failed to parse reply: %s",
error.message
);
+ log_error("Failed to parse reply: %s",
bus_error_message(&error)
);
r = -EIO;
goto finish;
}
r = -EIO;
goto finish;
}
@@
-2821,7
+2821,7
@@
static int delete_snapshot(DBusConnection *bus, char **args, unsigned n) {
dbus_message_unref(reply);
if (!(reply = dbus_connection_send_with_reply_and_block(bus, m, -1, &error))) {
dbus_message_unref(reply);
if (!(reply = dbus_connection_send_with_reply_and_block(bus, m, -1, &error))) {
- log_error("Failed to issue method call: %s",
error.message
);
+ log_error("Failed to issue method call: %s",
bus_error_message(&error)
);
r = -EIO;
goto finish;
}
r = -EIO;
goto finish;
}
@@
-2887,7
+2887,7
@@
static int daemon_reload(DBusConnection *bus, char **args, unsigned n) {
goto finish;
}
goto finish;
}
- log_error("Failed to issue method call: %s",
error.message
);
+ log_error("Failed to issue method call: %s",
bus_error_message(&error)
);
r = -EIO;
goto finish;
}
r = -EIO;
goto finish;
}
@@
-2939,7
+2939,7
@@
static int reset_maintenance(DBusConnection *bus, char **args, unsigned n) {
}
if (!(reply = dbus_connection_send_with_reply_and_block(bus, m, -1, &error))) {
}
if (!(reply = dbus_connection_send_with_reply_and_block(bus, m, -1, &error))) {
- log_error("Failed to issue method call: %s",
error.message
);
+ log_error("Failed to issue method call: %s",
bus_error_message(&error)
);
r = -EIO;
goto finish;
}
r = -EIO;
goto finish;
}
@@
-2993,7
+2993,7
@@
static int show_enviroment(DBusConnection *bus, char **args, unsigned n) {
}
if (!(reply = dbus_connection_send_with_reply_and_block(bus, m, -1, &error))) {
}
if (!(reply = dbus_connection_send_with_reply_and_block(bus, m, -1, &error))) {
- log_error("Failed to issue method call: %s",
error.message
);
+ log_error("Failed to issue method call: %s",
bus_error_message(&error)
);
r = -EIO;
goto finish;
}
r = -EIO;
goto finish;
}
@@
-3091,7
+3091,7
@@
static int set_environment(DBusConnection *bus, char **args, unsigned n) {
}
if (!(reply = dbus_connection_send_with_reply_and_block(bus, m, -1, &error))) {
}
if (!(reply = dbus_connection_send_with_reply_and_block(bus, m, -1, &error))) {
- log_error("Failed to issue method call: %s",
error.message
);
+ log_error("Failed to issue method call: %s",
bus_error_message(&error)
);
r = -EIO;
goto finish;
}
r = -EIO;
goto finish;
}
@@
-4526,7
+4526,7
@@
static int talk_upstart(void) {
goto finish;
}
goto finish;
}
- log_error("Failed to connect to Upstart bus: %s",
error.message
);
+ log_error("Failed to connect to Upstart bus: %s",
bus_error_message(&error)
);
r = -EIO;
goto finish;
}
r = -EIO;
goto finish;
}
@@
-4570,7
+4570,7
@@
static int talk_upstart(void) {
goto finish;
}
goto finish;
}
- log_error("Failed to issue method call: %s",
error.message
);
+ log_error("Failed to issue method call: %s",
bus_error_message(&error)
);
r = -EIO;
goto finish;
}
r = -EIO;
goto finish;
}
diff --git
a/src/update-utmp.c
b/src/update-utmp.c
index 336594fc7a25d25319b54d835aa3458d7cab2549..644b6df67cb831627b646f570359375d3b7539a3 100644
(file)
--- a/
src/update-utmp.c
+++ b/
src/update-utmp.c
@@
-77,7
+77,7
@@
static usec_t get_startup_time(Context *c) {
}
if (!(reply = dbus_connection_send_with_reply_and_block(c->bus, m, -1, &error))) {
}
if (!(reply = dbus_connection_send_with_reply_and_block(c->bus, m, -1, &error))) {
- log_error("Failed to send command: %s",
error.message
);
+ log_error("Failed to send command: %s",
bus_error_message(&error)
);
goto finish;
}
goto finish;
}
@@
-167,7
+167,7
@@
static int get_current_runlevel(Context *c) {
if (!dbus_message_get_args(reply, &error,
DBUS_TYPE_OBJECT_PATH, &path,
DBUS_TYPE_INVALID)) {
if (!dbus_message_get_args(reply, &error,
DBUS_TYPE_OBJECT_PATH, &path,
DBUS_TYPE_INVALID)) {
- log_error("Failed to parse reply: %s",
error.message
);
+ log_error("Failed to parse reply: %s",
bus_error_message(&error)
);
r = -EIO;
goto finish;
}
r = -EIO;
goto finish;
}
@@
-194,7
+194,7
@@
static int get_current_runlevel(Context *c) {
dbus_message_unref(reply);
if (!(reply = dbus_connection_send_with_reply_and_block(c->bus, m, -1, &error))) {
dbus_message_unref(reply);
if (!(reply = dbus_connection_send_with_reply_and_block(c->bus, m, -1, &error))) {
- log_error("Failed to send command: %s",
error.message
);
+ log_error("Failed to send command: %s",
bus_error_message(&error)
);
r = -EIO;
goto finish;
}
r = -EIO;
goto finish;
}
@@
-379,7
+379,7
@@
int main(int argc, char *argv[]) {
#endif
if (bus_connect(DBUS_BUS_SYSTEM, &c.bus, NULL, &error) < 0) {
#endif
if (bus_connect(DBUS_BUS_SYSTEM, &c.bus, NULL, &error) < 0) {
- log_error("Failed to get D-Bus connection: %s",
error.message
);
+ log_error("Failed to get D-Bus connection: %s",
bus_error_message(&error)
);
r = -EIO;
goto finish;
}
r = -EIO;
goto finish;
}