From: Philip Withnall <withnall@endlessm.com>
Date: Thu, 18 May 2017 07:28:03 +0000 (+0100)
Subject: lib/repo: Make ost_repo_remove_remote() available internally
X-Git-Tag: archive/raspbian/2022.1-3+rpi1~1^2~4^2~36^2~80
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=242a0fd77928bb3fa1c960a78936b3d43a99c4c6;p=ostree.git

lib/repo: Make ost_repo_remove_remote() available internally

Make it an internal, not static, API; like _ostree_repo_add_remote(). It
will be used in many the same situations.

Signed-off-by: Philip Withnall <withnall@endlessm.com>

Closes: #875
Approved by: cgwalters
---

diff --git a/src/libostree/ostree-repo-private.h b/src/libostree/ostree-repo-private.h
index d3955ad5..7efbf91f 100644
--- a/src/libostree/ostree-repo-private.h
+++ b/src/libostree/ostree-repo-private.h
@@ -354,6 +354,9 @@ _ostree_repo_update_mtime (OstreeRepo        *self,
 gboolean
 _ostree_repo_add_remote (OstreeRepo   *self,
                          OstreeRemote *remote);
+gboolean
+_ostree_repo_remove_remote (OstreeRepo   *self,
+                            OstreeRemote *remote);
 OstreeRemote *
 _ostree_repo_get_remote (OstreeRepo  *self,
                          const char  *name,
diff --git a/src/libostree/ostree-repo.c b/src/libostree/ostree-repo.c
index a5cfb123..7ee2c9aa 100644
--- a/src/libostree/ostree-repo.c
+++ b/src/libostree/ostree-repo.c
@@ -169,9 +169,9 @@ _ostree_repo_add_remote (OstreeRepo   *self,
   return already_existed;
 }
 
-static gboolean
-ost_repo_remove_remote (OstreeRepo   *self,
-                        OstreeRemote *remote)
+gboolean
+_ostree_repo_remove_remote (OstreeRepo   *self,
+                            OstreeRemote *remote)
 {
   gboolean removed;
 
@@ -1040,7 +1040,7 @@ impl_repo_remote_delete (OstreeRepo     *self,
   if (!ot_ensure_unlinked_at (self->repo_dir_fd, remote->keyring, error))
     return FALSE;
 
-  ost_repo_remove_remote (self, remote);
+  _ostree_repo_remove_remote (self, remote);
 
   return TRUE;
 }