From owner-p4-projects@FreeBSD.ORG  Sat Apr  5 10:59:46 2003
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 2285B37B404; Sat,  5 Apr 2003 10:59:46 -0800 (PST)
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 B96E937B401
	for <perforce@freebsd.org>; Sat,  5 Apr 2003 10:59:45 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 6197B43F85
	for <perforce@freebsd.org>; Sat,  5 Apr 2003 10:59:45 -0800 (PST)
	(envelope-from jmallett@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h35Ixj0U002211
	for <perforce@freebsd.org>; Sat, 5 Apr 2003 10:59:45 -0800 (PST)
	(envelope-from jmallett@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h35Ixi64002208
	for perforce@freebsd.org; Sat, 5 Apr 2003 10:59:44 -0800 (PST)
Date: Sat, 5 Apr 2003 10:59:44 -0800 (PST)
Message-Id: <200304051859.h35Ixi64002208@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	jmallett@freebsd.org using -f
From: Juli Mallett <jmallett@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 28241 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.1
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: Sat, 05 Apr 2003 18:59:47 -0000

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

Change 28241 by jmallett@jmallett_dalek on 2003/04/05 10:59:05

	Catch up with endian function changes, clean up one style bogon.

Affected files ...

.. //depot/projects/mips/sys/geom/geom_fx.c#11 edit

Differences ...

==== //depot/projects/mips/sys/geom/geom_fx.c#11 (text+ko) ====

@@ -33,6 +33,7 @@
 
 
 #include <sys/param.h>
+#include <sys/endian.h>
 #ifndef _KERNEL
 #include <stdio.h>
 #include <string.h>
@@ -62,9 +63,9 @@
 static void
 g_fx_swap_volpart(struct volpart *vp)
 {
-	vp->vp_size = g_dec_be4((u_char *)&vp->vp_size);
-	vp->vp_begin = g_dec_be4((u_char *)&vp->vp_begin);
-	vp->vp_type = g_dec_be4((u_char *)&vp->vp_type);
+	vp->vp_size = be32dec((u_char *)&vp->vp_size);
+	vp->vp_begin = be32dec((u_char *)&vp->vp_begin);
+	vp->vp_type = be32dec((u_char *)&vp->vp_type);
 }
 
 static const char *
@@ -89,8 +90,8 @@
 	words = (int32_t *)vh;
 
 	for (i = 0; i < 512 / sizeof *words; i++)
-		sum += g_dec_be4((u_char *)&words[i]);
-	return sum;
+		sum += be32dec((u_char *)&words[i]);
+	return (sum);
 }
 
 static int
@@ -161,7 +162,7 @@
 		if (buf == NULL || error != 0)
 			break;
 		label = (struct volhdr *)buf;
-		if (g_dec_be4((u_char *)&label->vh_magic) != FX_LABEL_MAGIC)
+		if (be32dec((u_char *)&label->vh_magic) != FX_LABEL_MAGIC)
 			break;
 		error = g_fx_cksum(label);
 		if (error != 0) {