sd-bus: move common errors src/shared/bus-errors.h → src/libsystemd/sd-bus/bus-common...

Stuff in src/shared/ should not use stuff from src/libsystemd/ really.

diff --git a/Makefile.am b/Makefile.am
index 6f02c742a98fc017708393b044b76d94f24646c7..c12270762a1c4b270f2f948b2ea8618817cc3b6c 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -757,8 +757,6 @@ libsystemd_shared_la_SOURCES = \
        src/shared/sparse-endian.h \
        src/shared/refcnt.h \
        src/shared/udev-util.h \
        src/shared/sparse-endian.h \
        src/shared/refcnt.h \
        src/shared/udev-util.h \

-       src/shared/bus-errors.h \
-       src/shared/bus-errors.c \

        src/shared/device-nodes.c \
        src/shared/device-nodes.h \
        src/shared/util.c \
        src/shared/device-nodes.c \
        src/shared/device-nodes.h \
        src/shared/util.c \


@@ -2646,6 +2644,8 @@ libsystemd_internal_la_SOURCES = \
        src/libsystemd/sd-bus/bus-control.h \
        src/libsystemd/sd-bus/bus-error.c \
        src/libsystemd/sd-bus/bus-error.h \
        src/libsystemd/sd-bus/bus-control.h \
        src/libsystemd/sd-bus/bus-error.c \
        src/libsystemd/sd-bus/bus-error.h \

+       src/libsystemd/sd-bus/bus-common-errors.h \
+       src/libsystemd/sd-bus/bus-common-errors.c \

        src/libsystemd/sd-bus/bus-internal.c \
        src/libsystemd/sd-bus/bus-internal.h \
        src/libsystemd/sd-bus/bus-socket.c \
        src/libsystemd/sd-bus/bus-internal.c \
        src/libsystemd/sd-bus/bus-internal.h \
        src/libsystemd/sd-bus/bus-socket.c \

diff --git a/src/core/dbus-manager.c b/src/core/dbus-manager.c
index 140a413c170844f95ef892ceb6566eb07f21d9cf..6181ba8248bea95d8b23f5d6e8b5f341bf7f98cf 100644 (file)
--- a/src/core/dbus-manager.c
+++ b/src/core/dbus-manager.c
@@ -39,7 +39,7 @@
 #include "dbus-unit.h"
 #include "dbus-snapshot.h"
 #include "dbus-execute.h"
 #include "dbus-unit.h"
 #include "dbus-snapshot.h"
 #include "dbus-execute.h"

-#include "bus-errors.h"
+#include "bus-common-errors.h"

 
 static int property_get_version(
                 sd_bus *bus,
 
 static int property_get_version(
                 sd_bus *bus,

diff --git a/src/core/dbus-scope.c b/src/core/dbus-scope.c
index a762223c81d73c4d145cdc974c5280d06ed293ac..60215a193577fa53a4af1eafac02ca607aff723e 100644 (file)
--- a/src/core/dbus-scope.c
+++ b/src/core/dbus-scope.c
@@ -28,7 +28,7 @@
 #include "dbus.h"
 #include "bus-util.h"
 #include "bus-internal.h"
 #include "dbus.h"
 #include "bus-util.h"
 #include "bus-internal.h"

-#include "bus-errors.h"
+#include "bus-common-errors.h"

 
 static int bus_scope_abandon(sd_bus *bus, sd_bus_message *message, void *userdata, sd_bus_error *error) {
         Scope *s = userdata;
 
 static int bus_scope_abandon(sd_bus *bus, sd_bus_message *message, void *userdata, sd_bus_error *error) {
         Scope *s = userdata;

diff --git a/src/core/dbus-unit.c b/src/core/dbus-unit.c
index cc09a268c9d0d8cc4cbc436ad5395ee936f5cfea..0850fb3d4682797d846dd6eed329d928bad6e5b3 100644 (file)
--- a/src/core/dbus-unit.c
+++ b/src/core/dbus-unit.c
@@ -26,7 +26,7 @@
 #include "strv.h"
 #include "path-util.h"
 #include "fileio.h"
 #include "strv.h"
 #include "path-util.h"
 #include "fileio.h"

-#include "bus-errors.h"
+#include "bus-common-errors.h"

 #include "dbus.h"
 #include "dbus-manager.h"
 #include "dbus-unit.h"
 #include "dbus.h"
 #include "dbus-manager.h"
 #include "dbus-unit.h"

diff --git a/src/core/dbus.c b/src/core/dbus.c
index 87da9335a8d8035d4a9f23fcd5e560efd08764d6..260775cd85eedd0a40debd909933b4cec7d813c8 100644 (file)
--- a/src/core/dbus.c
+++ b/src/core/dbus.c
@@ -39,7 +39,7 @@
 #include "dbus.h"
 #include "bus-util.h"
 #include "bus-error.h"
 #include "dbus.h"
 #include "bus-util.h"
 #include "bus-error.h"

-#include "bus-errors.h"
+#include "bus-common-errors.h"

 #include "strxcpyx.h"
 #include "bus-internal.h"
 #include "selinux-access.h"
 #include "strxcpyx.h"
 #include "bus-internal.h"
 #include "selinux-access.h"

diff --git a/src/core/manager.c b/src/core/manager.c
index cff24fa68e354366b08d5a605a521842128aed45..6382400af492aa106d6c41b94b2df415683c4eb5 100644 (file)
--- a/src/core/manager.c
+++ b/src/core/manager.c
@@ -69,7 +69,7 @@
 #include "audit-fd.h"
 #include "boot-timestamps.h"
 #include "env-util.h"
 #include "audit-fd.h"
 #include "boot-timestamps.h"
 #include "env-util.h"

-#include "bus-errors.h"
+#include "bus-common-errors.h"

 #include "bus-error.h"
 #include "bus-util.h"
 #include "dbus.h"
 #include "bus-error.h"
 #include "bus-util.h"
 #include "dbus.h"

diff --git a/src/core/mount.c b/src/core/mount.c
index 6b415b44e98c71e0fb3f35e90df5089a8f989f3f..e271d437cb536dacad4bf1431a502ebbd962719a 100644 (file)
--- a/src/core/mount.c
+++ b/src/core/mount.c
@@ -41,7 +41,7 @@
 #include "unit-name.h"
 #include "dbus-mount.h"
 #include "special.h"
 #include "unit-name.h"
 #include "dbus-mount.h"
 #include "special.h"

-#include "bus-errors.h"
+#include "bus-common-errors.h"

 #include "exit-status.h"
 #include "def.h"
 
 #include "exit-status.h"
 #include "def.h"
 

diff --git a/src/core/snapshot.c b/src/core/snapshot.c
index 900d0d793a24a36f752d23a1694cfeded694aac7..068a077f15311c680be4f1b26683563ed8cd1f95 100644 (file)
--- a/src/core/snapshot.c
+++ b/src/core/snapshot.c
@@ -25,7 +25,7 @@
 #include "snapshot.h"
 #include "unit-name.h"
 #include "dbus-snapshot.h"
 #include "snapshot.h"
 #include "unit-name.h"
 #include "dbus-snapshot.h"

-#include "bus-errors.h"
+#include "bus-common-errors.h"

 
 static const UnitActiveState state_translation_table[_SNAPSHOT_STATE_MAX] = {
         [SNAPSHOT_DEAD] = UNIT_INACTIVE,
 
 static const UnitActiveState state_translation_table[_SNAPSHOT_STATE_MAX] = {
         [SNAPSHOT_DEAD] = UNIT_INACTIVE,

diff --git a/src/core/swap.c b/src/core/swap.c
index 346a5fd7121af758c973fd06e3b71fbbb8594f58..a6a23554c9f38a4c960af600a4ede4ef6924cc08 100644 (file)
--- a/src/core/swap.c
+++ b/src/core/swap.c
@@ -35,7 +35,7 @@
 #include "unit-name.h"
 #include "dbus-swap.h"
 #include "special.h"
 #include "unit-name.h"
 #include "dbus-swap.h"
 #include "special.h"

-#include "bus-errors.h"
+#include "bus-common-errors.h"

 #include "exit-status.h"
 #include "def.h"
 #include "path-util.h"
 #include "exit-status.h"
 #include "def.h"
 #include "path-util.h"

diff --git a/src/core/transaction.c b/src/core/transaction.c
index 66ee90b7b27b4e99b2a8cc63e504feec92638a2c..b0b3d6bd60e4d4b5c87204e1e0191041a36d1cf1 100644 (file)
--- a/src/core/transaction.c
+++ b/src/core/transaction.c
@@ -22,7 +22,7 @@
 #include <unistd.h>
 #include <fcntl.h>
 
 #include <unistd.h>
 #include <fcntl.h>
 

-#include "bus-errors.h"
+#include "bus-common-errors.h"

 #include "bus-util.h"
 #include "bus-error.h"
 #include "transaction.h"
 #include "bus-util.h"
 #include "bus-error.h"
 #include "transaction.h"

diff --git a/src/core/unit.c b/src/core/unit.c
index b3b0892f5ebaa1bb0545376776cd8331e605145c..fe0dfb208349bc60939f9ea63b40e51d0735edb5 100644 (file)
--- a/src/core/unit.c
+++ b/src/core/unit.c
@@ -47,7 +47,7 @@
 #include "mkdir.h"
 #include "label.h"
 #include "fileio-label.h"
 #include "mkdir.h"
 #include "label.h"
 #include "fileio-label.h"

-#include "bus-errors.h"
+#include "bus-common-errors.h"

 #include "dbus.h"
 #include "execute.h"
 #include "virt.h"
 #include "dbus.h"
 #include "execute.h"
 #include "virt.h"

diff --git a/src/fsck/fsck.c b/src/fsck/fsck.c
index a7226ce4df7e98a93e19f9e4d4cb2bac689ce63c..20b794094835c0f5c3a988694ca1fb084fbd08cd 100644 (file)
--- a/src/fsck/fsck.c
+++ b/src/fsck/fsck.c
@@ -35,7 +35,7 @@
 #include "special.h"
 #include "bus-util.h"
 #include "bus-error.h"
 #include "special.h"
 #include "bus-util.h"
 #include "bus-error.h"

-#include "bus-errors.h"
+#include "bus-common-errors.h"

 #include "fileio.h"
 #include "udev-util.h"
 #include "path-util.h"
 #include "fileio.h"
 #include "udev-util.h"
 #include "path-util.h"

diff --git a/src/shared/bus-errors.c b/src/libsystemd/sd-bus/bus-common-errors.c
similarity index 97%
rename from src/shared/bus-errors.c
rename to src/libsystemd/sd-bus/bus-common-errors.c
index c347545c71e2ecea11709792752069daf8bde322..3dc00b5e4a140c70ff92c9fc366025aa085c4acf 100644 (file)
--- a/src/shared/bus-errors.c
+++ b/src/libsystemd/sd-bus/bus-common-errors.c
@@ -23,9 +23,9 @@
 
 #include "sd-bus.h"
 #include "bus-error.h"
 
 #include "sd-bus.h"
 #include "bus-error.h"

-#include "bus-errors.h"
+#include "bus-common-errors.h"

 
 

-BUS_ERROR_MAP_ELF_REGISTER const sd_bus_error_map shared_errors[] = {
+BUS_ERROR_MAP_ELF_REGISTER const sd_bus_error_map bus_common_errors[] = {

         SD_BUS_ERROR_MAP(BUS_ERROR_NO_SUCH_UNIT,                 ENOENT),
         SD_BUS_ERROR_MAP(BUS_ERROR_NO_UNIT_FOR_PID,              ESRCH),
         SD_BUS_ERROR_MAP(BUS_ERROR_UNIT_EXISTS,                  EEXIST),
         SD_BUS_ERROR_MAP(BUS_ERROR_NO_SUCH_UNIT,                 ENOENT),
         SD_BUS_ERROR_MAP(BUS_ERROR_NO_UNIT_FOR_PID,              ESRCH),
         SD_BUS_ERROR_MAP(BUS_ERROR_UNIT_EXISTS,                  EEXIST),

diff --git a/src/shared/bus-errors.h b/src/libsystemd/sd-bus/bus-common-errors.h
similarity index 98%
rename from src/shared/bus-errors.h
rename to src/libsystemd/sd-bus/bus-common-errors.h
index e842f850c10b0c1affc5d1edf58cbadb624d9b86..5b7f41ef193ee39fbed501abec7155317ced2b5e 100644 (file)
--- a/src/shared/bus-errors.h
+++ b/src/libsystemd/sd-bus/bus-common-errors.h
@@ -71,4 +71,4 @@
 #define BUS_ERROR_ABORTED "org.freedesktop.resolve1.Aborted"
 #define _BUS_ERROR_DNS "org.freedesktop.resolve1.DnsError."
 
 #define BUS_ERROR_ABORTED "org.freedesktop.resolve1.Aborted"
 #define _BUS_ERROR_DNS "org.freedesktop.resolve1.DnsError."
 

-BUS_ERROR_MAP_ELF_USE(shared_errors);
+BUS_ERROR_MAP_ELF_USE(bus_common_errors);

diff --git a/src/libsystemd/sd-bus/bus-error.c b/src/libsystemd/sd-bus/bus-error.c
index 157b8d890ad96746c6d0dd0446999349188aa264..2955d9dd2b5a98d0ffc9f24a03eaea294bf66cc6 100644 (file)
--- a/src/libsystemd/sd-bus/bus-error.c
+++ b/src/libsystemd/sd-bus/bus-error.c
@@ -32,7 +32,7 @@
 #include "sd-bus.h"
 #include "bus-error.h"
 
 #include "sd-bus.h"
 #include "bus-error.h"
 

-BUS_ERROR_MAP_ELF_REGISTER const sd_bus_error_map standard_errors[] = {
+BUS_ERROR_MAP_ELF_REGISTER const sd_bus_error_map bus_standard_errors[] = {

         SD_BUS_ERROR_MAP("org.freedesktop.DBus.Error.Failed",                           EACCES),
         SD_BUS_ERROR_MAP("org.freedesktop.DBus.Error.NoMemory",                         ENOMEM),
         SD_BUS_ERROR_MAP("org.freedesktop.DBus.Error.ServiceUnknown",                   EHOSTUNREACH),
         SD_BUS_ERROR_MAP("org.freedesktop.DBus.Error.Failed",                           EACCES),
         SD_BUS_ERROR_MAP("org.freedesktop.DBus.Error.NoMemory",                         ENOMEM),
         SD_BUS_ERROR_MAP("org.freedesktop.DBus.Error.ServiceUnknown",                   EHOSTUNREACH),

diff --git a/src/libsystemd/sd-bus/bus-error.h b/src/libsystemd/sd-bus/bus-error.h
index 56297156a988e878877ffac132fb145546d29d24..66c98b0b3881271839995c66c1f6be024f907047 100644 (file)
--- a/src/libsystemd/sd-bus/bus-error.h
+++ b/src/libsystemd/sd-bus/bus-error.h
@@ -62,4 +62,4 @@ int bus_error_set_errnofv(sd_bus_error *e, int error, const char *format, va_lis
  * maps using the macsd-ros. */
 #define BUS_ERROR_MAP_END_MARKER -'x'
 
  * maps using the macsd-ros. */
 #define BUS_ERROR_MAP_END_MARKER -'x'
 

-BUS_ERROR_MAP_ELF_USE(standard_errors);
+BUS_ERROR_MAP_ELF_USE(bus_standard_errors);

diff --git a/src/libsystemd/sd-bus/test-bus-error.c b/src/libsystemd/sd-bus/test-bus-error.c
index f72bcdb6b5f6d4f646a3ed4e8bfa0af4a066db1c..463fc81c7559431d7eeaf0db57440c3ac729b3cc 100644 (file)
--- a/src/libsystemd/sd-bus/test-bus-error.c
+++ b/src/libsystemd/sd-bus/test-bus-error.c
@@ -23,7 +23,7 @@
 #include "bus-error.h"
 #include "bus-util.h"
 #include "errno-list.h"
 #include "bus-error.h"
 #include "bus-util.h"
 #include "errno-list.h"

-#include "bus-errors.h"
+#include "bus-common-errors.h"

 
 static void test_error(void) {
         _cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_NULL, second = SD_BUS_ERROR_NULL;
 
 static void test_error(void) {
         _cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_NULL, second = SD_BUS_ERROR_NULL;

diff --git a/src/login/logind-dbus.c b/src/login/logind-dbus.c
index d4123117a361c57fafdb964170f5d6b93be7a0de..48395f6f949c8a064c913013c1bfdbb03fedbf56 100644 (file)
--- a/src/login/logind-dbus.c
+++ b/src/login/logind-dbus.c
@@ -41,7 +41,7 @@
 #include "bus-util.h"
 #include "bus-error.h"
 #include "logind.h"
 #include "bus-util.h"
 #include "bus-error.h"
 #include "logind.h"

-#include "bus-errors.h"
+#include "bus-common-errors.h"

 #include "udev-util.h"
 
 static int property_get_idle_hint(
 #include "udev-util.h"
 
 static int property_get_idle_hint(

diff --git a/src/login/logind-seat-dbus.c b/src/login/logind-seat-dbus.c
index 1a2f09c615d97ec016e154d49f3c25d1ab45633c..ff87f0f741dcaab3ce4971a776ffe02101958a23 100644 (file)
--- a/src/login/logind-seat-dbus.c
+++ b/src/login/logind-seat-dbus.c
@@ -26,7 +26,7 @@
 #include "util.h"
 #include "bus-util.h"
 #include "strv.h"
 #include "util.h"
 #include "bus-util.h"
 #include "strv.h"

-#include "bus-errors.h"
+#include "bus-common-errors.h"

 #include "bus-label.h"
 #include "logind.h"
 #include "logind-seat.h"
 #include "bus-label.h"
 #include "logind.h"
 #include "logind-seat.h"

diff --git a/src/login/logind-session-dbus.c b/src/login/logind-session-dbus.c
index 58836fce2597b6a2234e1ad0ef9920854c4ec2c1..8607d032657bcae98c90fd303cadda74652a08a9 100644 (file)
--- a/src/login/logind-session-dbus.c
+++ b/src/login/logind-session-dbus.c
@@ -26,7 +26,7 @@
 #include "util.h"
 #include "strv.h"
 #include "bus-util.h"
 #include "util.h"
 #include "strv.h"
 #include "bus-util.h"

-#include "bus-errors.h"
+#include "bus-common-errors.h"

 #include "bus-label.h"
 
 #include "logind.h"
 #include "bus-label.h"
 
 #include "logind.h"

diff --git a/src/machine/machine-dbus.c b/src/machine/machine-dbus.c
index a2fc56f7c9f8019c549a644740ab7e07c9e3953c..72ae6c65354df132b28e9dcb6aad4c851850ae31 100644 (file)
--- a/src/machine/machine-dbus.c
+++ b/src/machine/machine-dbus.c
@@ -27,7 +27,7 @@
 #include "bus-util.h"
 #include "bus-label.h"
 #include "strv.h"
 #include "bus-util.h"
 #include "bus-label.h"
 #include "strv.h"

-#include "bus-errors.h"
+#include "bus-common-errors.h"

 #include "copy.h"
 #include "fileio.h"
 #include "in-addr-util.h"
 #include "copy.h"
 #include "fileio.h"
 #include "in-addr-util.h"

diff --git a/src/machine/machined-dbus.c b/src/machine/machined-dbus.c
index 20a98ee8370f01686b745f5f153076820f080966..0b57b3699c256e7dbaa8bf33783d6de2c3781291 100644 (file)
--- a/src/machine/machined-dbus.c
+++ b/src/machine/machined-dbus.c
@@ -36,7 +36,7 @@
 #include "utf8.h"
 #include "unit-name.h"
 #include "bus-util.h"
 #include "utf8.h"
 #include "unit-name.h"
 #include "bus-util.h"

-#include "bus-errors.h"
+#include "bus-common-errors.h"

 #include "time-util.h"
 #include "cgroup-util.h"
 #include "machined.h"
 #include "time-util.h"
 #include "cgroup-util.h"
 #include "machined.h"

diff --git a/src/nss-resolve/nss-resolve.c b/src/nss-resolve/nss-resolve.c
index 6a029a331bd05d7c59ffc7da5fdc6841a6302252..3f32ed06507df81eb72a7aa0c975b27cf5cba52e 100644 (file)
--- a/src/nss-resolve/nss-resolve.c
+++ b/src/nss-resolve/nss-resolve.c
@@ -33,7 +33,7 @@
 
 #include "sd-bus.h"
 #include "bus-util.h"
 
 #include "sd-bus.h"
 #include "bus-util.h"

-#include "bus-errors.h"
+#include "bus-common-errors.h"

 #include "macro.h"
 #include "nss-util.h"
 #include "util.h"
 #include "macro.h"
 #include "nss-util.h"
 #include "util.h"

diff --git a/src/resolve-host/resolve-host.c b/src/resolve-host/resolve-host.c
index 4950ca14979600c325ce23a536b5aa94211e47d0..43ecf81ef62b8e46244b6a21d017aebee98869a6 100644 (file)
--- a/src/resolve-host/resolve-host.c
+++ b/src/resolve-host/resolve-host.c
@@ -26,7 +26,7 @@
 #include "sd-bus.h"
 #include "bus-util.h"
 #include "bus-error.h"
 #include "sd-bus.h"
 #include "bus-util.h"
 #include "bus-error.h"

-#include "bus-errors.h"
+#include "bus-common-errors.h"

 #include "in-addr-util.h"
 #include "af-list.h"
 #include "build.h"
 #include "in-addr-util.h"
 #include "af-list.h"
 #include "build.h"

diff --git a/src/resolve/resolved-bus.c b/src/resolve/resolved-bus.c
index ff741cdc6753d1f73f7b4e6571813afafb622b36..8161b5321fa3fe306fb51510700ce60c3ab84338 100644 (file)
--- a/src/resolve/resolved-bus.c
+++ b/src/resolve/resolved-bus.c
@@ -19,7 +19,7 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 

-#include "bus-errors.h"
+#include "bus-common-errors.h"

 #include "bus-util.h"
 
 #include "resolved-dns-domain.h"
 #include "bus-util.h"
 
 #include "resolved-dns-domain.h"

diff --git a/src/systemctl/systemctl.c b/src/systemctl/systemctl.c
index 17dfff7887abca4f22b450447d00cb62d773bec9..b1441ad86a33f9a1de93498348ca769cb38f0242 100644 (file)
--- a/src/systemctl/systemctl.c
+++ b/src/systemctl/systemctl.c
@@ -72,7 +72,7 @@
 #include "bus-util.h"
 #include "bus-message.h"
 #include "bus-error.h"
 #include "bus-util.h"
 #include "bus-message.h"
 #include "bus-error.h"

-#include "bus-errors.h"
+#include "bus-common-errors.h"

 #include "mkdir.h"
 
 static char **arg_types = NULL;
 #include "mkdir.h"
 
 static char **arg_types = NULL;

diff --git a/src/timedate/timedated.c b/src/timedate/timedated.c
index 08ddc52ca6874d80d198585c0e09e556bd708cc1..bf567a162452076beec7b7a5e75ca9583b088ccd 100644 (file)
--- a/src/timedate/timedated.c
+++ b/src/timedate/timedated.c
@@ -39,7 +39,7 @@
 #include "label.h"
 #include "bus-util.h"
 #include "bus-error.h"
 #include "label.h"
 #include "bus-util.h"
 #include "bus-error.h"

-#include "bus-errors.h"
+#include "bus-common-errors.h"

 #include "event-util.h"
 
 #define NULL_ADJTIME_UTC "0.0 0 0\n0\nUTC\n"
 #include "event-util.h"
 
 #define NULL_ADJTIME_UTC "0.0 0 0\n0\nUTC\n"