Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/lib/librumpuser Fix return value inspection for clock_nanosl...



details:   https://anonhg.NetBSD.org/src/rev/537d857363d5
branches:  trunk
changeset: 339894:537d857363d5
user:      pooka <pooka%NetBSD.org@localhost>
date:      Sun Aug 16 11:05:06 2015 +0000

description:
Fix return value inspection for clock_nanosleep() (not displayed in the
diff, need to look at the entire file for context).

from Robert Millan <rmh%freebsd.org@localhost> via rumpkernel-users

diffstat:

 lib/librumpuser/rumpuser.c |  11 +++++------
 1 files changed, 5 insertions(+), 6 deletions(-)

diffs (34 lines):

diff -r 78ee258b758c -r 537d857363d5 lib/librumpuser/rumpuser.c
--- a/lib/librumpuser/rumpuser.c        Sun Aug 16 10:58:54 2015 +0000
+++ b/lib/librumpuser/rumpuser.c        Sun Aug 16 11:05:06 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: rumpuser.c,v 1.66 2015/07/27 07:31:00 pooka Exp $      */
+/*     $NetBSD: rumpuser.c,v 1.67 2015/08/16 11:05:06 pooka Exp $      */
 
 /*
  * Copyright (c) 2007-2010 Antti Kantee.  All Rights Reserved.
@@ -28,7 +28,7 @@
 #include "rumpuser_port.h"
 
 #if !defined(lint)
-__RCSID("$NetBSD: rumpuser.c,v 1.66 2015/07/27 07:31:00 pooka Exp $");
+__RCSID("$NetBSD: rumpuser.c,v 1.67 2015/08/16 11:05:06 pooka Exp $");
 #endif /* !lint */
 
 #include <sys/stat.h>
@@ -156,12 +156,11 @@
                                        tsr.tv_nsec += 1000*1000*1000;
                                }
                                rv = nanosleep(&tsr, NULL);
+                               if (rv == -1)
+                                       rv = errno;
                        }
 #endif
-               } while (rv == -1 && errno == EINTR);
-               if (rv == -1) {
-                       rv = errno;
-               }
+               } while (rv == EINTR);
                break;
        default:
                abort();



Home | Main Index | Thread Index | Old Index