Mercurial > jdk8-mips64-public > hotspot / file diff

     1.1 --- a/src/os/windows/vm/os_windows.cpp	Tue Apr 30 14:49:19 2019 +0200
     1.2 +++ b/src/os/windows/vm/os_windows.cpp	Mon Jun 17 16:41:38 2019 +0100
     1.3 @@ -1172,14 +1172,12 @@
     1.4      return dirp;
     1.5  }
     1.6  
     1.7 -/* parameter dbuf unused on Windows */
     1.8 -
     1.9  struct dirent *
    1.10 -os::readdir(DIR *dirp, dirent *dbuf)
    1.11 +os::readdir(DIR *dirp)
    1.12  {
    1.13      assert(dirp != NULL, "just checking");      // hotspot change
    1.14      if (dirp->handle == INVALID_HANDLE_VALUE) {
    1.15 -        return 0;
    1.16 +        return NULL;
    1.17      }
    1.18  
    1.19      strcpy(dirp->dirent.d_name, dirp->find_data.cFileName);
    1.20 @@ -1187,7 +1185,7 @@
    1.21      if (!FindNextFile(dirp->handle, &dirp->find_data)) {
    1.22          if (GetLastError() == ERROR_INVALID_HANDLE) {
    1.23              errno = EBADF;
    1.24 -            return 0;
    1.25 +            return NULL;
    1.26          }
    1.27          FindClose(dirp->handle);
    1.28          dirp->handle = INVALID_HANDLE_VALUE;