From owner-p4-projects@FreeBSD.ORG  Sun May 24 21:51:23 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 1044C106566C; Sun, 24 May 2009 21:51:23 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id C2A7E1065675
	for <perforce@freebsd.org>; Sun, 24 May 2009 21:51:22 +0000 (UTC)
	(envelope-from mav@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id B07488FC17
	for <perforce@freebsd.org>; Sun, 24 May 2009 21:51:22 +0000 (UTC)
	(envelope-from mav@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n4OLpMFn013221
	for <perforce@freebsd.org>; Sun, 24 May 2009 21:51:22 GMT
	(envelope-from mav@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n4OLpMal013219
	for perforce@freebsd.org; Sun, 24 May 2009 21:51:22 GMT
	(envelope-from mav@freebsd.org)
Date: Sun, 24 May 2009 21:51:22 GMT
Message-Id: <200905242151.n4OLpMal013219@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	mav@freebsd.org using -f
From: Alexander Motin <mav@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 162675 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 24 May 2009 21:51:23 -0000

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

Change 162675 by mav@mav_mavbook on 2009/05/24 21:51:15

	Improve strings cleanup function.

Affected files ...

.. //depot/projects/scottl-camlock/src/sys/cam/ata/ata_xpt.c#6 edit

Differences ...

==== //depot/projects/scottl-camlock/src/sys/cam/ata/ata_xpt.c#6 (text+ko) ====

@@ -183,45 +183,45 @@
 static void
 bswap(int8_t *buf, int len)
 {
-    u_int16_t *ptr = (u_int16_t*)(buf + len);
+	u_int16_t *ptr = (u_int16_t*)(buf + len);
 
-    while (--ptr >= (u_int16_t*)buf)
-	*ptr = ntohs(*ptr);
+	while (--ptr >= (u_int16_t*)buf)
+		*ptr = ntohs(*ptr);
 }
 
 static void
 btrim(int8_t *buf, int len)
 {
-    int8_t *ptr;
+	int8_t *ptr;
 
-    for (ptr = buf; ptr < buf+len; ++ptr)
-	if (!*ptr || *ptr == '_')
-	    *ptr = ' ';
-    for (ptr = buf + len - 1; ptr >= buf && *ptr == ' '; --ptr)
-	*ptr = 0;
+	for (ptr = buf; ptr < buf+len; ++ptr)
+		if (!*ptr || *ptr == '_')
+			*ptr = ' ';
+	for (ptr = buf + len - 1; ptr >= buf && *ptr == ' '; --ptr)
+		*ptr = 0;
 }
 
 static void
 bpack(int8_t *src, int8_t *dst, int len)
 {
-    int i, j, blank;
+	int i, j, blank;
 
-    for (i = j = blank = 0 ; i < len; i++) {
-	if (blank && src[i] == ' ') continue;
-	if (blank && src[i] != ' ') {
-	    dst[j++] = src[i];
-	    blank = 0;
-	    continue;
+	for (i = j = blank = 0 ; i < len; i++) {
+		if (blank && src[i] == ' ') continue;
+		if (blank && src[i] != ' ') {
+			dst[j++] = src[i];
+			blank = 0;
+			continue;
+		}
+		if (src[i] == ' ') {
+			blank = 1;
+			if (i == 0)
+			continue;
+		}
+		dst[j++] = src[i];
 	}
-	if (src[i] == ' ') {
-	    blank = 1;
-	    if (i == 0)
-		continue;
-	}
-	dst[j++] = src[i];
-    }
-    if (j < len)
-	dst[j] = 0x00;
+	while (j < len)
+		dst[j++] = 0x00;
 }
 
 static void