tty.c in libuv-4.0.1

- old
+ new

@@ -104,11 +104,11 @@
    * That restriction also applies to character devices like /dev/random
    * (but obviously not /dev/tty.)
    */
   type = uv_guess_handle(fd);
   if (type == UV_FILE || type == UV_UNKNOWN_HANDLE)
-    return -EINVAL;
+    return UV_EINVAL;
 
   flags = 0;
   newfd = -1;
 
   /* Reopen the file descriptor when it refers to a tty. This lets us put the
@@ -140,11 +140,11 @@
     }
 
     newfd = r;
 
     r = uv__dup2_cloexec(newfd, fd);
-    if (r < 0 && r != -EINVAL) {
+    if (r < 0 && r != UV_EINVAL) {
       /* EINVAL means newfd == fd which could conceivably happen if another
        * thread called close(fd) between our calls to isatty() and open().
        * That's a rather unlikely event but let's handle it anyway.
        */
       uv__close(newfd);
@@ -161,11 +161,11 @@
   while (saved_flags == -1 && errno == EINTR);
 
   if (saved_flags == -1) {
     if (newfd != -1)
       uv__close(newfd);
-    return -errno;
+    return UV__ERR(errno);
   }
 #endif
 
   /* Pacify the compiler. */
   (void) &saved_flags;
@@ -232,11 +232,11 @@
     return 0;
 
   fd = uv__stream_fd(tty);
   if (tty->mode == UV_TTY_MODE_NORMAL && mode != UV_TTY_MODE_NORMAL) {
     if (tcgetattr(fd, &tty->orig_termios))
-      return -errno;
+      return UV__ERR(errno);
 
     /* This is used for uv_tty_reset_mode() */
     uv_spinlock_lock(&termios_spinlock);
     if (orig_termios_fd == -1) {
       orig_termios = tty->orig_termios;
@@ -262,11 +262,11 @@
       break;
   }
 
   /* Apply changes after draining */
   if (tcsetattr(fd, TCSADRAIN, &tmp))
-    return -errno;
+    return UV__ERR(errno);
 
   tty->mode = mode;
   return 0;
 }
 
@@ -278,11 +278,11 @@
   do
     err = ioctl(uv__stream_fd(tty), TIOCGWINSZ, &ws);
   while (err == -1 && errno == EINTR);
 
   if (err == -1)
-    return -errno;
+    return UV__ERR(errno);
 
   *width = ws.ws_col;
   *height = ws.ws_row;
 
   return 0;
@@ -356,15 +356,15 @@
   int saved_errno;
   int err;
 
   saved_errno = errno;
   if (!uv_spinlock_trylock(&termios_spinlock))
-    return -EBUSY;  /* In uv_tty_set_mode(). */
+    return UV_EBUSY;  /* In uv_tty_set_mode(). */
 
   err = 0;
   if (orig_termios_fd != -1)
     if (tcsetattr(orig_termios_fd, TCSANOW, &orig_termios))
-      err = -errno;
+      err = UV__ERR(errno);
 
   uv_spinlock_unlock(&termios_spinlock);
   errno = saved_errno;
 
   return err;