summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2013-11-30 19:53:33 +0100
committerLennart Poettering <lennart@poettering.net>2013-11-30 19:53:33 +0100
commit763e20e675799e9c8d8b62857cdd01126b62e9a9 (patch)
tree2c871af3338eadfa19ab0d5ae3eeac489a59dddb
parent79f8d3d2ce51e992493f2d354a5764262c9d564a (diff)
bus: use "System.Error." as prefix for implicit errno bus errors
We probably shouldn't use "Posix.Error" since many of the errors have nothing to do with Posix.
-rw-r--r--src/libsystemd-bus/bus-error.c4
-rw-r--r--src/libsystemd-bus/test-bus-error.c10
2 files changed, 7 insertions, 7 deletions
diff --git a/src/libsystemd-bus/bus-error.c b/src/libsystemd-bus/bus-error.c
index 45dff80888..25eaf0eee4 100644
--- a/src/libsystemd-bus/bus-error.c
+++ b/src/libsystemd-bus/bus-error.c
@@ -42,7 +42,7 @@ static int bus_error_name_to_errno(const char *name) {
if (!name)
return EINVAL;
- p = startswith(name, "Posix.Error.");
+ p = startswith(name, "System.Error.");
if (p) {
r = errno_from_name(p);
if (r <= 0)
@@ -198,7 +198,7 @@ static int errno_to_bus_error_name_new(int error, char **ret) {
if (!name)
return 0;
- n = strappend("Posix.Error.", name);
+ n = strappend("System.Error.", name);
if (!n)
return -ENOMEM;
diff --git a/src/libsystemd-bus/test-bus-error.c b/src/libsystemd-bus/test-bus-error.c
index 16c75a3f69..b78be5499c 100644
--- a/src/libsystemd-bus/test-bus-error.c
+++ b/src/libsystemd-bus/test-bus-error.c
@@ -86,19 +86,19 @@ int main(int argc, char *argv[]) {
assert_se(sd_bus_error_is_set(&second));
assert_se(!sd_bus_error_is_set(&error));
- assert_se(sd_bus_error_set_const(&error, "Posix.Error.EUCLEAN", "Hallo") == -EUCLEAN);
- assert_se(streq(error.name, "Posix.Error.EUCLEAN"));
+ assert_se(sd_bus_error_set_const(&error, "System.Error.EUCLEAN", "Hallo") == -EUCLEAN);
+ assert_se(streq(error.name, "System.Error.EUCLEAN"));
assert_se(streq(error.message, "Hallo"));
- assert_se(sd_bus_error_has_name(&error, "Posix.Error.EUCLEAN"));
+ assert_se(sd_bus_error_has_name(&error, "System.Error.EUCLEAN"));
assert_se(sd_bus_error_get_errno(&error) == EUCLEAN);
assert_se(sd_bus_error_is_set(&error));
sd_bus_error_free(&error);
assert_se(!sd_bus_error_is_set(&error));
assert_se(sd_bus_error_set_errno(&error, EBUSY) == -EBUSY);
- assert_se(streq(error.name, "Posix.Error.EBUSY"));
+ assert_se(streq(error.name, "System.Error.EBUSY"));
assert_se(streq(error.message, strerror(EBUSY)));
- assert_se(sd_bus_error_has_name(&error, "Posix.Error.EBUSY"));
+ assert_se(sd_bus_error_has_name(&error, "System.Error.EBUSY"));
assert_se(sd_bus_error_get_errno(&error) == EBUSY);
assert_se(sd_bus_error_is_set(&error));
sd_bus_error_free(&error);