[newlib-cygwin] Cygwin: minor cleanups

Corinna Vinschen corinna@sourceware.org
Sun Jan 13 22:16:00 GMT 2019


https://sourceware.org/git/gitweb.cgi?p=newlib-cygwin.git;h=7f601990327861fdcacadf5985c2ef5161cb2554

commit 7f601990327861fdcacadf5985c2ef5161cb2554
Author: Corinna Vinschen <corinna@vinschen.de>
Date:   Sun Jan 13 22:48:43 2019 +0100

    Cygwin: minor cleanups
    
    Signed-off-by: Corinna Vinschen <corinna@vinschen.de>

Diff:
---
 winsup/cygwin/fhandler.h | 3 +--
 winsup/cygwin/net.cc     | 2 +-
 winsup/cygwin/signal.cc  | 7 ++++---
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/winsup/cygwin/fhandler.h b/winsup/cygwin/fhandler.h
index 7e46070..ec111de 100644
--- a/winsup/cygwin/fhandler.h
+++ b/winsup/cygwin/fhandler.h
@@ -2610,14 +2610,13 @@ class fhandler_procnet: public fhandler_proc
   pid_t pid;
  public:
   fhandler_procnet ();
+  fhandler_procnet (void *) {}
   virtual_ftype_t exists();
   int __reg3 readdir (DIR *, dirent *);
   int open (int flags, mode_t mode = 0);
   int __reg2 fstat (struct stat *buf);
   bool fill_filebuf ();
 
-  fhandler_procnet (void *) {}
-
   void copyto (fhandler_base *x)
   {
     x->pc.free_strings ();
diff --git a/winsup/cygwin/net.cc b/winsup/cygwin/net.cc
index 4494bf7..cfd29d1 100644
--- a/winsup/cygwin/net.cc
+++ b/winsup/cygwin/net.cc
@@ -61,7 +61,7 @@ get (const int fd)
   cygheap_fdget cfd (fd);
 
   if (cfd < 0)
-    return 0;
+    return NULL;
 
   fhandler_socket *const fh = cfd->is_socket ();
 
diff --git a/winsup/cygwin/signal.cc b/winsup/cygwin/signal.cc
index 74d6eb6..c5e9d01 100644
--- a/winsup/cygwin/signal.cc
+++ b/winsup/cygwin/signal.cc
@@ -635,9 +635,10 @@ sigwait_common (const sigset_t *set, siginfo_t *info, PLARGE_INTEGER waittime)
 	  break;
 	}
     }
-  __except (EFAULT) {
-    res = -1;
-  }
+  __except (EFAULT)
+    {
+      res = -1;
+    }
   __endtry
   sigproc_printf ("returning signal %d", res);
   return res;



More information about the Cygwin-cvs mailing list