kern/99183: [PATCH] Gvinum stylefix

[Ulf Lilleengen]

>Number:         99183
>Category:       kern
>Synopsis:       [PATCH] Gvinum stylefix
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Mon Jun 19 17:40:17 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator:     Ulf Lilleengen
>Release:        FreeBSD 7.0-CURRENT i386
>Organization:
>Environment:
System: FreeBSD vimes.studby.ntnu.no 7.0-CURRENT FreeBSD 7.0-CURRENT #6: Fri Jun 2 20:19:30 CEST 2006 lulf at vimes.studby.ntnu.no:/usr/obj/usr/src/sys/VIMES i386


	
>Description:
	I'm starting to submit some of the patches i have in my perforce
	repository lulf_gvinum now.
	Starting with this.
	Style fixes for gvinum.
>How-To-Repeat:
	
>Fix:

	

--- gvinum_stylefix.diff begins here ---
--- //depot/vendor/freebsd/src/sys/geom/vinum/geom_vinum_share.c	2004/11/15 12:35:32
+++ //depot/user/lulf/gvinum/src/sys/geom/vinum/geom_vinum_share.c	2006/05/27 12:39:37
@@ -91,7 +91,7 @@
 
 		/* End of line. */
 		if ((*cptr == '\0') || (*cptr == '\n') || (*cptr == '#'))
-			return tokennr;
+			return (tokennr);
 
 		delim = *cptr;
 		token[tokennr] = cptr;		/* Point to it. */
@@ -99,7 +99,7 @@
 
 		/* Run off the end? */
 		if (tokennr == maxtoken)
-			return tokennr;
+			return (tokennr);
 
 		/* Quoted? */
 		if ((delim == '\'') || (delim == '"')) {
@@ -112,14 +112,14 @@
 
 					/* Space after closing quote needed. */
 					if (!iswhite(*cptr))
-						return -1;
+						return (-1);
 
 					/* Delimit. */
 					*cptr++ = '\0';
 
 				/* End-of-line? */
 				} else if ((*cptr == '\0') || (*cptr == '\n'))
-					return -1;
+					return (-1);
 			}
 
 		/* Not quoted. */
@@ -136,7 +136,7 @@
 	}
 
 	/* Can't get here. */
-	return maxtoken;
+	return (maxtoken);
 }
 
 
@@ -181,25 +181,25 @@
 
 			switch (*s) {
 			case '\0':
-				return size * sign;
+				return (size * sign);
 			
 			case 'B':
 			case 'b':
 			case 'S':
 			case 's':
-				return size * sign * 512;
+				return (size * sign * 512);
 			
 			case 'K':
 			case 'k':
-				return size * sign * 1024;
+				return (size * sign * 1024);
 			
 			case 'M':
 			case 'm':
-				return size * sign * 1024 * 1024;
+				return (size * sign * 1024 * 1024);
 			
 			case 'G':
 			case 'g':
-				return size * sign * 1024 * 1024 * 1024;
+				return (size * sign * 1024 * 1024 * 1024);
 			}
 		}
 	}
@@ -212,11 +212,11 @@
 {
 	switch (state) {
 	case GV_DRIVE_DOWN:
-		return "down";
+		return ("down");
 	case GV_DRIVE_UP:
-		return "up";
+		return ("up");
 	default:
-		return "??";
+		return ("??");
 	}
 }
 
@@ -249,17 +249,17 @@
 {
 	switch (state) {
 	case GV_SD_INITIALIZING:
-		return "initializing";
+		return ("initializing");
 	case GV_SD_STALE:
-		return "stale";
+		return ("stale");
 	case GV_SD_DOWN:
-		return "down";
+		return ("down");
 	case GV_SD_REVIVING:
-		return "reviving";
+		return ("reviving");
 	case GV_SD_UP:
-		return "up";
+		return ("up");
 	default:
-		return "??";
+		return ("??");
 	}
 }
 
@@ -283,15 +283,15 @@
 {
 	switch (state) {
 	case GV_PLEX_DOWN:
-		return "down";
+		return ("down");
 	case GV_PLEX_INITIALIZING:
-		return "initializing";
+		return ("initializing");
 	case GV_PLEX_DEGRADED:
-		return "degraded";
+		return ("degraded");
 	case GV_PLEX_UP:
-		return "up";
+		return ("up");
 	default:
-		return "??";
+		return ("??");
 	}
 }
 
@@ -323,11 +323,11 @@
 {
 	switch (state) {
 	case GV_VOL_UP:
-		return "up";
+		return ("up");
 	case GV_VOL_DOWN:
-		return "down";
+		return ("down");
 	default:
-		return "??";
+		return ("??");
 	}
 }
 
@@ -337,15 +337,15 @@
 {
 	switch (org) {
 	case GV_PLEX_DISORG:
-		return "??";
+		return ("??");
 	case GV_PLEX_CONCAT:
-		return "concat";
+		return ("concat");
 	case GV_PLEX_STRIPED:
-		return "striped";
+		return ("striped");
 	case GV_PLEX_RAID5:
-		return "raid5";
+		return ("raid5");
 	default:
-		return "??";
+		return ("??");
 	}
 }
 
@@ -354,15 +354,15 @@
 {
 	switch (org) {
 	case GV_PLEX_DISORG:
-		return "??";
+		return ("??");
 	case GV_PLEX_CONCAT:
-		return "C";
+		return ("C");
 	case GV_PLEX_STRIPED:
-		return "S";
+		return ("S");
 	case GV_PLEX_RAID5:
-		return "R5";
+		return ("R5");
 	default:
-		return "??";
+		return ("??");
 	}
 }
 
@@ -557,14 +557,14 @@
 	int j, errors;
 
 	if (token[1] == NULL || *token[1] == '\0')
-		return NULL;
+		return (NULL);
 
 #ifdef _KERNEL
 	s = g_malloc(sizeof(struct gv_sd), M_WAITOK | M_ZERO);
 #else
 	s = malloc(sizeof(struct gv_sd));
 	if (s == NULL)
-		return NULL;
+		return (NULL);
 	bzero(s, sizeof(struct gv_sd));
 #endif
 
--- gvinum_stylefix.diff ends here ---


>Release-Note:
>Audit-Trail:
>Unformatted: