Move DirectoryReader::ReadEntries to FileRef::ReadDirectoryEntries

native_client_sdk/src/libraries/nacl_io/mount_node_html5fs.cc

 /* Copyright (c) 2012 The Chromium Authors. All rights reserved.
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "nacl_io/mount_node_html5fs.h"
 
 #include <errno.h>
 #include <fcntl.h>
 #include <ppapi/c/pp_completion_callback.h>
+#include <ppapi/c/pp_directory_entry.h>
 #include <ppapi/c/pp_errors.h>
 #include <ppapi/c/pp_file_info.h>
 #include <ppapi/c/ppb_file_io.h>
 #include <string.h>
 #include <vector>
 #include "nacl_io/mount.h"
 #include "nacl_io/osdirent.h"
 #include "nacl_io/pepper_interface.h"
 #include "utils/auto_lock.h"
 
@@ skipping 47 matching lines @@
       fileio_resource_, PP_BlockUntilComplete());
   if (result != PP_OK) {
     errno = PPErrorToErrno(result);
     return -1;
   }
 
   return 0;
 }
 
 int MountNodeHtml5Fs::GetDents(size_t offs, struct dirent* pdir, size_t size) {
-  // The directory reader interface is a dev interface, if it doesn't exist,
-  // just fail.
-  if (!mount_->ppapi()->GetDirectoryReaderInterface()) {
-    errno = ENOSYS;
-    return -1;
-  }
-
   // If the buffer pointer is invalid, fail
   if (NULL == pdir) {
     errno = EINVAL;
     return -1;
   }
 
   // If the buffer is too small, fail
   if (size < sizeof(struct dirent)) {
     errno = EINVAL;
     return -1;
   }
 
-  ScopedResource directory_reader(
-      mount_->ppapi(),
-      mount_->ppapi()->GetDirectoryReaderInterface()->Create(
-          fileref_resource_));
-  if (!directory_reader.pp_resource()) {
-    errno = ENOSYS;
-    return -1;
-  }
-
   OutputBuffer output_buf = { NULL, 0 };
   PP_ArrayOutput output = { &GetOutputBuffer, &output_buf };
-  int32_t result = mount_->ppapi()->GetDirectoryReaderInterface()->ReadEntries(
-      directory_reader.pp_resource(), output,
-      PP_BlockUntilComplete());
+  int32_t result =
+      mount_->ppapi()->GetFileRefInterface()->ReadDirectoryEntries(
+          fileref_resource_, output, PP_BlockUntilComplete());
   if (result != PP_OK) {
     errno = PPErrorToErrno(result);
     return -1;
   }
 
   std::vector<struct dirent> dirents;
-  PP_DirectoryEntry_Dev* entries =
-      static_cast<PP_DirectoryEntry_Dev*>(output_buf.data);
+  PP_DirectoryEntry* entries =
+      static_cast<PP_DirectoryEntry*>(output_buf.data);
 
   for (int i = 0; i < output_buf.element_count; ++i) {
     PP_Var file_name_var = mount_->ppapi()->GetFileRefInterface()->GetName(
       entries[i].file_ref);
 
     // Release the file reference.
     mount_->ppapi()->ReleaseResource(entries[i].file_ref);
 
     if (file_name_var.type != PP_VARTYPE_STRING)
       continue;
@@ skipping 140 matching lines @@
   if (fileio_resource_) {
     mount_->ppapi()->GetFileIoInterface()->Close(fileio_resource_);
     mount_->ppapi()->ReleaseResource(fileio_resource_);
   }
 
   mount_->ppapi()->ReleaseResource(fileref_resource_);
   fileio_resource_ = 0;
   fileref_resource_ = 0;
   MountNode::Destroy();
 }