Refactor: Make filemeta_to_stat a private API

Rather than static. This way I can use it from `ostree-repo-commit.c`.
stb-tester · Jul 1, 2020 · b57c3b0 · b57c3b0
1 parent fd8ecdf
commit b57c3b0
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 6 deletions.
diff --git a/src/libostree/ostree-repo-private.h b/src/libostree/ostree-repo-private.h
@@ -310,6 +310,10 @@ _ostree_repo_file_replace_contents (OstreeRepo    *self,
                                     GCancellable  *cancellable,
                                     GError       **error);
 
+GVariant  *
+_ostree_filemeta_to_stat (struct stat *stbuf,
+                          GBytes      *bytes);
+
 gboolean
 _ostree_repo_write_ref (OstreeRepo                 *self,
                         const char                 *remote,

diff --git a/src/libostree/ostree-repo.c b/src/libostree/ostree-repo.c
@@ -3813,13 +3813,16 @@ load_metadata_internal (OstreeRepo       *self,
   return TRUE;
 }
 
-static GVariant  *
-filemeta_to_stat (struct stat *stbuf,
-                  GVariant   *metadata)
+GVariant  *
+_ostree_filemeta_to_stat (struct stat *stbuf,
+                          GBytes      *bytes)
 {
   guint32 uid, gid, mode;
   GVariant *xattrs;
 
+  g_autoptr(GVariant) metadata = g_variant_ref_sink (g_variant_new_from_bytes (
+        OSTREE_FILEMETA_GVARIANT_FORMAT, bytes, FALSE));
+
   g_variant_get (metadata, "(uuu@a(ayay))",
                  &uid, &gid, &mode, &xattrs);
   stbuf->st_uid = GUINT32_FROM_BE (uid);
@@ -3958,9 +3961,7 @@ _ostree_repo_load_file_bare (OstreeRepo         *self,
       if (bytes == NULL)
         return FALSE;
 
-      g_autoptr(GVariant) metadata = g_variant_ref_sink (g_variant_new_from_bytes (OSTREE_FILEMETA_GVARIANT_FORMAT,
-                                                                                   bytes, FALSE));
-      ret_xattrs = filemeta_to_stat (&stbuf, metadata);
+      ret_xattrs = _ostree_filemeta_to_stat (&stbuf, bytes);
       if (S_ISLNK (stbuf.st_mode))
         {
           if (out_symlink)