[Ocfs-tools-commits]
jlbec commits r140 - in trunk/ocfs2/libocfs2: . include
svn-commits at oss.oracle.com
svn-commits at oss.oracle.com
Sun Jul 4 15:55:44 CDT 2004
Author: jlbec
Date: 2004-07-04 14:55:42 -0500 (Sun, 04 Jul 2004)
New Revision: 140
Modified:
trunk/ocfs2/libocfs2/closefs.c
trunk/ocfs2/libocfs2/dir_iterate.c
trunk/ocfs2/libocfs2/dirblock.c
trunk/ocfs2/libocfs2/extents.c
trunk/ocfs2/libocfs2/freefs.c
trunk/ocfs2/libocfs2/include/filesys.h
trunk/ocfs2/libocfs2/inode.c
trunk/ocfs2/libocfs2/link.c
trunk/ocfs2/libocfs2/lookup.c
trunk/ocfs2/libocfs2/memory.c
trunk/ocfs2/libocfs2/mkjournal.c
trunk/ocfs2/libocfs2/openfs.c
trunk/ocfs2/libocfs2/sysfile.c
trunk/ocfs2/libocfs2/unix_io.c
trunk/ocfs2/libocfs2/unlink.c
Log:
o The includes were a mess. Every file included the same mess of stuff.
Now the mess is in filesys.h.
Modified: trunk/ocfs2/libocfs2/closefs.c
===================================================================
--- trunk/ocfs2/libocfs2/closefs.c 2004-07-04 19:22:02 UTC (rev 139)
+++ trunk/ocfs2/libocfs2/closefs.c 2004-07-04 19:55:42 UTC (rev 140)
@@ -30,26 +30,6 @@
#define _XOPEN_SOURCE 600 /* Triggers XOPEN2K in features.h */
#define _LARGEFILE64_SOURCE
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-#include <stddef.h>
-#include <stdint.h>
-#include <sys/stat.h>
-#include <errno.h>
-
-#include <linux/types.h>
-
-#include <et/com_err.h>
-#include "ocfs2_err.h"
-
-#include "unix_io.h"
-#include "memory.h"
-#include "byteorder.h"
-
-#include "ocfs2_fs.h"
-#include "ocfs1_fs_compat.h"
-
#include "filesys.h"
Modified: trunk/ocfs2/libocfs2/dir_iterate.c
===================================================================
--- trunk/ocfs2/libocfs2/dir_iterate.c 2004-07-04 19:22:02 UTC (rev 139)
+++ trunk/ocfs2/libocfs2/dir_iterate.c 2004-07-04 19:55:42 UTC (rev 140)
@@ -30,25 +30,6 @@
#define _XOPEN_SOURCE 600 /* Triggers magic in features.h */
#define _LARGEFILE64_SOURCE
-#include <stdio.h>
-#include <unistd.h>
-#include <string.h>
-#include <stdlib.h>
-#include <stdint.h>
-#include <sys/stat.h>
-#include <time.h>
-
-#include <linux/types.h>
-
-#include <et/com_err.h>
-#include "ocfs2_err.h"
-
-#include "unix_io.h"
-#include "memory.h"
-#include "byteorder.h"
-
-#include "ocfs2_fs.h"
-
#include "filesys.h"
#include "dir_iterate.h"
@@ -249,6 +230,8 @@
#ifdef DEBUG_EXE
+#include <stdlib.h>
+#include <string.h>
#include <getopt.h>
static uint64_t read_number(const char *num)
Modified: trunk/ocfs2/libocfs2/dirblock.c
===================================================================
--- trunk/ocfs2/libocfs2/dirblock.c 2004-07-04 19:22:02 UTC (rev 139)
+++ trunk/ocfs2/libocfs2/dirblock.c 2004-07-04 19:55:42 UTC (rev 140)
@@ -30,25 +30,8 @@
#define _XOPEN_SOURCE 600 /* Triggers magic in features.h */
#define _LARGEFILE64_SOURCE
-#include <stdio.h>
-#include <unistd.h>
#include <string.h>
-#include <stdlib.h>
-#include <stdint.h>
-#include <sys/stat.h>
-#include <time.h>
-#include <linux/types.h>
-
-#include <et/com_err.h>
-#include "ocfs2_err.h"
-
-#include "unix_io.h"
-#include "memory.h"
-#include "byteorder.h"
-
-#include "ocfs2_fs.h"
-
#include "filesys.h"
Modified: trunk/ocfs2/libocfs2/extents.c
===================================================================
--- trunk/ocfs2/libocfs2/extents.c 2004-07-04 19:22:02 UTC (rev 139)
+++ trunk/ocfs2/libocfs2/extents.c 2004-07-04 19:55:42 UTC (rev 140)
@@ -31,26 +31,8 @@
#define _XOPEN_SOURCE 600 /* Triggers XOPEN2K in features.h */
#define _LARGEFILE64_SOURCE
-#include <stdio.h>
#include <string.h>
-#include <stdlib.h>
-#include <stddef.h>
-#include <stdint.h>
-#include <sys/stat.h>
-#include <errno.h>
-#include <linux/types.h>
-
-#include <et/com_err.h>
-#include "ocfs2_err.h"
-
-#include "unix_io.h"
-#include "memory.h"
-#include "byteorder.h"
-
-#include "ocfs2_fs.h"
-#include "ocfs1_fs_compat.h"
-
#include "filesys.h"
@@ -422,6 +404,7 @@
#ifdef DEBUG_EXE
+#include <stdlib.h>
#include <getopt.h>
static uint64_t read_number(const char *num)
Modified: trunk/ocfs2/libocfs2/freefs.c
===================================================================
--- trunk/ocfs2/libocfs2/freefs.c 2004-07-04 19:22:02 UTC (rev 139)
+++ trunk/ocfs2/libocfs2/freefs.c 2004-07-04 19:55:42 UTC (rev 140)
@@ -30,27 +30,11 @@
#define _XOPEN_SOURCE 600 /* Triggers XOPEN2K in features.h */
#define _LARGEFILE64_SOURCE
-#include <stdio.h>
-#include <string.h>
#include <stdlib.h>
-#include <stddef.h>
-#include <stdint.h>
-#include <sys/stat.h>
-#include <errno.h>
-#include <linux/types.h>
-
-#include <et/com_err.h>
-#include "ocfs2_err.h"
-
-#include "unix_io.h"
-#include "memory.h"
-#include "byteorder.h"
-
-#include "ocfs2_fs.h"
-
#include "filesys.h"
+
void ocfs2_freefs(ocfs2_filesys *fs)
{
if (!fs)
Modified: trunk/ocfs2/libocfs2/include/filesys.h
===================================================================
--- trunk/ocfs2/libocfs2/include/filesys.h 2004-07-04 19:22:02 UTC (rev 139)
+++ trunk/ocfs2/libocfs2/include/filesys.h 2004-07-04 19:55:42 UTC (rev 140)
@@ -27,8 +27,35 @@
#ifndef _FILESYS_H
#define _FILESYS_H
+#ifndef _XOPEN_SOURCE
+# define _XOPEN_SOURCE 600
+#endif
+#ifndef _LARGEFILE64_SOURCE
+# define _LARGEFILE64_SOURCE
+#endif
+
+#include <stdio.h>
#include <stdint.h>
+#include <sys/stat.h>
+#include <linux/types.h>
+
+#include <et/com_err.h>
+
+#include "unix_io.h"
+#include "memory.h"
+#include "byteorder.h"
+
+#if OCFS2_FLAT_INCLUDES
+#include "ocfs2_err.h"
+
+#include "ocfs2_fs.h"
+#else
+#include <ocfs2/ocfs2_err.h>
+
+#include <ocfs2/ocfs2_fs.h>
+#endif
+
#define OCFS2_LIB_FEATURE_INCOMPAT_SUPP OCFS2_FEATURE_INCOMPAT_SUPP
#define OCFS2_LIB_FEATURE_RO_COMPAT_SUPP OCFS2_FEATURE_RO_COMPAT_SUPP
Modified: trunk/ocfs2/libocfs2/inode.c
===================================================================
--- trunk/ocfs2/libocfs2/inode.c 2004-07-04 19:22:02 UTC (rev 139)
+++ trunk/ocfs2/libocfs2/inode.c 2004-07-04 19:55:42 UTC (rev 140)
@@ -30,26 +30,8 @@
#define _XOPEN_SOURCE 600 /* Triggers XOPEN2K in features.h */
#define _LARGEFILE64_SOURCE
-#include <stdio.h>
#include <string.h>
-#include <stdlib.h>
-#include <stddef.h>
-#include <stdint.h>
-#include <sys/stat.h>
-#include <errno.h>
-#include <linux/types.h>
-
-#include <et/com_err.h>
-#include "ocfs2_err.h"
-
-#include "unix_io.h"
-#include "memory.h"
-#include "byteorder.h"
-
-#include "ocfs2_fs.h"
-#include "ocfs1_fs_compat.h"
-
#include "filesys.h"
@@ -153,6 +135,8 @@
#ifdef DEBUG_EXE
+#include <stdlib.h>
+
static uint64_t read_number(const char *num)
{
uint64_t val;
Modified: trunk/ocfs2/libocfs2/link.c
===================================================================
--- trunk/ocfs2/libocfs2/link.c 2004-07-04 19:22:02 UTC (rev 139)
+++ trunk/ocfs2/libocfs2/link.c 2004-07-04 19:55:42 UTC (rev 140)
@@ -30,25 +30,8 @@
#define _XOPEN_SOURCE 600 /* Triggers magic in features.h */
#define _LARGEFILE64_SOURCE
-#include <stdio.h>
-#include <unistd.h>
#include <string.h>
-#include <stdlib.h>
-#include <stdint.h>
-#include <sys/stat.h>
-#include <time.h>
-#include <linux/types.h>
-
-#include <et/com_err.h>
-#include "ocfs2_err.h"
-
-#include "unix_io.h"
-#include "memory.h"
-#include "byteorder.h"
-
-#include "ocfs2_fs.h"
-
#include "filesys.h"
Modified: trunk/ocfs2/libocfs2/lookup.c
===================================================================
--- trunk/ocfs2/libocfs2/lookup.c 2004-07-04 19:22:02 UTC (rev 139)
+++ trunk/ocfs2/libocfs2/lookup.c 2004-07-04 19:55:42 UTC (rev 140)
@@ -30,25 +30,8 @@
#define _XOPEN_SOURCE 600 /* Triggers magic in features.h */
#define _LARGEFILE64_SOURCE
-#include <stdio.h>
-#include <unistd.h>
#include <string.h>
-#include <stdlib.h>
-#include <stdint.h>
-#include <sys/stat.h>
-#include <time.h>
-#include <linux/types.h>
-
-#include <et/com_err.h>
-#include "ocfs2_err.h"
-
-#include "unix_io.h"
-#include "memory.h"
-#include "byteorder.h"
-
-#include "ocfs2_fs.h"
-
#include "filesys.h"
@@ -102,6 +85,7 @@
#ifdef DEBUG_EXE
+#include <stdlib.h>
#include <getopt.h>
static uint64_t read_number(const char *num)
Modified: trunk/ocfs2/libocfs2/memory.c
===================================================================
--- trunk/ocfs2/libocfs2/memory.c 2004-07-04 19:22:02 UTC (rev 139)
+++ trunk/ocfs2/libocfs2/memory.c 2004-07-04 19:55:42 UTC (rev 140)
@@ -35,12 +35,8 @@
#include <stdlib.h>
#include <errno.h>
-#include <et/com_err.h>
-#include "ocfs2_err.h"
+#include "filesys.h"
-#include "unix_io.h"
-#include "memory.h"
-
errcode_t ocfs2_malloc(unsigned long size, void *ptr)
{
void **pp = (void **)ptr;
Modified: trunk/ocfs2/libocfs2/mkjournal.c
===================================================================
--- trunk/ocfs2/libocfs2/mkjournal.c 2004-07-04 19:22:02 UTC (rev 139)
+++ trunk/ocfs2/libocfs2/mkjournal.c 2004-07-04 19:55:42 UTC (rev 140)
@@ -30,31 +30,16 @@
#define _XOPEN_SOURCE 600 /* Triggers XOPEN2K in features.h */
#define _LARGEFILE64_SOURCE
-#include <stdio.h>
#include <string.h>
-#include <stdlib.h>
-#include <stddef.h>
-#include <stdint.h>
-#include <sys/stat.h>
-#include <errno.h>
-#include <linux/types.h>
+#include "filesys.h"
-#include <et/com_err.h>
-#include "ocfs2_err.h"
-
+/* jfs_compat.h defines these */
+#undef cpu_to_be32
+#undef be32_to_cpu
#include "jfs_user.h"
-#include "unix_io.h"
-#include "memory.h"
-#include "byteorder.h"
-#include "ocfs2_fs.h"
-#include "ocfs1_fs_compat.h"
-
-#include "filesys.h"
-
-
/*
* This function automatically sets up the journal superblock and
* returns it as an allocated block.
Modified: trunk/ocfs2/libocfs2/openfs.c
===================================================================
--- trunk/ocfs2/libocfs2/openfs.c 2004-07-04 19:22:02 UTC (rev 139)
+++ trunk/ocfs2/libocfs2/openfs.c 2004-07-04 19:55:42 UTC (rev 140)
@@ -30,34 +30,18 @@
#define _XOPEN_SOURCE 600 /* Triggers XOPEN2K in features.h */
#define _LARGEFILE64_SOURCE
-#include <stdio.h>
#include <string.h>
-#include <stdlib.h>
-#include <stddef.h>
-#include <stdint.h>
-#include <sys/stat.h>
-#include <errno.h>
-/* I hate glibc and gcc ... this is a hack that will go away anyway */
+/* I hate glibc and gcc */
#ifndef ULLONG_MAX
# define ULLONG_MAX 18446744073709551615ULL
#endif
-#include <linux/types.h>
+#include "filesys.h"
-#include <et/com_err.h>
-#include "ocfs2_err.h"
-
-#include "unix_io.h"
-#include "memory.h"
-#include "byteorder.h"
-
-#include "ocfs2_fs.h"
#include "ocfs1_fs_compat.h"
-#include "filesys.h"
-
static errcode_t ocfs2_validate_ocfs1_header(ocfs2_filesys *fs)
{
errcode_t ret;
@@ -283,6 +267,7 @@
#ifdef DEBUG_EXE
#include <getopt.h>
#include <limits.h>
+#include <stdlib.h>
static int64_t read_number(const char *num)
{
Modified: trunk/ocfs2/libocfs2/sysfile.c
===================================================================
--- trunk/ocfs2/libocfs2/sysfile.c 2004-07-04 19:22:02 UTC (rev 139)
+++ trunk/ocfs2/libocfs2/sysfile.c 2004-07-04 19:55:42 UTC (rev 140)
@@ -27,26 +27,8 @@
#define _XOPEN_SOURCE 600 /* Triggers XOPEN2K in features.h */
#define _LARGEFILE64_SOURCE
-#include <stdio.h>
#include <string.h>
-#include <stdlib.h>
-#include <stddef.h>
-#include <stdint.h>
-#include <sys/stat.h>
-#include <errno.h>
-#include <linux/types.h>
-
-#include <et/com_err.h>
-#include "ocfs2_err.h"
-
-#include "unix_io.h"
-#include "memory.h"
-#include "byteorder.h"
-
-#include "ocfs2_fs.h"
-#include "ocfs1_fs_compat.h"
-
#include "filesys.h"
errcode_t ocfs2_lookup_system_inode(ocfs2_filesys *fs, int type,
Modified: trunk/ocfs2/libocfs2/unix_io.c
===================================================================
--- trunk/ocfs2/libocfs2/unix_io.c 2004-07-04 19:22:02 UTC (rev 139)
+++ trunk/ocfs2/libocfs2/unix_io.c 2004-07-04 19:55:42 UTC (rev 140)
@@ -31,11 +31,8 @@
#define _XOPEN_SOURCE 600 /* Triggers ISOC99, UNIX98 in features.h */
#define _LARGEFILE64_SOURCE
-#include <stdio.h>
#include <string.h>
#include <sys/types.h>
-#include <stdint.h>
-#include <sys/stat.h>
#include <unistd.h>
#include <errno.h>
#include <fcntl.h>
@@ -45,16 +42,6 @@
#include <sys/utsname.h>
#endif
-#include <linux/types.h>
-
-#include <et/com_err.h>
-#include "ocfs2_err.h"
-
-#include "unix_io.h"
-#include "memory.h"
-
-#include "ocfs2_fs.h" /* For OCFS2_MIN_BLOCKSIZE */
-
#include "filesys.h"
Modified: trunk/ocfs2/libocfs2/unlink.c
===================================================================
--- trunk/ocfs2/libocfs2/unlink.c 2004-07-04 19:22:02 UTC (rev 139)
+++ trunk/ocfs2/libocfs2/unlink.c 2004-07-04 19:55:42 UTC (rev 140)
@@ -31,25 +31,8 @@
#define _XOPEN_SOURCE 600 /* Triggers magic in features.h */
#define _LARGEFILE64_SOURCE
-#include <stdio.h>
-#include <unistd.h>
#include <string.h>
-#include <stdlib.h>
-#include <stdint.h>
-#include <sys/stat.h>
-#include <time.h>
-#include <linux/types.h>
-
-#include <et/com_err.h>
-#include "ocfs2_err.h"
-
-#include "unix_io.h"
-#include "memory.h"
-#include "byteorder.h"
-
-#include "ocfs2_fs.h"
-
#include "filesys.h"
More information about the Ocfs-tools-commits
mailing list