bus: fix synthetic error messages

This commit is contained in:
Lennart Poettering
2013-10-09 03:29:20 +02:00
parent 29ddb38fea
commit 3a7d4f1ba4
2 changed files with 11 additions and 2 deletions
+10 -1
View File
@@ -682,7 +682,6 @@ fail:
return r;
}
int bus_message_new_synthetic_error(
sd_bus *bus,
uint64_t serial,
@@ -712,6 +711,16 @@ int bus_message_new_synthetic_error(
goto fail;
}
r = message_append_field_string(t, SD_BUS_MESSAGE_HEADER_ERROR_NAME, SD_BUS_TYPE_STRING, e->name, &t->error.name);
if (r < 0)
goto fail;
if (e->message) {
r = message_append_basic(t, SD_BUS_TYPE_STRING, e->message, (const void**) &t->error.message);
if (r < 0)
goto fail;
}
*m = t;
return 0;
+1 -1
View File
@@ -359,7 +359,7 @@ finish:
static int quit_callback(sd_bus *b, sd_bus_message *m, void *userdata) {
bool *x = userdata;
log_error("Quit callback: %s", strerror(bus_message_to_errno(m)));
log_error("Quit callback: %s", strerror(-bus_message_to_errno(m)));
*x = 1;
return 1;