Changes by: flatcap Update of /cvsroot/linux-ntfs/ntfsprogs/include/ntfs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2642/include/ntfs Modified Files: attrib.h attrlist.h collate.h endians.h gnome-vfs-method.h gnome-vfs-module.h index.h inode.h layout.h Log Message: Tidy whitespace: trailing space; <space><tab> at the beginning of lines Fix warnings about sign differences Fix warnings about unused parameters Tidy a few functions that didn't have { on a new line Index: attrib.h =================================================================== RCS file: /cvsroot/linux-ntfs/ntfsprogs/include/ntfs/attrib.h,v retrieving revision 1.16 retrieving revision 1.17 diff -u -p -r1.16 -r1.17 --- attrib.h 22 Dec 2004 16:34:02 -0000 1.16 +++ attrib.h 19 Jun 2005 21:09:40 -0000 1.17 @@ -286,7 +286,7 @@ extern int ntfs_attr_can_be_non_resident const ATTR_TYPES type); extern int ntfs_attr_can_be_resident(const ntfs_volume *vol, const ATTR_TYPES type); - + extern int ntfs_make_room_for_attr(MFT_RECORD *m, u8 *pos, u32 size); extern int ntfs_resident_attr_record_add(ntfs_inode *ni, ATTR_TYPES type, @@ -304,7 +304,7 @@ extern int ntfs_attr_record_resize(MFT_R extern int ntfs_resident_attr_value_resize(MFT_RECORD *m, ATTR_RECORD *a, const u32 newsize); - + extern int ntfs_attr_record_move_to(ntfs_attr_search_ctx *ctx, ntfs_inode *ni); extern int ntfs_attr_record_move_away(ntfs_attr_search_ctx *ctx, int extra); Index: attrlist.h =================================================================== RCS file: /cvsroot/linux-ntfs/ntfsprogs/include/ntfs/attrlist.h,v retrieving revision 1.9 retrieving revision 1.10 diff -u -p -r1.9 -r1.10 --- attrlist.h 17 Oct 2004 15:56:39 -0000 1.9 +++ attrlist.h 19 Jun 2005 21:09:40 -0000 1.10 @@ -40,7 +40,8 @@ extern int ntfs_attrlist_entry_rm(ntfs_a * * This function cannot fail. */ -static __inline__ void ntfs_attrlist_mark_dirty(ntfs_inode *ni) { +static __inline__ void ntfs_attrlist_mark_dirty(ntfs_inode *ni) +{ if (ni->nr_extents == -1) NInoAttrListSetDirty(ni->base_ni); else Index: collate.h =================================================================== RCS file: /cvsroot/linux-ntfs/ntfsprogs/include/ntfs/collate.h,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- collate.h 4 Jun 2005 00:58:01 -0000 1.1 +++ collate.h 19 Jun 2005 21:09:40 -0000 1.2 @@ -29,7 +29,8 @@ #define NTFS_COLLATION_ERROR -2 -static inline BOOL ntfs_is_collation_rule_supported(COLLATION_RULES cr) { +static inline BOOL ntfs_is_collation_rule_supported(COLLATION_RULES cr) +{ int i; /* Index: endians.h =================================================================== RCS file: /cvsroot/linux-ntfs/ntfsprogs/include/ntfs/endians.h,v retrieving revision 1.10 retrieving revision 1.11 diff -u -p -r1.10 -r1.11 --- endians.h 30 Sep 2004 15:00:31 -0000 1.10 +++ endians.h 19 Jun 2005 21:09:40 -0000 1.11 @@ -154,9 +154,9 @@ #define le32_to_cpu(x) (u32)__le32_to_cpu((u32)(x)) #define le64_to_cpu(x) (u64)__le64_to_cpu((u64)(x)) -#define le16_to_cpup(x) (u16)__le16_to_cpu(*(u16*)(x)) -#define le32_to_cpup(x) (u32)__le32_to_cpu(*(u32*)(x)) -#define le64_to_cpup(x) (u64)__le64_to_cpu(*(u64*)(x)) +#define le16_to_cpup(x) (u16)__le16_to_cpu(*(const u16*)(x)) +#define le32_to_cpup(x) (u32)__le32_to_cpu(*(const u32*)(x)) +#define le64_to_cpup(x) (u64)__le64_to_cpu(*(const u64*)(x)) /* Signed from LE to CPU conversion. */ Index: gnome-vfs-method.h =================================================================== RCS file: /cvsroot/linux-ntfs/ntfsprogs/include/ntfs/gnome-vfs-method.h,v retrieving revision 1.3 retrieving revision 1.4 diff -u -p -r1.3 -r1.4 --- gnome-vfs-method.h 29 Feb 2004 14:09:45 -0000 1.3 +++ gnome-vfs-method.h 19 Jun 2005 21:09:40 -0000 1.4 @@ -4,7 +4,7 @@ * * Copyright (c) 2002-2003 Jan Kratochvil <pro...@ja...> * Copyright (c) 2000-2004 Anton Altaparmakov - * + * * This program/include file is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License as published * by the Free Software Foundation; either version 2 of the License, or Index: gnome-vfs-module.h =================================================================== RCS file: /cvsroot/linux-ntfs/ntfsprogs/include/ntfs/gnome-vfs-module.h,v retrieving revision 1.3 retrieving revision 1.4 diff -u -p -r1.3 -r1.4 --- gnome-vfs-module.h 29 Feb 2004 14:09:45 -0000 1.3 +++ gnome-vfs-module.h 19 Jun 2005 21:09:40 -0000 1.4 @@ -4,7 +4,7 @@ * * Copyright (c) 2003 Jan Kratochvil <pro...@ja...> * Copyright (c) 2000-2004 Anton Altaparmakov - * + * * This program/include file is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License as published * by the Free Software Foundation; either version 2 of the License, or Index: index.h =================================================================== RCS file: /cvsroot/linux-ntfs/ntfsprogs/include/ntfs/index.h,v retrieving revision 1.2 retrieving revision 1.3 diff -u -p -r1.2 -r1.3 --- index.h 4 Jun 2005 15:20:00 -0000 1.2 +++ index.h 19 Jun 2005 21:09:40 -0000 1.3 @@ -58,7 +58,7 @@ * If @is_in_root is FALSE, @entry is in the index allocation attribute and @ia * and @ia_vcn point to the index allocation block and VCN where it's placed, * respectively. @ir and @actx are NULL in this case. @ia_na is opened - * INDEX_ALLOCTAION attribute. @ia_dirty is TRUE if index block was changed and + * INDEX_ALLOCTAION attribute. @ia_dirty is TRUE if index block was changed and * FALSE otherwise. * * To obtain a context call ntfs_index_ctx_get(). Index: inode.h =================================================================== RCS file: /cvsroot/linux-ntfs/ntfsprogs/include/ntfs/inode.h,v retrieving revision 1.12 retrieving revision 1.13 diff -u -p -r1.12 -r1.13 --- inode.h 5 Jun 2005 14:55:08 -0000 1.12 +++ inode.h 19 Jun 2005 21:09:40 -0000 1.13 @@ -152,7 +152,7 @@ extern int ntfs_inode_close(ntfs_inode * extern ntfs_inode *ntfs_extent_inode_open(ntfs_inode *base_ni, const MFT_REF mref); - + extern int ntfs_inode_attach_all_extents(ntfs_inode *ni); /** @@ -165,7 +165,8 @@ extern int ntfs_inode_attach_all_extents * * This function cannot fail. */ -static __inline__ void ntfs_inode_mark_dirty(ntfs_inode *ni) { +static __inline__ void ntfs_inode_mark_dirty(ntfs_inode *ni) +{ NInoSetDirty(ni); if (ni->nr_extents == -1) NInoSetDirty(ni->base_ni); Index: layout.h =================================================================== RCS file: /cvsroot/linux-ntfs/ntfsprogs/include/ntfs/layout.h,v retrieving revision 1.19 retrieving revision 1.20 diff -u -p -r1.19 -r1.20 --- layout.h 12 Jun 2005 15:23:25 -0000 1.19 +++ layout.h 19 Jun 2005 21:09:40 -0000 1.20 @@ -2219,7 +2219,7 @@ typedef struct { // the key_length is zero, then the vcn immediately // follows the INDEX_ENTRY_HEADER. Regardless of // key_length, the address of the 8-byte boundary - // alligned vcn of INDEX_ENTRY{_HEADER} *ie is given by + // aligned vcn of INDEX_ENTRY{_HEADER} *ie is given by // (char*)ie + le16_to_cpu(ie*)->length) - sizeof(VCN), // where sizeof(VCN) can be hardcoded as 8 if wanted. */ } __attribute__ ((__packed__)) INDEX_ENTRY; |
