public inbox for cygwin-cvs@sourceware.org
help / color / mirror / Atom feed
From: Corinna Vinschen <corinna@sourceware.org>
To: cygwin-cvs@sourceware.org
Subject: [newlib-cygwin] Cygwin: minor cleanups
Date: Sun, 13 Jan 2019 22:16:00 -0000	[thread overview]
Message-ID: <20190113221618.109415.qmail@sourceware.org> (raw)

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;


                 reply	other threads:[~2019-01-13 22:16 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20190113221618.109415.qmail@sourceware.org \
    --to=corinna@sourceware.org \
    --cc=cygwin-cvs@sourceware.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).