[zxio][1/2] Transition to new zxio_close()
This change is part of a soft transition to move to a new signature for
`zxio_close()`.
Bug: 118942
Bug: 102657
Change-Id: I3377e405526f991eb531d9ab484142e6a06c2fca
Reviewed-on: https://fuchsia-review.googlesource.com/c/third_party/mesa/+/786604
Reviewed-by: Tamir Duberstein <tamird@google.com>
diff --git a/src/util/os_dirent_fuchsia.cpp b/src/util/os_dirent_fuchsia.cpp
index 881c90c..a67cfea 100644
--- a/src/util/os_dirent_fuchsia.cpp
+++ b/src/util/os_dirent_fuchsia.cpp
@@ -52,7 +52,7 @@
zxio_dirent_iterator_destroy(&iterator);
}
if (zxio_init) {
- zxio_close(&io_storage.io);
+ zxio_close_new_transitional(&io_storage.io, /*should_wait=*/false);
}
}
@@ -79,7 +79,7 @@
struct os_dirent_impl* Next()
{
- zxio_dirent_t dirent = { .name = entry.d_name };
+ zxio_dirent_t dirent = {.name = entry.d_name};
zx_status_t status = zxio_dirent_iterator_next(&iterator, &dirent);
if (status != ZX_OK) {
if (status != ZX_ERR_NOT_FOUND)
@@ -87,7 +87,6 @@
return nullptr;
}
-
entry.d_ino = dirent.has.id ? dirent.id : OS_INO_UNKNOWN;
entry.d_name[dirent.name_length] = '\0';