sd-bus: catch up with current kdbus, don't do matches on kdbus monitor connections

[elogind.git] / src / libsystemd / sd-path / sd-path.c

diff --git a/src/libsystemd/sd-path/sd-path.c b/src/libsystemd/sd-path/sd-path.c
index 44c1b8bd70fa0f9a94b22e6fb40b74256e5d1bee..651fceb79da3fe01935e3b65582a8ea294e14370 100644 (file)
--- a/src/libsystemd/sd-path/sd-path.c
+++ b/src/libsystemd/sd-path/sd-path.c
@@ -22,6 +22,7 @@
 #include "path-util.h"
 #include "strv.h"
 #include "sd-path.h"
+#include "missing.h"
 
 static int from_environment(const char *envname, const char *fallback, const char **ret) {
         assert(ret);
@@ -275,7 +276,7 @@ static int get_path(uint64_t type, char **buffer, const char **ret) {
                 return from_home_dir(NULL, ".local/lib", buffer, ret);
 
         case SD_PATH_USER_LIBRARY_ARCH:
-                return from_home_dir(NULL, ".local/lib/" ARCH_TUPLE, buffer, ret);
+                return from_home_dir(NULL, ".local/lib/" LIB_ARCH_TUPLE, buffer, ret);
 
         case SD_PATH_USER_SHARED:
                 return from_home_dir("XDG_DATA_HOME", ".local/share", buffer, ret);
@@ -325,7 +326,7 @@ static int get_path(uint64_t type, char **buffer, const char **ret) {
         return -ENOTSUP;
 }
 
-int sd_path_home(uint64_t type, const char *suffix, char **path) {
+_public_ int sd_path_home(uint64_t type, const char *suffix, char **path) {
         char *buffer = NULL, *cc;
         const char *ret;
         int r;
@@ -502,7 +503,7 @@ static int get_search(uint64_t type, char ***list) {
         case SD_PATH_SEARCH_LIBRARY_ARCH:
                 return search_from_environment(list,
                                                NULL,
-                                               ".local/lib/" ARCH_TUPLE,
+                                               ".local/lib/" LIB_ARCH_TUPLE,
                                                "LD_LIBRARY_PATH",
                                                true,
                                                LIBDIR,
@@ -554,7 +555,7 @@ static int get_search(uint64_t type, char ***list) {
         return -ENOTSUP;
 }
 
-int sd_path_search(uint64_t type, const char *suffix, char ***paths) {
+_public_ int sd_path_search(uint64_t type, const char *suffix, char ***paths) {
         char **l, **i, **j, **n;
         int r;