X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fshared%2Funit-name.h;h=9150dd0b3f75de5bd89bbb9a3f29196108546945;hp=7aab2e557de5f21537924b021cac646ae3a84063;hb=1dcf60656cc68cf0182703d77e31f24f05b0c8cc;hpb=48899192a7b28b6a338cc8ec18aa35ccd8867acb

diff --git a/src/shared/unit-name.h b/src/shared/unit-name.h
index 7aab2e557..9150dd0b3 100644
--- a/src/shared/unit-name.h
+++ b/src/shared/unit-name.h
@@ -1,7 +1,6 @@
 /*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
 
-#ifndef foounitnamehfoo
-#define foounitnamehfoo
+#pragma once
 
 /***
   This file is part of systemd.
@@ -26,25 +25,63 @@
 
 #define UNIT_NAME_MAX 256
 
+typedef enum UnitType UnitType;
+typedef enum UnitLoadState UnitLoadState;
+
+enum UnitType {
+        UNIT_SERVICE = 0,
+        UNIT_SOCKET,
+        UNIT_TARGET,
+        UNIT_DEVICE,
+        UNIT_MOUNT,
+        UNIT_AUTOMOUNT,
+        UNIT_SNAPSHOT,
+        UNIT_TIMER,
+        UNIT_SWAP,
+        UNIT_PATH,
+        _UNIT_TYPE_MAX,
+        _UNIT_TYPE_INVALID = -1
+};
+
+enum UnitLoadState {
+        UNIT_STUB = 0,
+        UNIT_LOADED,
+        UNIT_ERROR,
+        UNIT_MERGED,
+        UNIT_MASKED,
+        _UNIT_LOAD_STATE_MAX,
+        _UNIT_LOAD_STATE_INVALID = -1
+};
+
+extern const char* const unit_type_table[];
+const char *unit_type_to_string(UnitType i);
+UnitType unit_type_from_string(const char *s);
+
+extern const char* const unit_load_state_table[];
+const char *unit_load_state_to_string(UnitLoadState i);
+UnitLoadState unit_load_state_from_string(const char *s);
+
 int unit_name_to_instance(const char *n, char **instance);
 char* unit_name_to_prefix(const char *n);
 char* unit_name_to_prefix_and_instance(const char *n);
 
-bool unit_name_is_valid_no_type(const char *n, bool template_ok);
+bool unit_name_is_valid(const char *n, bool template_ok);
 bool unit_prefix_is_valid(const char *p);
 bool unit_instance_is_valid(const char *i);
 
+UnitType unit_name_to_type(const char *n);
+
 char *unit_name_change_suffix(const char *n, const char *suffix);
 
 char *unit_name_build(const char *prefix, const char *instance, const char *suffix);
-char *unit_name_build_escape(const char *prefix, const char *instance, const char *suffix);
 
 char *unit_name_escape(const char *f);
 char *unit_name_unescape(const char *f);
-
+char *unit_name_path_escape(const char *f);
 char *unit_name_path_unescape(const char *f);
 
 bool unit_name_is_template(const char *n);
+bool unit_name_is_instance(const char *n);
 
 char *unit_name_replace_instance(const char *f, const char *i);
 
@@ -56,4 +93,5 @@ char *unit_name_to_path(const char *name);
 
 char *unit_dbus_path_from_name(const char *name);
 
-#endif
+char *unit_name_mangle(const char *name);
+char *snapshot_name_mangle(const char *name);