PERFORCE change 79869 for review

Robert Watson rwatson at FreeBSD.org
Sat Jul 9 22:14:36 GMT 2005


http://perforce.freebsd.org/chv.cgi?CH=79869

Change 79869 by rwatson at rwatson_zoo on 2005/07/09 22:14:00

	Style restoration.

Affected files ...

.. //depot/projects/trustedbsd/sebsd/sys/dev/an/if_an.c#11 edit
.. //depot/projects/trustedbsd/sebsd/sys/dev/ata/atapi-cd.c#12 edit
.. //depot/projects/trustedbsd/sebsd/sys/dev/kbd/kbd.c#11 edit
.. //depot/projects/trustedbsd/sebsd/sys/dev/null/null.c#11 edit
.. //depot/projects/trustedbsd/sebsd/sys/dev/ofw/ofw_console.c#9 edit
.. //depot/projects/trustedbsd/sebsd/sys/dev/wl/if_wl.c#12 edit

Differences ...

==== //depot/projects/trustedbsd/sebsd/sys/dev/an/if_an.c#11 (text+ko) ====

@@ -1978,7 +1978,7 @@
 			break;
 #ifdef ANCACHE
 		if (sc->areq.an_type == AN_RID_ZERO_CACHE) {
-			error = cap_check (td, CAP_NET_ADMIN);
+			error = cap_check(td, CAP_NET_ADMIN);
 			if (error)
 				break;
 			sc->an_sigitems = sc->an_nextitem = 0;

==== //depot/projects/trustedbsd/sebsd/sys/dev/ata/atapi-cd.c#12 (text+ko) ====

@@ -261,7 +261,7 @@
 	break;
 
     case CDIOCRESET:
-	error = cap_check (td, CAP_SYS_ADMIN);
+	error = cap_check(td, CAP_SYS_ADMIN);
 	if (error)
 	    break;
 	error = acd_test_ready(dev);

==== //depot/projects/trustedbsd/sebsd/sys/dev/kbd/kbd.c#11 (text+ko) ====

@@ -935,9 +935,9 @@
 	if (keymap_restrict_change >= 2) {
 		for (i = 0; i < NUM_STATES; i++)
 			if (oldkey->map[i] != newkey->map[i])
-				return cap_check (td, CAP_SYS_ADMIN);
+				return cap_check(td, CAP_SYS_ADMIN);
 		if (oldkey->spcl != newkey->spcl)
-			return cap_check (td, CAP_SYS_ADMIN);
+			return cap_check(td, CAP_SYS_ADMIN);
 		if (oldkey->flgs != newkey->flgs)
 			return cap_check(td, CAP_SYS_ADMIN);
 		return (0);
@@ -954,7 +954,7 @@
 		if ((oldkey->spcl & (0x80 >> i)) == (newkey->spcl & (0x80 >> i))
 		    && oldkey->map[i] == newkey->map[i])
 			continue;
-		return cap_check (td, CAP_SYS_ADMIN);
+		return cap_check(td, CAP_SYS_ADMIN);
 	}
 
 	return (0);
@@ -983,13 +983,13 @@
 		return (0);
 
 	if (oldmap->n_accs != newmap->n_accs)
-		return cap_check (td, CAP_SYS_ADMIN);
+		return cap_check(td, CAP_SYS_ADMIN);
 
 	for (accent = 0; accent < oldmap->n_accs; accent++) {
 		oldacc = &oldmap->acc[accent];
 		newacc = &newmap->acc[accent];
 		if (oldacc->accchar != newacc->accchar)
-			return cap_check (td, CAP_SYS_ADMIN);
+			return cap_check(td, CAP_SYS_ADMIN);
 		for (i = 0; i < NUM_ACCENTCHARS; ++i) {
 			if (oldacc->map[i][0] != newacc->map[i][0])
 				return cap_check(td, CAP_SYS_ADMIN);

==== //depot/projects/trustedbsd/sebsd/sys/dev/null/null.c#11 (text+ko) ====

@@ -88,7 +88,7 @@
 
 	if (cmd != DIOCSKERNELDUMP)
 		return (ENOIOCTL);
-	error = cap_check (td, CAP_SYS_ADMIN);
+	error = cap_check(td, CAP_SYS_ADMIN);
 	if (error)
 		return (error);
 	return (set_dumper(NULL));

==== //depot/projects/trustedbsd/sebsd/sys/dev/ofw/ofw_console.c#9 (text+ko) ====

@@ -143,7 +143,8 @@
 		ttsetwater(tp);
 
 		setuptimeout = 1;
-	} else if ((tp->t_state & TS_XCLUDE) && cap_check (td, CAP_SYS_TTY_CONFIG)) {
+	} else if ((tp->t_state & TS_XCLUDE) && cap_check(td,
+	    CAP_SYS_TTY_CONFIG)) {
 		return (EBUSY);
 	}
 

==== //depot/projects/trustedbsd/sebsd/sys/dev/wl/if_wl.c#12 (text+ko) ====

@@ -1327,7 +1327,7 @@
 	/* copy the PSA in from the caller; we only copy _some_ values */
     case SIOCSWLPSA:
 	/* root only */
-	if ((error = cap_check (td, CAP_NET_ADMIN)))
+	if ((error = cap_check(td, CAP_NET_ADMIN)))
 	    break;
 	error = EINVAL;	/* assume the worst */
 	/* pointer to buffer in user space containing data */
To Unsubscribe: send mail to majordomo at trustedbsd.org
with "unsubscribe trustedbsd-cvs" in the body of the message



More information about the trustedbsd-cvs mailing list