Module Name: src
Committed By: mrg
Date: Sat Oct 19 20:12:18 UTC 2013
Modified Files:
src/sys/ufs/ufs: ufs_bswap.h
Log Message:
convert ufs_rw{16,32,64}() into real inline functions in all cases,
so that they consume their second arguments properly.
To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 src/sys/ufs/ufs/ufs_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/ufs/ufs/ufs_bswap.h
diff -u src/sys/ufs/ufs/ufs_bswap.h:1.19 src/sys/ufs/ufs/ufs_bswap.h:1.20
--- src/sys/ufs/ufs/ufs_bswap.h:1.19 Mon Oct 19 18:41:17 2009
+++ src/sys/ufs/ufs/ufs_bswap.h Sat Oct 19 20:12:18 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: ufs_bswap.h,v 1.19 2009/10/19 18:41:17 bouyer Exp $ */
+/* $NetBSD: ufs_bswap.h,v 1.20 2013/10/19 20:12:18 mrg Exp $ */
/*
* Copyright (c) 1998 Manuel Bouyer.
@@ -65,9 +65,23 @@ ufs_rw64(uint64_t a, int ns)
return ((ns) ? bswap64(a) : (a));
}
#else
-#define ufs_rw16(a, ns) ((uint16_t)(a))
-#define ufs_rw32(a, ns) ((uint32_t)(a))
-#define ufs_rw64(a, ns) ((uint64_t)(a))
+static inline u_int16_t
+ufs_rw16(uint16_t a, int ns)
+{
+ return a;
+}
+
+static inline u_int32_t
+ufs_rw32(uint32_t a, int ns)
+{
+ return a;
+}
+
+static inline u_int64_t
+ufs_rw64(uint64_t a, int ns)
+{
+ return a;
+}
#endif
#define ufs_add16(a, b, ns) \
