Address review comments

wasmx · Oct 1, 2020 · 5b00158 · 5b00158
1 parent 80da950
commit 5b00158
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 7 deletions.
diff --git a/cmake/ProjectUVWASI.cmake b/cmake/ProjectUVWASI.cmake
@@ -27,7 +27,6 @@ ExternalProject_Add(uvwasi
     URL_HASH SHA256=39135f4dd4a44013399ceed7166391ffc5c09655e4bfbf851da2be039e6985df
     CMAKE_ARGS
     -DCMAKE_INSTALL_PREFIX=<INSTALL_DIR>
-    -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}
     -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}
     -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
     -DUVWASI_DEBUG_LOG=OFF

diff --git a/tools/wasi/wasi.cpp b/tools/wasi/wasi.cpp
@@ -40,8 +40,8 @@ fizzy::ExecutionResult wasi_fd_write(
 
     std::vector<uvwasi_ciovec_t> iovs(iov_cnt);
     // TODO: not sure what to pass as end, passing memory size...
-    uvwasi_errno_t ret = uvwasi_serdes_readv_ciovec_t(instance.memory->data(),
-        instance.memory->size(), iov_ptr, iovs.data(), static_cast<uvwasi_size_t>(iovs.size()));
+    uvwasi_errno_t ret = uvwasi_serdes_readv_ciovec_t(
+        instance.memory->data(), instance.memory->size(), iov_ptr, iovs.data(), iov_cnt);
     if (ret != UVWASI_ESUCCESS)
         return fizzy::Value{uint32_t{ret}};
 
@@ -62,14 +62,13 @@ fizzy::ExecutionResult wasi_fd_read(
 
     std::vector<uvwasi_iovec_t> iovs(iov_cnt);
     // TODO: not sure what to pass as end, passing memory size...
-    uvwasi_errno_t ret = uvwasi_serdes_readv_iovec_t(instance.memory->data(),
-        instance.memory->size(), iov_ptr, iovs.data(), static_cast<uvwasi_size_t>(iovs.size()));
+    uvwasi_errno_t ret = uvwasi_serdes_readv_iovec_t(
+        instance.memory->data(), instance.memory->size(), iov_ptr, iovs.data(), iov_cnt);
     if (ret != UVWASI_ESUCCESS)
         return fizzy::Value{uint32_t{ret}};
 
     uvwasi_size_t nread;
-    ret = uvwasi_fd_read(&state, static_cast<uvwasi_fd_t>(fd), iovs.data(),
-        static_cast<uvwasi_size_t>(iovs.size()), &nread);
+    ret = uvwasi_fd_read(&state, static_cast<uvwasi_fd_t>(fd), iovs.data(), iov_cnt, &nread);
     uvwasi_serdes_write_uint32_t(instance.memory->data(), nread_ptr, nread);
 
     return fizzy::Value{uint32_t{ret}};