35bb946
From 50e78e3f7f0e1751a594214d1e25f06ca371035d Mon Sep 17 00:00:00 2001
35bb946
From: Yu Watanabe <watanabe.yu+github@gmail.com>
35bb946
Date: Wed, 11 Oct 2017 12:46:27 +0900
35bb946
Subject: [PATCH] dynamic-user: label functions not necessary to export as
35bb946
 static
35bb946
35bb946
(cherry picked from commit 9da440b1b3d8476394e6ffcaf687e0f89932e6ac)
35bb946
---
35bb946
 src/core/dynamic-user.c | 12 ++++++------
35bb946
 src/core/dynamic-user.h |  9 ---------
35bb946
 2 files changed, 6 insertions(+), 15 deletions(-)
35bb946
35bb946
diff --git a/src/core/dynamic-user.c b/src/core/dynamic-user.c
35bb946
index f1b5ee7ecb..a191341186 100644
35bb946
--- a/src/core/dynamic-user.c
35bb946
+++ b/src/core/dynamic-user.c
35bb946
@@ -82,7 +82,7 @@ static int dynamic_user_add(Manager *m, const char *name, int storage_socket[2],
35bb946
         return 0;
35bb946
 }
35bb946
 
35bb946
-int dynamic_user_acquire(Manager *m, const char *name, DynamicUser** ret) {
35bb946
+static int dynamic_user_acquire(Manager *m, const char *name, DynamicUser** ret) {
35bb946
         _cleanup_close_pair_ int storage_socket[2] = { -1, -1 };
35bb946
         DynamicUser *d;
35bb946
         int r;
35bb946
@@ -421,7 +421,7 @@ static void unlink_uid_lock(int lock_fd, uid_t uid, const char *name) {
35bb946
         (void) make_uid_symlinks(uid, name, false); /* remove direct lookup symlinks */
35bb946
 }
35bb946
 
35bb946
-int dynamic_user_realize(DynamicUser *d, char **suggested_dirs, uid_t *ret) {
35bb946
+static int dynamic_user_realize(DynamicUser *d, char **suggested_dirs, uid_t *ret) {
35bb946
 
35bb946
         _cleanup_close_ int etc_passwd_lock_fd = -1, uid_lock_fd = -1;
35bb946
         uid_t uid = UID_INVALID;
35bb946
@@ -526,7 +526,7 @@ finish:
35bb946
         return r;
35bb946
 }
35bb946
 
35bb946
-int dynamic_user_current(DynamicUser *d, uid_t *ret) {
35bb946
+static int dynamic_user_current(DynamicUser *d, uid_t *ret) {
35bb946
         _cleanup_close_ int lock_fd = -1;
35bb946
         uid_t uid;
35bb946
         int r;
35bb946
@@ -555,7 +555,7 @@ finish:
35bb946
         return r;
35bb946
 }
35bb946
 
35bb946
-DynamicUser* dynamic_user_ref(DynamicUser *d) {
35bb946
+static DynamicUser* dynamic_user_ref(DynamicUser *d) {
35bb946
         if (!d)
35bb946
                 return NULL;
35bb946
 
35bb946
@@ -565,7 +565,7 @@ DynamicUser* dynamic_user_ref(DynamicUser *d) {
35bb946
         return d;
35bb946
 }
35bb946
 
35bb946
-DynamicUser* dynamic_user_unref(DynamicUser *d) {
35bb946
+static DynamicUser* dynamic_user_unref(DynamicUser *d) {
35bb946
         if (!d)
35bb946
                 return NULL;
35bb946
 
35bb946
@@ -608,7 +608,7 @@ finish:
35bb946
         return r;
35bb946
 }
35bb946
 
35bb946
-DynamicUser* dynamic_user_destroy(DynamicUser *d) {
35bb946
+static DynamicUser* dynamic_user_destroy(DynamicUser *d) {
35bb946
         if (!d)
35bb946
                 return NULL;
35bb946
 
35bb946
diff --git a/src/core/dynamic-user.h b/src/core/dynamic-user.h
35bb946
index e7de4f46ae..a0cb378115 100644
35bb946
--- a/src/core/dynamic-user.h
35bb946
+++ b/src/core/dynamic-user.h
35bb946
@@ -43,15 +43,6 @@ struct DynamicUser {
35bb946
         char name[];
35bb946
 };
35bb946
 
35bb946
-int dynamic_user_acquire(Manager *m, const char *name, DynamicUser **ret);
35bb946
-
35bb946
-int dynamic_user_realize(DynamicUser *d, char **suggested_paths, uid_t *ret);
35bb946
-int dynamic_user_current(DynamicUser *d, uid_t *ret);
35bb946
-
35bb946
-DynamicUser* dynamic_user_ref(DynamicUser *d);
35bb946
-DynamicUser* dynamic_user_unref(DynamicUser *d);
35bb946
-DynamicUser* dynamic_user_destroy(DynamicUser *d);
35bb946
-
35bb946
 int dynamic_user_serialize(Manager *m, FILE *f, FDSet *fds);
35bb946
 void dynamic_user_deserialize_one(Manager *m, const char *value, FDSet *fds);
35bb946
 void dynamic_user_vacuum(Manager *m, bool close_user);