cleanups and bug fixes from John

[unix-history] / usr / src / sys / ufs / ffs / dir.h

diff --git a/usr/src/sys/ufs/ffs/dir.h b/usr/src/sys/ufs/ffs/dir.h
index c31129d..3b5160f 100644 (file)
--- a/usr/src/sys/ufs/ffs/dir.h
+++ b/usr/src/sys/ufs/ffs/dir.h
@@ -2,23 +2,13 @@
  * Copyright (c) 1982, 1986, 1989 The Regents of the University of California.
  * All rights reserved.
  *
  * Copyright (c) 1982, 1986, 1989 The Regents of the University of California.
  * All rights reserved.
  *

- * Redistribution and use in source and binary forms are permitted
- * provided that the above copyright notice and this paragraph are
- * duplicated in all such forms and that any documentation,
- * advertising materials, and other materials related to such
- * distribution and use acknowledge that the software was developed
- * by the University of California, Berkeley.  The name of the
- * University may not be used to endorse or promote products derived
- * from this software without specific prior written permission.
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+ * %sccs.include.redist.c%

  *
  *

- *     @(#)dir.h       7.8 (Berkeley) %G%
+ *     @(#)dir.h       7.10 (Berkeley) %G%

  */
 
  */
 

-#ifndef _DIR_
-#define        _DIR_
+#ifndef _DIR_H_
+#define        _DIR_H_

 
 /*
  * A directory consists of some number of blocks of DIRBLKSIZ
 
 /*
  * A directory consists of some number of blocks of DIRBLKSIZ


@@ -79,4 +69,4 @@ struct dirtemplate {
        short   dotdot_namlen;
        char    dotdot_name[4];         /* ditto */
 };
        short   dotdot_namlen;
        char    dotdot_name[4];         /* ditto */
 };

-#endif /* _DIR_ */
+#endif /* !_DIR_H_ */