X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fcore%2Fbus-errors.h;h=9368d68e80d25091c04abdc26a3c01b7c0adef8e;hb=06eb4e3bf87584ea526a90643d49037cf6ffd7ff;hp=a6f055f0996becf3577ba7b6535efcf57e3405c0;hpb=5430f7f2bc7330f3088b894166bf3524a067e3d8;p=elogind.git
diff --git a/src/core/bus-errors.h b/src/core/bus-errors.h
index a6f055f09..9368d68e8 100644
--- a/src/core/bus-errors.h
+++ b/src/core/bus-errors.h
@@ -1,7 +1,6 @@
/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
-#ifndef foobuserrorshfoo
-#define foobuserrorshfoo
+#pragma once
/***
This file is part of systemd.
@@ -22,9 +21,6 @@
along with systemd; If not, see .
***/
-#include
-#include
-
#define BUS_ERROR_NO_SUCH_UNIT "org.freedesktop.systemd1.NoSuchUnit"
#define BUS_ERROR_NO_SUCH_JOB "org.freedesktop.systemd1.NoSuchJob"
#define BUS_ERROR_NOT_SUBSCRIBED "org.freedesktop.systemd1.NotSubscribed"
@@ -44,15 +40,4 @@
#define BUS_ERROR_TRANSACTION_ORDER_IS_CYCLIC "org.freedesktop.systemd1.TransactionOrderIsCyclic"
#define BUS_ERROR_SHUTTING_DOWN "org.freedesktop.systemd1.ShuttingDown"
#define BUS_ERROR_NO_SUCH_PROCESS "org.freedesktop.systemd1.NoSuchProcess"
-
-static inline const char *bus_error(const DBusError *e, int r) {
- if (e && e->message)
- return e->message;
-
- if (r >= 0)
- return strerror(r);
-
- return strerror(-r);
-}
-
-#endif
+#define BUS_ERROR_JOB_FAILED "org.freedesktop.systemd1.JobFailed"