chiark / gitweb /
bus: use "System.Error." as prefix for implicit errno bus errors
authorLennart Poettering <lennart@poettering.net>
Sat, 30 Nov 2013 18:53:33 +0000 (19:53 +0100)
committerLennart Poettering <lennart@poettering.net>
Sat, 30 Nov 2013 18:53:33 +0000 (19:53 +0100)
We probably shouldn't use "Posix.Error" since many of the errors have
nothing to do with Posix.

src/libsystemd-bus/bus-error.c
src/libsystemd-bus/test-bus-error.c

index 45dff8088854e4790a1dd0ad7362ba5f65bbf469..25eaf0eee4961563535afc95b55e1ced63145169 100644 (file)
@@ -42,7 +42,7 @@ static int bus_error_name_to_errno(const char *name) {
         if (!name)
                 return EINVAL;
 
         if (!name)
                 return EINVAL;
 
-        p = startswith(name, "Posix.Error.");
+        p = startswith(name, "System.Error.");
         if (p) {
                 r = errno_from_name(p);
                 if (r <= 0)
         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;
 
         if (!name)
                 return 0;
 
-        n = strappend("Posix.Error.", name);
+        n = strappend("System.Error.", name);
         if (!n)
                 return -ENOMEM;
 
         if (!n)
                 return -ENOMEM;
 
index 16c75a3f699f4332f9f9740cd3776551ad53be6c..b78be5499c4dce188a8c51c296c1247d7335646c 100644 (file)
@@ -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_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(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(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(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);
         assert_se(sd_bus_error_get_errno(&error) == EBUSY);
         assert_se(sd_bus_error_is_set(&error));
         sd_bus_error_free(&error);