Module Name: src
Committed By: reinoud
Date: Mon May 18 20:52:24 UTC 2009
Modified Files:
src/sys/fs/udf: udf_bswap.h
Log Message:
Fix *serious* bug in bswapping definitions for big endian machines.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sys/fs/udf/udf_bswap.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/fs/udf/udf_bswap.h
diff -u src/sys/fs/udf/udf_bswap.h:1.5 src/sys/fs/udf/udf_bswap.h:1.6
--- src/sys/fs/udf/udf_bswap.h:1.5 Wed May 14 16:49:48 2008
+++ src/sys/fs/udf/udf_bswap.h Mon May 18 20:52:24 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: udf_bswap.h,v 1.5 2008/05/14 16:49:48 reinoud Exp $ */
+/* $NetBSD: udf_bswap.h,v 1.6 2009/05/18 20:52:24 reinoud Exp $ */
/*
* Copyright (c) 1998 Manuel Bouyer.
@@ -37,49 +37,38 @@
#ifndef _FS_UDF_UDF_BSWAP_H_
#define _FS_UDF_UDF_BSWAP_H_
-#if HAVE_ENDIAN_H
-#include <endian.h>
-#else
-#if HAVE_SYS_ENDIAN_H
#include <sys/endian.h>
-#else
-#if HAVE_MACHINE_ENDIAN_H
-#include <machine/endian.h>
-#endif
-#endif
-#endif
+#include <machine/bswap.h>
+#include <sys/bswap.h>
/* rest only relevant for big endian machines */
#if (BYTE_ORDER == BIG_ENDIAN)
-#include <machine/bswap.h>
-#include <sys/bswap.h>
-
/* inlines for access to swapped data */
-static __inline u_int16_t udf_rw16(u_int16_t);
-static __inline u_int32_t udf_rw32(u_int32_t);
-static __inline u_int64_t udf_rw64(u_int64_t);
+static __inline uint16_t udf_rw16(uint16_t);
+static __inline uint32_t udf_rw32(uint32_t);
+static __inline uint64_t udf_rw64(uint64_t);
-static __inline u_int16_t
+static __inline uint16_t
udf_rw16(a)
- u_int16_t a;
+ uint16_t a;
{
return bswap16(a);
}
-static __inline u_int32_t
+static __inline uint32_t
udf_rw32(a)
- u_int32_t a;
+ uint32_t a;
{
return bswap32(a);
}
-static __inline u_int64_t
+static __inline uint64_t
udf_rw64(a)
- u_int64_t a;
+ uint64_t a;
{
return bswap64(a);
}
@@ -94,3 +83,4 @@
#endif /* !_FS_UDF_UDF_BSWAP_H_ */
+
