lib/utils: Port a bit to decl-after-stmt style

Add add some more comments.

Closes: #1247
Approved by: jlebon

1 files changed, 7 insertions, 11 deletions

diff --git a/src/libotutil/ot-fs-utils.c b/src/libotutil/ot-fs-utils.c
index 79ba3cf7..cad27496 100644
--- a/src/libotutil/ot-fs-utils.c
+++ b/src/libotutil/ot-fs-utils.c
@@ -36,6 +36,9 @@ ot_fdrel_to_gfile (int dfd, const char *path)
   return g_file_new_for_path (abspath);
 }
 
+/* Wraps readlinkat(), and sets the `symlink-target` property
+ * of @target_info.
+ */
 gboolean
 ot_readlinkat_gfile_info (int             dfd,
                           const char     *path,
@@ -54,7 +57,6 @@ ot_readlinkat_gfile_info (int             dfd,
   return TRUE;
 }
 
-
 /**
  * ot_openat_read_stream:
  * @dfd: Directory file descriptor
@@ -77,16 +79,10 @@ ot_openat_read_stream (int             dfd,
                        GCancellable   *cancellable,
                        GError        **error)
 {
-  int fd = -1;
-  int flags = O_RDONLY | O_NOCTTY | O_CLOEXEC;
-
-  if (!follow)
-    flags |= O_NOFOLLOW;
-
-  if (TEMP_FAILURE_RETRY (fd = openat (dfd, path, flags, 0)) < 0)
-    return glnx_throw_errno_prefix (error, "openat(%s)", path);
-
-  *out_istream = g_unix_input_stream_new (fd, TRUE);
+  glnx_fd_close int fd = -1;
+  if (!glnx_openat_rdonly (dfd, path, follow, &fd, error))
+    return FALSE;
+  *out_istream = g_unix_input_stream_new (glnx_steal_fd (&fd), TRUE);
   return TRUE;
 }