From: Eric Curtin <ecurtin@redhat.com>
Date: Mon, 17 Jul 2023 12:23:27 +0000 (+0100)
Subject: Remove steal_pointer and steal_pointer_impl as we link in glib now
X-Git-Tag: archive/raspbian/2023.7-3+rpi1~1^2~9^2^2~49^2
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=355cd727055959337fcdbe0617aae66f5d7ef433;p=ostree.git

Remove steal_pointer and steal_pointer_impl as we link in glib now

These were necessary to keep initramfs small, but now we link in glib
anyway so these functions are now redundant.
---

diff --git a/src/switchroot/ostree-mount-util.h b/src/switchroot/ostree-mount-util.h
index 4404c232..85f3443e 100644
--- a/src/switchroot/ostree-mount-util.h
+++ b/src/switchroot/ostree-mount-util.h
@@ -41,7 +41,6 @@
 #define _OSTREE_COMPOSEFS_ROOT_STAMP "/run/ostree-composefs-root.stamp"
 
 #define autofree __attribute__ ((cleanup (cleanup_free)))
-#define steal_pointer(pp) steal_pointer_impl ((void **)pp)
 
 static inline int
 path_is_on_readonly_fs (const char *path)
@@ -89,15 +88,6 @@ cleanup_free (void *p)
   free (*pp);
 }
 
-static inline void *
-steal_pointer_impl (void **to_steal)
-{
-  void *ret = *to_steal;
-  *to_steal = NULL;
-
-  return ret;
-}
-
 static inline char *
 read_proc_cmdline_key (const char *key)
 {