Prep v228: Apply more cosmetic changes found in upstream.

[elogind.git] / src / shared / path-lookup.h

diff --git a/src/shared/path-lookup.h b/src/shared/path-lookup.h
index 2fe8173f442336004f8f725aeb200087dd523d63..9bccaf64074a6fd373c76f11e523721e488c63d4 100644 (file)
--- a/src/shared/path-lookup.h
+++ b/src/shared/path-lookup.h
@@ -25,28 +25,36 @@
 
 typedef struct LookupPaths {
         char **unit_path;
-#ifdef HAVE_SYSV_COMPAT
-        char **sysvinit_path;
-        char **sysvrcnd_path;
-#endif
 } LookupPaths;
 
-typedef enum SystemdRunningAs {
-        SYSTEMD_SYSTEM,
-        SYSTEMD_USER,
-        _SYSTEMD_RUNNING_AS_MAX,
-        _SYSTEMD_RUNNING_AS_INVALID = -1
-} SystemdRunningAs;
-
-#define _cleanup_lookup_paths_free_ _cleanup_(lookup_paths_free)
+typedef enum ManagerRunningAs {
+        MANAGER_SYSTEM,
+        MANAGER_USER,
+        _MANAGER_RUNNING_AS_MAX,
+        _MANAGER_RUNNING_AS_INVALID = -1
+} ManagerRunningAs;
 
+/// UNNEEDED by elogind
+#if 0
 int user_config_home(char **config_home);
+int user_runtime_dir(char **runtime_dir);
+
+char **generator_paths(ManagerRunningAs running_as);
 
 int lookup_paths_init(LookupPaths *p,
-                      SystemdRunningAs running_as,
+                      ManagerRunningAs running_as,
                       bool personal,
                       const char *root_dir,
                       const char *generator,
                       const char *generator_early,
                       const char *generator_late);
+
+#include "install.h"
+
+int lookup_paths_init_from_scope(LookupPaths *paths,
+                                 UnitFileScope scope,
+                                 const char *root_dir);
+
 void lookup_paths_free(LookupPaths *p);
+#define _cleanup_lookup_paths_free_ _cleanup_(lookup_paths_free)
+#endif // 0