Module Name:    src
Committed By:   martin
Date:           Sat Jun 23 11:01:14 UTC 2018

Modified Files:
        src/lib/libc/sys [netbsd-8]: sched.c

Log Message:
Pull up following revision(s) (requested by maya in ticket #892):

        lib/libc/sys/sched.c: revision 1.5

PR/52826: Onno van der Linden: Return PRI_NONE for sched_get_priority_m{in,ax}
and SCHED_OTHER.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.4.24.1 src/lib/libc/sys/sched.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/lib/libc/sys/sched.c
diff -u src/lib/libc/sys/sched.c:1.4 src/lib/libc/sys/sched.c:1.4.24.1
--- src/lib/libc/sys/sched.c:1.4	Sun Mar 18 02:04:39 2012
+++ src/lib/libc/sys/sched.c	Sat Jun 23 11:01:14 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: sched.c,v 1.4 2012/03/18 02:04:39 christos Exp $	*/
+/*	$NetBSD: sched.c,v 1.4.24.1 2018/06/23 11:01:14 martin Exp $	*/
 
 /*
  * Copyright (c) 2008, Mindaugas Rasiukevicius <rmind at NetBSD org>
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__RCSID("$NetBSD: sched.c,v 1.4 2012/03/18 02:04:39 christos Exp $");
+__RCSID("$NetBSD: sched.c,v 1.4.24.1 2018/06/23 11:01:14 martin Exp $");
 
 #include <string.h>
 #include <unistd.h>
@@ -101,22 +101,32 @@ int
 sched_get_priority_max(int policy)
 {
 
-	if (policy < SCHED_OTHER || policy > SCHED_RR) {
+	switch (policy) {
+	case SCHED_OTHER:
+		return PRI_NONE;
+	case SCHED_RR:
+	case SCHED_FIFO:
+		return (int)sysconf(_SC_SCHED_PRI_MAX);
+	default:
 		errno = EINVAL;
 		return -1;
 	}
-	return (int)sysconf(_SC_SCHED_PRI_MAX);
 }
 
 int
 sched_get_priority_min(int policy)
 {
 
-	if (policy < SCHED_OTHER || policy > SCHED_RR) {
+	switch (policy) {
+	case SCHED_OTHER:
+		return PRI_NONE;
+	case SCHED_RR:
+	case SCHED_FIFO:
+		return (int)sysconf(_SC_SCHED_PRI_MIN);
+	default:
 		errno = EINVAL;
 		return -1;
 	}
-	return (int)sysconf(_SC_SCHED_PRI_MIN);
 }
 
 int

Reply via email to