summaryrefslogtreecommitdiff
path: root/src/basic
diff options
context:
space:
mode:
authorSven Eden <yamakuzure@gmx.net>2017-02-20 17:13:50 +0100
committerSven Eden <yamakuzure@gmx.net>2017-03-14 10:23:22 +0100
commit6ff57d0bf5de38bfc4df718cc596d4a3a333f290 (patch)
treee966f76767961e5f6a434c8f1a28b3c396f273c5 /src/basic
parent1f05b944a3c0efe3f3a9a92b04bbfd37b5872f3c (diff)
Cleaned up more unneeded types and functions.
- src/shared/install.h - removed - src/basic/unit-name.[hc] - cleaned - src/core/cgroup.[hc] - cleaned - src/libelogind/libelogind.sym - cleaned - src/libelogind/sd-daemon/sd-daemon.c - cleaned - src/shared/acl-util.[hc] - cleaned - src/shared/bus-util.[hc] - cleaned - src/shared/output-mode.h - cleaned - src/shared/path-lookup.h - cleaned - src/systemd/sd-daemon.h - cleaned
Diffstat (limited to 'src/basic')
-rw-r--r--src/basic/unit-name.c14
-rw-r--r--src/basic/unit-name.h22
2 files changed, 21 insertions, 15 deletions
diff --git a/src/basic/unit-name.c b/src/basic/unit-name.c
index 7931b8f48..6c74661c5 100644
--- a/src/basic/unit-name.c
+++ b/src/basic/unit-name.c
@@ -118,6 +118,8 @@ bool unit_suffix_is_valid(const char *s) {
return true;
}
+/// UNNEEDED by elogind
+#if 0
int unit_name_to_prefix(const char *n, char **ret) {
const char *p;
char *s;
@@ -142,8 +144,6 @@ int unit_name_to_prefix(const char *n, char **ret) {
return 0;
}
-/// UNNEEDED by elogind
-#if 0
int unit_name_to_instance(const char *n, char **instance) {
const char *p, *d;
char *i;
@@ -598,6 +598,8 @@ int unit_name_from_dbus_path(const char *path, char **name) {
return 0;
}
+/// UNNEEDED by elogind
+#if 0
const char* unit_dbus_interface_from_type(UnitType t) {
static const char *const table[_UNIT_TYPE_MAX] = {
@@ -624,8 +626,6 @@ const char* unit_dbus_interface_from_type(UnitType t) {
return table[t];
}
-/// UNNEEDED by elogind
-#if 0
const char *unit_dbus_interface_from_name(const char *name) {
UnitType t;
@@ -635,7 +635,6 @@ const char *unit_dbus_interface_from_name(const char *name) {
return unit_dbus_interface_from_type(t);
}
-#endif // 0
static char *do_escape_mangle(const char *f, UnitNameMangle allow_globs, char *t) {
const char *valid_chars;
@@ -722,8 +721,6 @@ int unit_name_mangle_with_suffix(const char *name, UnitNameMangle allow_globs, c
return 1;
}
-/// UNNEEDED by elogind
-#if 0
int slice_build_parent_slice(const char *slice, char **ret) {
char *s, *dash;
int r;
@@ -846,6 +843,8 @@ static const char* const unit_type_table[_UNIT_TYPE_MAX] = {
DEFINE_STRING_TABLE_LOOKUP(unit_type, UnitType);
+/// UNNEEDED by elogind
+#if 0
static const char* const unit_load_state_table[_UNIT_LOAD_STATE_MAX] = {
[UNIT_STUB] = "stub",
[UNIT_LOADED] = "loaded",
@@ -887,3 +886,4 @@ static const char* const unit_dependency_table[_UNIT_DEPENDENCY_MAX] = {
};
DEFINE_STRING_TABLE_LOOKUP(unit_dependency, UnitDependency);
+#endif // 0
diff --git a/src/basic/unit-name.h b/src/basic/unit-name.h
index 7b3924de8..8ed77ae8e 100644
--- a/src/basic/unit-name.h
+++ b/src/basic/unit-name.h
@@ -28,8 +28,8 @@
#define UNIT_NAME_MAX 256
typedef enum UnitType UnitType;
-typedef enum UnitLoadState UnitLoadState;
-typedef enum UnitDependency UnitDependency;
+// UNNEEDED typedef enum UnitLoadState UnitLoadState;
+// UNNNEEDED typedef enum UnitDependency UnitDependency;
enum UnitType {
UNIT_SERVICE = 0,
@@ -49,6 +49,8 @@ enum UnitType {
_UNIT_TYPE_INVALID = -1
};
+/// UNNEEDED by elogind
+#if 0
enum UnitLoadState {
UNIT_STUB = 0,
UNIT_LOADED,
@@ -108,6 +110,7 @@ enum UnitDependency {
_UNIT_DEPENDENCY_MAX,
_UNIT_DEPENDENCY_INVALID = -1
};
+#endif // 0
typedef enum UnitNameFlags {
UNIT_NAME_PLAIN = 1, /* Allow foo.service */
@@ -126,7 +129,7 @@ static inline int unit_prefix_and_instance_is_valid(const char *p) {
return unit_instance_is_valid(p);
}
-int unit_name_to_prefix(const char *n, char **prefix);
+// UNNEEDED int unit_name_to_prefix(const char *n, char **prefix);
// UNNEEDED int unit_name_to_instance(const char *n, char **instance);
// UNNEEDED int unit_name_to_prefix_and_instance(const char *n, char **ret);
@@ -152,9 +155,11 @@ int unit_name_from_path(const char *path, const char *suffix, char **ret);
char *unit_dbus_path_from_name(const char *name);
int unit_name_from_dbus_path(const char *path, char **name);
-const char* unit_dbus_interface_from_type(UnitType t);
+// UNNEEDED const char* unit_dbus_interface_from_type(UnitType t);
// UNNEEDED const char *unit_dbus_interface_from_name(const char *name);
+/// UNNEEDED by elogind
+#if 0
typedef enum UnitNameMangle {
UNIT_NAME_NOGLOB,
UNIT_NAME_GLOB,
@@ -165,6 +170,7 @@ int unit_name_mangle_with_suffix(const char *name, UnitNameMangle allow_globs, c
static inline int unit_name_mangle(const char *name, UnitNameMangle allow_globs, char **ret) {
return unit_name_mangle_with_suffix(name, allow_globs, ".service", ret);
}
+#endif // 0
// UNNEEDED int slice_build_parent_slice(const char *slice, char **ret);
int slice_build_subslice(const char *slice, const char*name, char **subslice);
@@ -173,8 +179,8 @@ bool slice_name_is_valid(const char *name);
const char *unit_type_to_string(UnitType i) _const_;
UnitType unit_type_from_string(const char *s) _pure_;
-const char *unit_load_state_to_string(UnitLoadState i) _const_;
-UnitLoadState unit_load_state_from_string(const char *s) _pure_;
+// UNNEEDED const char *unit_load_state_to_string(UnitLoadState i) _const_;
+// UNNEEDED UnitLoadState unit_load_state_from_string(const char *s) _pure_;
-const char *unit_dependency_to_string(UnitDependency i) _const_;
-UnitDependency unit_dependency_from_string(const char *s) _pure_;
+// UNNEEDED const char *unit_dependency_to_string(UnitDependency i) _const_;
+// UNNEEDED UnitDependency unit_dependency_from_string(const char *s) _pure_;