ChangeLog, dirinfo.c, e2fsck.c, e2fsck.h, super.c:

  dirinfo.c, e2fsck.c: Don't include com_err.h; it isn't needed.
  e2fsck.h: Include <time.h> since it is needed
  super.c: If EXT2_SKIP_UUID is defined, then skip the UUID processing.

diff --git a/e2fsck/ChangeLog b/e2fsck/ChangeLog
index 1f80af2..43343b8 100644 (file)
--- a/e2fsck/ChangeLog
+++ b/e2fsck/ChangeLog
@@ -1,3 +1,12 @@
+Sun Feb  1 07:57:14 1998  Theodore Ts'o  <tytso@rsts-11.mit.edu>
+
+       * dirinfo.c, e2fsck.c: Don't include com_err.h; it isn't needed.
+
+       * e2fsck.h: Include <time.h> since it is needed
+
+       * super.c: If EXT2_SKIP_UUID is defined, then skip the UUID
+               processing. 
+
 Tue Jan 20 15:37:01 1998  Theodore Ts'o  <tytso@rsts-11.mit.edu>
 
        * unix.c (main): In the case where the filesystem revision is too

diff --git a/e2fsck/dirinfo.c b/e2fsck/dirinfo.c
index d2dca59..c99b99e 100644 (file)
--- a/e2fsck/dirinfo.c
+++ b/e2fsck/dirinfo.c
@@ -5,7 +5,6 @@
  * under the terms of the GNU Public License.
  */
 
-#include <et/com_err.h>
 #include "e2fsck.h"
 
 /*

diff --git a/e2fsck/e2fsck.c b/e2fsck/e2fsck.c
index c80036e..7d09406 100644 (file)
--- a/e2fsck/e2fsck.c
+++ b/e2fsck/e2fsck.c
@@ -11,8 +11,6 @@
 
 #include <errno.h>
 
-#include "et/com_err.h"
-
 #include "e2fsck.h"
 #include "problem.h"
 

diff --git a/e2fsck/e2fsck.h b/e2fsck/e2fsck.h
index b8eeb1b..0ce5185 100644 (file)
--- a/e2fsck/e2fsck.h
+++ b/e2fsck/e2fsck.h
@@ -10,6 +10,7 @@
 #include <string.h>
 #include <unistd.h>
 #include <stdlib.h>
+#include <time.h>
 #ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>
 #endif

diff --git a/e2fsck/super.c b/e2fsck/super.c
index 5c9df00..cb16a25 100644 (file)
--- a/e2fsck/super.c
+++ b/e2fsck/super.c
@@ -26,7 +26,9 @@
 #include <mntent.h>
 #endif
 
+#ifndef EXT2_SKIP_UUID
 #include "uuid/uuid.h"
+#endif
 #include "e2fsck.h"
 #include "problem.h"
 #include "../version.h"
@@ -189,6 +191,7 @@ void check_super_block(e2fsck_t ctx)
                ext2fs_mark_super_dirty(fs);
        }
 
+#ifndef EXT2_SKIP_UUID
        /*
         * If the UUID field isn't assigned, assign it.
         */
@@ -199,6 +202,7 @@ void check_super_block(e2fsck_t ctx)
                        ext2fs_mark_super_dirty(fs);
                }
        }
+#endif
        return;
 }