o Add $FreeBSD$ as a rcsid instead of in a comment

o  Remove bitrotted #undef directives
o  Actually set errno now and order the functions

Submitted by: bde

1 files changed, 28 insertions, 31 deletions

diff --git a/lib/libc/gen/sigsetops.c b/lib/libc/gen/sigsetops.c
index 7206b7a..ffba20c 100644
--- a/lib/libc/gen/sigsetops.c
+++ b/lib/libc/gen/sigsetops.c
@@ -31,69 +31,66 @@
  * SUCH DAMAGE.
  *
  *	@(#)sigsetops.c	8.1 (Berkeley) 6/4/93
- *
- * $FreeBSD$
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
+#if 0
 static char sccsid[] = "@(#)sigsetops.c	8.1 (Berkeley) 6/4/93";
+#endif
+static const char rcsid[] =
+  "$FreeBSD$";
 #endif /* LIBC_SCCS and not lint */
 
+#include <errno.h>
 #include <signal.h>
 
-#undef sigemptyset
-#undef sigfillset
-#undef sigaddset
-#undef sigdelset
-#undef sigismember
-
 int
-sigemptyset(set)
+sigaddset(set, signo)
 	sigset_t *set;
+	int signo;
 {
-	int i;
 
-	for (i = 0; i < _SIG_WORDS; i++)
-		set->__bits[i] = 0;
+	if (signo <= 0 || signo > _SIG_MAXSIG) {
+		errno = EINVAL;
+		return (-1);
+	}
+	set->__bits[_SIG_WORD(signo)] |= _SIG_BIT(signo);
 	return (0);
 }
 
 int
-sigfillset(set)
+sigdelset(set, signo)
 	sigset_t *set;
+	int signo;
 {
-	int i;
 
-	for (i = 0; i < _SIG_WORDS; i++)
-		set->__bits[i] = ~(unsigned int)0;
+	if (signo <= 0 || signo > _SIG_MAXSIG) {
+		errno = EINVAL;
+		return (-1);
+	}
+	set->__bits[_SIG_WORD(signo)] &= ~_SIG_BIT(signo);
 	return (0);
 }
 
 int
-sigaddset(set, signo)
+sigemptyset(set)
 	sigset_t *set;
-	int signo;
 {
+	int i;
 
-	if (signo <= 0 || signo > _SIG_MAXSIG) {
-		/* errno = EINVAL; */
-		return (-1);
-	}
-	set->__bits[_SIG_WORD(signo)] |= _SIG_BIT(signo);
+	for (i = 0; i < _SIG_WORDS; i++)
+		set->__bits[i] = 0;
 	return (0);
 }
 
 int
-sigdelset(set, signo)
+sigfillset(set)
 	sigset_t *set;
-	int signo;
 {
+	int i;
 
-	if (signo <= 0 || signo > _SIG_MAXSIG) {
-		/* errno = EINVAL; */
-		return (-1);
-	}
-	set->__bits[_SIG_WORD(signo)] &= ~_SIG_BIT(signo);
+	for (i = 0; i < _SIG_WORDS; i++)
+		set->__bits[i] = ~0U;
 	return (0);
 }
 
@@ -104,7 +101,7 @@ sigismember(set, signo)
 {
 
 	if (signo <= 0 || signo > _SIG_MAXSIG) {
-		/* errno = EINVAL; */
+		errno = EINVAL;
 		return (-1);
 	}
 	return ((set->__bits[_SIG_WORD(signo)] & _SIG_BIT(signo)) ? 1 : 0);