PERFORCE change 78614 for review

[Robert Watson]

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

Change 78614 by rwatson at rwatson_paprika on 2005/06/16 10:55:50

	Remove gratuitous white space differences from FreeBSD in prepartion
	for merge to Darwin.

Affected files ...

.. //depot/projects/trustedbsd/sedarwin7/src/darwin/xnu/bsd/kern/subr_sbuf.c#2 edit

Differences ...

==== //depot/projects/trustedbsd/sedarwin7/src/darwin/xnu/bsd/kern/subr_sbuf.c#2 (text+ko) ====

@@ -58,7 +58,7 @@
 #define	SBMALLOC(size)		malloc(size)
 #define	SBFREE(buf)		free(buf)
 #define	min(x,y)		MIN(x,y)
-	
+
 #endif /* KERNEL */
 
 /*
@@ -247,7 +247,7 @@
 {
 	assert_sbuf_integrity(s);
 	assert_sbuf_state(s, 0);
-	
+
 	KASSERT(pos >= 0,
 	    ("attempt to seek to a negative position (%d)", pos));
 	KASSERT(pos < s->s_size,
@@ -267,10 +267,10 @@
 {
 	assert_sbuf_integrity(s);
 	assert_sbuf_state(s, 0);
-	
+
 	if (SBUF_HASOVERFLOWED(s))
 		return (-1);
-	
+
 	for (; len; len--) {
 		if (!SBUF_HASROOM(s) && sbuf_extend(s, len) < 0)
 			break;
@@ -305,7 +305,7 @@
 	if (copyin(uaddr, s->s_buf + s->s_len, len) != 0)
 		return (-1);
 	s->s_len += len;
-	
+
 	return (0);
 }
 #endif
@@ -318,7 +318,7 @@
 {
 	assert_sbuf_integrity(s);
 	assert_sbuf_state(s, 0);
-	
+
 	sbuf_clear(s);
 	return (sbuf_bcat(s, str, len));
 }
@@ -331,10 +331,10 @@
 {
 	assert_sbuf_integrity(s);
 	assert_sbuf_state(s, 0);
-	
+
 	if (SBUF_HASOVERFLOWED(s))
 		return (-1);
-	
+
 	while (*str) {
 		if (!SBUF_HASROOM(s) && sbuf_extend(s, strlen(str)) < 0)
 			break;
@@ -355,7 +355,7 @@
 sbuf_copyin(struct sbuf *s, const void *uaddr, size_t len)
 {
 	size_t done;
-	
+
 	assert_sbuf_integrity(s);
 	assert_sbuf_state(s, 0);
 
@@ -378,7 +378,7 @@
 	default:
 		return (-1);	/* XXX */
 	}
-	
+
 	return (0);
 }
 #endif
@@ -391,7 +391,7 @@
 {
 	assert_sbuf_integrity(s);
 	assert_sbuf_state(s, 0);
-	
+
 	sbuf_clear(s);
 	return (sbuf_cat(s, str));
 }
@@ -466,10 +466,10 @@
 {
 	assert_sbuf_integrity(s);
 	assert_sbuf_state(s, 0);
-	
+
 	if (SBUF_HASOVERFLOWED(s))
 		return (-1);
-	
+
 	if (!SBUF_HASROOM(s) && sbuf_extend(s, 1) < 0) {
 		SBUF_SETFLAG(s, SBUF_OVERFLOWED);
 		return (-1);
@@ -492,10 +492,10 @@
 {
 	assert_sbuf_integrity(s);
 	assert_sbuf_state(s, 0);
-	
+
 	if (SBUF_HASOVERFLOWED(s))
 		return (-1);
-	
+
 	while (s->s_len && isspace(s->s_buf[s->s_len-1]))
 		--s->s_len;
 
@@ -519,7 +519,7 @@
 {
 	assert_sbuf_integrity(s);
 	assert_sbuf_state(s, 0);
-	
+
 	s->s_buf[s->s_len] = '\0';
 	SBUF_CLEARFLAG(s, SBUF_OVERFLOWED);
 	SBUF_SETFLAG(s, SBUF_FINISHED);
@@ -533,7 +533,7 @@
 {
 	assert_sbuf_integrity(s);
 	assert_sbuf_state(s, SBUF_FINISHED);
-	
+
 	return s->s_buf;
 }
 
@@ -545,7 +545,7 @@
 {
 	assert_sbuf_integrity(s);
 	/* don't care if it's finished or not */
-	
+
 	if (SBUF_HASOVERFLOWED(s))
 		return (-1);
 	return s->s_len;
@@ -561,7 +561,7 @@
 
 	assert_sbuf_integrity(s);
 	/* don't care if it's finished or not */
-	
+
 	if (SBUF_ISDYNAMIC(s))
 		SBFREE(s->s_buf);
 	isdyn = SBUF_ISDYNSTRUCT(s);
To Unsubscribe: send mail to majordomo at trustedbsd.org
with "unsubscribe trustedbsd-cvs" in the body of the message