Fix failure

bin/fdutils_macos.cc

 // Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 #include <errno.h>
 #include <fcntl.h>
 #include <unistd.h>
 #include <sys/ioctl.h>
 
 #include "bin/fdutils.h"
@@ skipping 20 matching lines @@
   status = TEMP_FAILURE_RETRY(fcntl(fd, F_GETFL));
   if (status < 0) {
     perror("fcntl F_GETFL failed");
     return false;
   }
   *is_blocking = (status & O_NONBLOCK) == 0;
   return true;
 }
 
 
 intptr_t FDUtils::AvailableBytes(intptr_t fd) {

[Søren Gjesse, 2012/01/12 07:32:47]

I have it on my TODO list to change all these uses of intptr_t in system calls
to the types actually used in the .h files where the calls are declared.

[siva, 2012/01/12 19:30:50]

Ok.

On 2012/01/12 07:32:47, Søren Gjesse wrote:

-  size_t available;
+  int32_t available;

[Søren Gjesse, 2012/01/12 07:32:47]

Shouldn't we just use int here as that is what is specified on the ioctl_list
man page?

[siva, 2012/01/12 19:30:50]

I would prefer int32_t as opposed to int as it makes it clear that we are
dealing with a 32 bit quantity here.
But I agree you are worried if the kernel has a different interpretation of
'int' from 'int32_t' this would break again.
Changed to use 'int'


On 2012/01/12 07:32:47, Søren Gjesse wrote:

   int result = TEMP_FAILURE_RETRY(ioctl(fd, FIONREAD, &available));
   if (result < 0) {
     return result;
   }
-  return available;
+  return static_cast<intptr_t>(available);
 }
 
 
 ssize_t FDUtils::ReadFromBlocking(int fd, void* buffer, size_t count) {
 #ifdef DEBUG
   bool is_blocking = false;
   ASSERT(FDUtils::IsBlocking(fd, &is_blocking));
   ASSERT(is_blocking);
 #endif
   size_t remaining = count;
@@ skipping 38 matching lines @@
       ASSERT(errno != EWOULDBLOCK);
       return -1;
     } else {
       ASSERT(bytes_written > 0);
       remaining -= bytes_written;
       buffer_pos += bytes_written;
     }
   }
   return count;
 }