summaryrefslogtreecommitdiff
path: root/sys/ntfs/ntfs_conv.c
diff options
context:
space:
mode:
authorTed Unangst <tedu@cvs.openbsd.org>2010-08-12 04:26:57 +0000
committerTed Unangst <tedu@cvs.openbsd.org>2010-08-12 04:26:57 +0000
commit6c54d30fee9051e8cb5458e357e9ee41fda87db7 (patch)
treec7f5ffae82a5ed9af664f5061f2e0aa015cd8658 /sys/ntfs/ntfs_conv.c
parenta9bd431f6a5f05e49d04975e60951c347a0875c8 (diff)
these files don't need to include nearly so many headers
Diffstat (limited to 'sys/ntfs/ntfs_conv.c')
-rw-r--r--sys/ntfs/ntfs_conv.c18
1 files changed, 3 insertions, 15 deletions
diff --git a/sys/ntfs/ntfs_conv.c b/sys/ntfs/ntfs_conv.c
index 683d32be269..1eab868c013 100644
--- a/sys/ntfs/ntfs_conv.c
+++ b/sys/ntfs/ntfs_conv.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ntfs_conv.c,v 1.7 2009/08/13 16:00:53 jasper Exp $ */
+/* $OpenBSD: ntfs_conv.c,v 1.8 2010/08/12 04:26:56 tedu Exp $ */
/* $NetBSD: ntfs_conv.c,v 1.1 2002/12/23 17:38:32 jdolecek Exp $ */
/*-
@@ -36,24 +36,12 @@
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/namei.h>
-#include <sys/proc.h>
-#include <sys/kernel.h>
-#include <sys/vnode.h>
#include <sys/mount.h>
-#include <sys/buf.h>
-#include <sys/file.h>
-#include <sys/malloc.h>
-
-#include <miscfs/specfs/specdev.h>
/* #define NTFS_DEBUG 1 */
#include <ntfs/ntfs.h>
-#include <ntfs/ntfsmount.h>
#include <ntfs/ntfs_inode.h>
-#include <ntfs/ntfs_vfsops.h>
#include <ntfs/ntfs_subr.h>
-#include <ntfs/ntfs_compr.h>
-#include <ntfs/ntfs_ihash.h>
/* UTF-8 encoding stuff */
@@ -91,8 +79,8 @@ ntfs_utf8_wget(const char **str)
case 3:
if ((s[1] & 0xC0) != 0x80 || (s[2] & 0xC0) != 0x80)
goto encoding_error;
- rune = ((s[0] & 0x1F) << 12) | ((s[1] & 0x3F) << 6)
- | (s[2] & 0x3F);
+ rune = ((s[0] & 0x1F) << 12) | ((s[1] & 0x3F) << 6) |
+ (s[2] & 0x3F);
break;
}