summaryrefslogtreecommitdiffstats
path: root/lib/libc/gen/setmode.c
diff options
context:
space:
mode:
authorobrien <obrien@FreeBSD.org>2002-02-01 01:32:19 +0000
committerobrien <obrien@FreeBSD.org>2002-02-01 01:32:19 +0000
commitb45ff0fb569a631733b0fe8174ef6bd2e76d6523 (patch)
tree00d3cf581cd6698c5f1022d99c44cb5d6fa3bd12 /lib/libc/gen/setmode.c
parent821a3b87a652fabbbe0c63b418858e7bc7a1537b (diff)
downloadFreeBSD-src-b45ff0fb569a631733b0fe8174ef6bd2e76d6523.zip
FreeBSD-src-b45ff0fb569a631733b0fe8174ef6bd2e76d6523.tar.gz
* Remove __P and convert to ANSI prototypes.
* Remove 'register'. (some functions had 7+ register functions...) * Fix SCM ID's.
Diffstat (limited to 'lib/libc/gen/setmode.c')
-rw-r--r--lib/libc/gen/setmode.c36
1 files changed, 17 insertions, 19 deletions
diff --git a/lib/libc/gen/setmode.c b/lib/libc/gen/setmode.c
index f05607f..de8dd29 100644
--- a/lib/libc/gen/setmode.c
+++ b/lib/libc/gen/setmode.c
@@ -35,12 +35,10 @@
*/
#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
static char sccsid[] = "@(#)setmode.c 8.2 (Berkeley) 3/25/94";
-#endif
-static const char rcsid[] =
- "$FreeBSD$";
#endif /* LIBC_SCCS and not lint */
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
#include "namespace.h"
#include <sys/types.h>
@@ -71,10 +69,10 @@ typedef struct bitcmd {
#define CMD2_OBITS 0x08
#define CMD2_UBITS 0x10
-static BITCMD *addcmd __P((BITCMD *, int, int, int, u_int));
-static void compress_mode __P((BITCMD *));
+static BITCMD *addcmd(BITCMD *, int, int, int, u_int);
+static void compress_mode(BITCMD *);
#ifdef SETMODE_DEBUG
-static void dumpmode __P((BITCMD *));
+static void dumpmode(BITCMD *);
#endif
/*
@@ -88,8 +86,8 @@ getmode(bbox, omode)
void *bbox;
mode_t omode;
{
- register BITCMD *set;
- register mode_t clrval, newmode, value;
+ BITCMD *set;
+ mode_t clrval, newmode, value;
set = (BITCMD *)bbox;
newmode = omode;
@@ -155,7 +153,7 @@ common: if (set->cmd2 & CMD2_CLR) {
#define ADDCMD(a, b, c, d) \
if (set >= endset) { \
- register BITCMD *newset; \
+ BITCMD *newset; \
setlen += SET_LEN_INCR; \
newset = realloc(saveset, sizeof(BITCMD) * setlen); \
if (!saveset) \
@@ -170,10 +168,10 @@ common: if (set->cmd2 & CMD2_CLR) {
void *
setmode(p)
- register char *p;
+ char *p;
{
- register int perm, who;
- register char op;
+ int perm, who;
+ char op;
BITCMD *set, *saveset, *endset;
sigset_t sigset, sigoset;
mode_t mask;
@@ -341,8 +339,8 @@ apply: if (!*p)
static BITCMD *
addcmd(set, op, who, oparg, mask)
BITCMD *set;
- register int oparg, who;
- register int op;
+ int oparg, who;
+ int op;
u_int mask;
{
switch (op) {
@@ -388,7 +386,7 @@ addcmd(set, op, who, oparg, mask)
#ifdef SETMODE_DEBUG
static void
dumpmode(set)
- register BITCMD *set;
+ BITCMD *set;
{
for (; set->cmd; ++set)
(void)printf("cmd: '%c' bits %04o%s%s%s%s%s%s\n",
@@ -409,10 +407,10 @@ dumpmode(set)
*/
static void
compress_mode(set)
- register BITCMD *set;
+ BITCMD *set;
{
- register BITCMD *nset;
- register int setbits, clrbits, Xbits, op;
+ BITCMD *nset;
+ int setbits, clrbits, Xbits, op;
for (nset = set;;) {
/* Copy over any 'u', 'g' and 'o' commands. */
OpenPOWER on IntegriCloud