From owner-p4-projects@FreeBSD.ORG Thu Jun 16 10:55:57 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B9E0F16A420; Thu, 16 Jun 2005 10:55:56 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 7E4FD16A41C for ; Thu, 16 Jun 2005 10:55:56 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6357F43D4C for ; Thu, 16 Jun 2005 10:55:56 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j5GAtu4j008443 for ; Thu, 16 Jun 2005 10:55:56 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j5GAtuYt008440 for perforce@freebsd.org; Thu, 16 Jun 2005 10:55:56 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Thu, 16 Jun 2005 10:55:56 GMT Message-Id: <200506161055.j5GAtuYt008440@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 78614 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 16 Jun 2005 10:55:57 -0000 http://perforce.freebsd.org/chv.cgi?CH=78614 Change 78614 by rwatson@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);