Merge whitespace changes over

[thirdparty/xfsprogs-dev.git] / include / xfs_dir2_sf.h

diff --git a/include/xfs_dir2_sf.h b/include/xfs_dir2_sf.h
index fec233828f20e2fc12ad6a4615a1b2575bd043c6..3fea83ecd59cbab38f0bf9ac1b78f1d649042ca2 100644 (file)
--- a/include/xfs_dir2_sf.h
+++ b/include/xfs_dir2_sf.h
@@ -1,32 +1,32 @@
 /*
  * Copyright (c) 2000-2001 Silicon Graphics, Inc.  All Rights Reserved.
- * 
+ *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of version 2 of the GNU General Public License as
  * published by the Free Software Foundation.
- * 
+ *
  * This program is distributed in the hope that it would be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * 
+ *
  * Further, this software is distributed without any warranty that it is
  * free of the rightful claim of any third person regarding infringement
  * or the like.  Any license provided herein, whether implied or
  * otherwise, applies only to this software file.  Patent licenses, if
  * any, provided herein do not apply to combinations of this program with
  * other software, or any other product whatsoever.
- * 
+ *
  * You should have received a copy of the GNU General Public License along
  * with this program; if not, write the Free Software Foundation, Inc., 59
  * Temple Place - Suite 330, Boston MA 02111-1307, USA.
- * 
+ *
  * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy,
  * Mountain View, CA  94043, or:
- * 
- * http://www.sgi.com 
- * 
- * For further information regarding this notice, see: 
- * 
+ *
+ * http://www.sgi.com
+ *
+ * For further information regarding this notice, see:
+ *
  * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/
  */
 #ifndef __XFS_DIR2_SF_H__
@@ -39,7 +39,6 @@
  * fit into the literal area of the inode.
  */
 
-struct dirent;
 struct uio;
 struct xfs_dabuf;
 struct xfs_da_args;
@@ -63,7 +62,7 @@ typedef       struct { __uint8_t i[8]; } xfs_dir2_ino8_t;
 #define        XFS_DIR2_SF_GET_INO8_ARCH(di,arch)      \
        (xfs_ino_t)(DIRINO_GET_ARCH(&di,arch))
 #define        XFS_DIR2_SF_GET_INO8(di)                \
-        XFS_DIR2_SF_GET_INO8_ARCH(di,ARCH_NOCONVERT)
+       XFS_DIR2_SF_GET_INO8_ARCH(di,ARCH_NOCONVERT)
 
 /*
  * Inode number stored as 4 8-bit values.
@@ -93,7 +92,7 @@ typedef struct { __uint8_t i[2]; } xfs_dir2_sf_off_t;
  * be calculated on the fly.
  *
  * Entries are packed toward the top as tightly as possible.  The header
- * and the elements must be bcopy()'d out into a work area to get correct
+ * and the elements must be memcpy'd out into a work area to get correct
  * alignment for the inode number fields.
  */
 typedef struct xfs_dir2_sf_hdr {
@@ -133,8 +132,8 @@ xfs_dir2_inou_t *xfs_dir2_sf_inumberp(xfs_dir2_sf_entry_t *sfep);
 #endif
 
 #if XFS_WANT_FUNCS || (XFS_WANT_SPACE && XFSSO_XFS_DIR2_SF_GET_INUMBER)
-xfs_intino_t xfs_dir2_sf_get_inumber_arch(xfs_dir2_sf_t *sfp, xfs_dir2_inou_t *from, 
-                                            xfs_arch_t arch);
+xfs_intino_t xfs_dir2_sf_get_inumber_arch(xfs_dir2_sf_t *sfp, xfs_dir2_inou_t *from,
+                                           xfs_arch_t arch);
 #define        XFS_DIR2_SF_GET_INUMBER_ARCH(sfp, from, arch)   \
        xfs_dir2_sf_get_inumber_arch(sfp, from, arch)
 
@@ -147,37 +146,37 @@ xfs_intino_t xfs_dir2_sf_get_inumber_arch(xfs_dir2_sf_t *sfp, xfs_dir2_inou_t *f
 
 #if XFS_WANT_FUNCS || (XFS_WANT_SPACE && XFSSO_XFS_DIR2_SF_PUT_INUMBER)
 void xfs_dir2_sf_put_inumber_arch(xfs_dir2_sf_t *sfp, xfs_ino_t *from,
-                                    xfs_dir2_inou_t *to, xfs_arch_t arch);
+                                    xfs_dir2_inou_t *to, xfs_arch_t arch);
 #define        XFS_DIR2_SF_PUT_INUMBER_ARCH(sfp,from,to,arch)  \
        xfs_dir2_sf_put_inumber_arch(sfp,from,to,arch)
 #else
 #define        XFS_DIR2_SF_PUT_INUMBER_ARCH(sfp,from,to,arch)  \
        if ((sfp)->hdr.i8count == 0) { \
-            DIRINO4_COPY_ARCH(from,to,arch); \
-        } else { \
-            DIRINO_COPY_ARCH(from,to,arch); \
-        }
+           DIRINO4_COPY_ARCH(from,to,arch); \
+       } else { \
+           DIRINO_COPY_ARCH(from,to,arch); \
+       }
 #endif
 
 #if XFS_WANT_FUNCS || (XFS_WANT_SPACE && XFSSO_XFS_DIR2_SF_GET_OFFSET)
-xfs_dir2_data_aoff_t xfs_dir2_sf_get_offset_arch(xfs_dir2_sf_entry_t *sfep, 
-                                                    xfs_arch_t arch);
+xfs_dir2_data_aoff_t xfs_dir2_sf_get_offset_arch(xfs_dir2_sf_entry_t *sfep,
+                                                   xfs_arch_t arch);
 xfs_dir2_data_aoff_t xfs_dir2_sf_get_offset(xfs_dir2_sf_entry_t *sfep);
 #define        XFS_DIR2_SF_GET_OFFSET_ARCH(sfep,arch)  \
-        xfs_dir2_sf_get_offset_arch(sfep,arch)
+       xfs_dir2_sf_get_offset_arch(sfep,arch)
 #else
 #define        XFS_DIR2_SF_GET_OFFSET_ARCH(sfep,arch)  \
-        INT_GET_UNALIGNED_16_ARCH(&(sfep)->offset.i,arch)
+       INT_GET_UNALIGNED_16_ARCH(&(sfep)->offset.i,arch)
 #endif
 
 #if XFS_WANT_FUNCS || (XFS_WANT_SPACE && XFSSO_XFS_DIR2_SF_PUT_OFFSET)
 void xfs_dir2_sf_put_offset_arch(xfs_dir2_sf_entry_t *sfep,
-                                   xfs_dir2_data_aoff_t off, xfs_arch_t arch);
+                                   xfs_dir2_data_aoff_t off, xfs_arch_t arch);
 #define        XFS_DIR2_SF_PUT_OFFSET_ARCH(sfep,off,arch) \
-        xfs_dir2_sf_put_offset_arch(sfep,off,arch)
+       xfs_dir2_sf_put_offset_arch(sfep,off,arch)
 #else
 #define        XFS_DIR2_SF_PUT_OFFSET_ARCH(sfep,off,arch)      \
-        INT_SET_UNALIGNED_16_ARCH(&(sfep)->offset.i,off,arch)
+       INT_SET_UNALIGNED_16_ARCH(&(sfep)->offset.i,off,arch)
 #endif
 
 #if XFS_WANT_FUNCS || (XFS_WANT_SPACE && XFSSO_XFS_DIR2_SF_ENTSIZE_BYNAME)