From 7f601990327861fdcacadf5985c2ef5161cb2554 Mon Sep 17 00:00:00 2001
From: Corinna Vinschen <corinna@vinschen.de>
Date: Sun, 13 Jan 2019 22:48:43 +0100
Subject: [PATCH] Cygwin: minor cleanups
Signed-off-by: Corinna Vinschen <corinna@vinschen.de>
---
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 7e460701c..ec111de36 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 4494bf71c..cfd29d191 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 74d6eb675..c5e9d017e 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;