Whamcloud - gitweb
Use the newer add/remove_error_table com_err interfaces
authorTheodore Ts'o <tytso@mit.edu>
Tue, 26 Dec 2006 08:38:07 +0000 (03:38 -0500)
committerTheodore Ts'o <tytso@mit.edu>
Tue, 26 Dec 2006 08:38:07 +0000 (03:38 -0500)
Change all of the e2fsprogs programs to use the newer add_error_table()
and remove_error_table() interfaces instead of the much older
initialize_*_error_table() function.

Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
13 files changed:
debugfs/ChangeLog
debugfs/debugfs.c
e2fsck/ChangeLog
e2fsck/unix.c
misc/ChangeLog
misc/Makefile.in
misc/dumpe2fs.c
misc/e2image.c
misc/e2initrd_helper.c
misc/mke2fs.c
misc/tune2fs.c
resize/ChangeLog
resize/main.c

index 4a814b8..a67cd98 100644 (file)
@@ -1,3 +1,8 @@
+2006-12-22  Theodore Tso  <tytso@mit.edu>
+
+       * debugfs.c (main): Use the new {add,remove}_error_table comerr
+               interfaces instead of initialize_*_error_table.
+
 2006-11-12  Theodore Tso  <tytso@mit.edu>
 
        * debugfs.c (do_open_filesys, main): Open filesystems with the
index 2e30d67..cc99e81 100644 (file)
@@ -1801,7 +1801,7 @@ int main(int argc, char **argv)
        int             catastrophic = 0;
        char            *data_filename = 0;
        
-       initialize_ext2_error_table();
+       add_error_table(&et_ext2_error_table);
        fprintf (stderr, "debugfs %s (%s)\n", E2FSPROGS_VERSION,
                 E2FSPROGS_DATE);
 
@@ -1877,5 +1877,6 @@ int main(int argc, char **argv)
        if (current_fs)
                close_filesystem();
        
+       remove_error_table(&et_ext2_error_table);
        return exit_status;
 }
index 0ab7830..5abc2e6 100644 (file)
@@ -1,3 +1,8 @@
+2006-12-22  Theodore Tso  <tytso@mit.edu>
+
+       * unix.c (PRS, main): Use the new {add,remove}_error_table comerr
+               interfaces instead of initialize_*_error_table.
+
 2006-11-14  Theodore Tso  <tytso@mit.edu>
 
        * unix.c (PRS): Always allocate the replacement PATH environment
index 4f4c506..898bc33 100644 (file)
@@ -600,8 +600,8 @@ static errcode_t PRS(int argc, char *argv[], e2fsck_t *ret_ctx)
        }
        memset(bar, '=', sizeof(bar)-1);
        memset(spaces, ' ', sizeof(spaces)-1);
-       initialize_ext2_error_table();
-       initialize_prof_error_table();
+       add_error_table(&et_ext2_error_table);
+       add_error_table(&et_prof_error_table);
        blkid_get_cache(&ctx->blkid, NULL);
        
        if (argc && *argv)
@@ -1224,5 +1224,7 @@ restart:
                print_resource_track(NULL, &ctx->global_rtrack);
 #endif
        e2fsck_free_context(ctx);
+       remove_error_table(&et_ext2_error_table);
+       remove_error_table(&et_prof_error_table);
        return exit_value;
 }
index ead69fe..bdeaf23 100644 (file)
@@ -1,3 +1,11 @@
+2006-12-22  Theodore Tso  <tytso@mit.edu>
+
+       * tune2fs.c, mke2fs.c, e2initrd_helper.c, e2image.c, dumpe2fs.c:
+               Use the new {add,remove}_error_table comerr interfaces
+               instead of initialize_*_error_table.
+
+       * Makefile.in: Link in prof_err.o into mke2fs.
+
 2006-11-17  Theodore Tso  <tytso@mit.edu>
 
        * badblocks.c (exclusive_usage): Print the program name in the
index f1f67d9..8dcae2e 100644 (file)
@@ -29,7 +29,7 @@ LPROGS=               @E2INITRD_PROG@
 
 TUNE2FS_OBJS=  tune2fs.o util.o
 MKLPF_OBJS=    mklost+found.o
-MKE2FS_OBJS=   mke2fs.o util.o profile.o
+MKE2FS_OBJS=   mke2fs.o util.o profile.o prof_err.o
 CHATTR_OBJS=   chattr.o
 LSATTR_OBJS=   lsattr.o
 UUIDGEN_OBJS=  uuidgen.o
@@ -364,14 +364,15 @@ distclean: clean
 #
 tune2fs.o: $(srcdir)/tune2fs.c $(top_srcdir)/lib/ext2fs/ext2_fs.h \
  $(top_builddir)/lib/ext2fs/ext2_types.h $(top_srcdir)/lib/ext2fs/ext2fs.h \
- $(top_srcdir)/lib/ext2fs/ext2_fs.h $(top_srcdir)/lib/et/com_err.h \
- $(top_srcdir)/lib/ext2fs/ext2_io.h $(top_builddir)/lib/ext2fs/ext2_err.h \
- $(top_srcdir)/lib/ext2fs/bitops.h $(top_srcdir)/lib/uuid/uuid.h \
- $(top_srcdir)/lib/e2p/e2p.h $(srcdir)/jfs_user.h \
- $(top_srcdir)/lib/ext2fs/kernel-jbd.h $(top_srcdir)/lib/ext2fs/jfs_compat.h \
- $(top_srcdir)/lib/ext2fs/kernel-list.h $(srcdir)/util.h \
- $(top_srcdir)/lib/blkid/blkid.h $(top_builddir)/lib/blkid/blkid_types.h \
- $(top_srcdir)/version.h $(srcdir)/nls-enable.h
+ $(top_srcdir)/lib/ext2fs/ext2_fs.h $(top_srcdir)/lib/ext2fs/ext3_extents.h \
+ $(top_srcdir)/lib/et/com_err.h $(top_srcdir)/lib/ext2fs/ext2_io.h \
+ $(top_builddir)/lib/ext2fs/ext2_err.h $(top_srcdir)/lib/ext2fs/bitops.h \
+ $(top_srcdir)/lib/uuid/uuid.h $(top_srcdir)/lib/e2p/e2p.h \
+ $(srcdir)/jfs_user.h $(top_srcdir)/lib/ext2fs/kernel-jbd.h \
+ $(top_srcdir)/lib/ext2fs/jfs_compat.h $(top_srcdir)/lib/ext2fs/kernel-list.h \
+ $(srcdir)/util.h $(top_srcdir)/lib/blkid/blkid.h \
+ $(top_builddir)/lib/blkid/blkid_types.h $(top_srcdir)/version.h \
+ $(srcdir)/nls-enable.h
 mklost+found.o: $(srcdir)/mklost+found.c $(top_srcdir)/lib/ext2fs/ext2_fs.h \
  $(top_builddir)/lib/ext2fs/ext2_types.h $(top_srcdir)/version.h \
  $(srcdir)/nls-enable.h
@@ -379,9 +380,10 @@ mke2fs.o: $(srcdir)/mke2fs.c $(top_srcdir)/lib/ext2fs/ext2_fs.h \
  $(top_builddir)/lib/ext2fs/ext2_types.h $(top_srcdir)/lib/et/com_err.h \
  $(top_srcdir)/lib/uuid/uuid.h $(top_srcdir)/lib/e2p/e2p.h \
  $(top_srcdir)/lib/ext2fs/ext2_fs.h $(top_srcdir)/lib/ext2fs/ext2fs.h \
- $(top_srcdir)/lib/et/com_err.h $(top_srcdir)/lib/ext2fs/ext2_io.h \
- $(top_builddir)/lib/ext2fs/ext2_err.h $(top_srcdir)/lib/ext2fs/bitops.h \
- $(srcdir)/util.h $(srcdir)/../e2fsck/profile.h $(top_srcdir)/version.h \
+ $(top_srcdir)/lib/ext2fs/ext3_extents.h $(top_srcdir)/lib/et/com_err.h \
+ $(top_srcdir)/lib/ext2fs/ext2_io.h $(top_builddir)/lib/ext2fs/ext2_err.h \
+ $(top_srcdir)/lib/ext2fs/bitops.h $(srcdir)/util.h \
+ $(srcdir)/../e2fsck/profile.h prof_err.h $(top_srcdir)/version.h \
  $(srcdir)/nls-enable.h
 chattr.o: $(srcdir)/chattr.c $(top_srcdir)/lib/ext2fs/ext2_fs.h \
  $(top_builddir)/lib/ext2fs/ext2_types.h $(top_srcdir)/lib/et/com_err.h \
@@ -393,28 +395,31 @@ lsattr.o: $(srcdir)/lsattr.c $(top_srcdir)/lib/ext2fs/ext2_fs.h \
  $(top_srcdir)/version.h $(srcdir)/nls-enable.h
 dumpe2fs.o: $(srcdir)/dumpe2fs.c $(top_srcdir)/lib/ext2fs/ext2_fs.h \
  $(top_builddir)/lib/ext2fs/ext2_types.h $(top_srcdir)/lib/ext2fs/ext2fs.h \
- $(top_srcdir)/lib/ext2fs/ext2_fs.h $(top_srcdir)/lib/et/com_err.h \
- $(top_srcdir)/lib/ext2fs/ext2_io.h $(top_builddir)/lib/ext2fs/ext2_err.h \
- $(top_srcdir)/lib/ext2fs/bitops.h $(top_srcdir)/lib/e2p/e2p.h \
- $(srcdir)/jfs_user.h $(top_srcdir)/lib/ext2fs/kernel-jbd.h \
- $(top_srcdir)/lib/ext2fs/jfs_compat.h $(top_srcdir)/lib/ext2fs/kernel-list.h \
- $(top_srcdir)/lib/uuid/uuid.h $(top_srcdir)/version.h $(srcdir)/nls-enable.h
+ $(top_srcdir)/lib/ext2fs/ext2_fs.h $(top_srcdir)/lib/ext2fs/ext3_extents.h \
+ $(top_srcdir)/lib/et/com_err.h $(top_srcdir)/lib/ext2fs/ext2_io.h \
+ $(top_builddir)/lib/ext2fs/ext2_err.h $(top_srcdir)/lib/ext2fs/bitops.h \
+ $(top_srcdir)/lib/e2p/e2p.h $(srcdir)/jfs_user.h \
+ $(top_srcdir)/lib/ext2fs/kernel-jbd.h $(top_srcdir)/lib/ext2fs/jfs_compat.h \
+ $(top_srcdir)/lib/ext2fs/kernel-list.h $(top_srcdir)/lib/uuid/uuid.h \
+ $(top_srcdir)/version.h $(srcdir)/nls-enable.h
 badblocks.o: $(srcdir)/badblocks.c $(top_srcdir)/lib/et/com_err.h \
  $(top_srcdir)/lib/ext2fs/ext2_io.h $(top_srcdir)/lib/ext2fs/ext2_fs.h \
  $(top_builddir)/lib/ext2fs/ext2_types.h $(top_srcdir)/lib/ext2fs/ext2fs.h \
- $(top_srcdir)/lib/ext2fs/ext2_fs.h $(top_srcdir)/lib/et/com_err.h \
- $(top_srcdir)/lib/ext2fs/ext2_io.h $(top_builddir)/lib/ext2fs/ext2_err.h \
- $(top_srcdir)/lib/ext2fs/bitops.h $(srcdir)/nls-enable.h
+ $(top_srcdir)/lib/ext2fs/ext2_fs.h $(top_srcdir)/lib/ext2fs/ext3_extents.h \
+ $(top_srcdir)/lib/et/com_err.h $(top_srcdir)/lib/ext2fs/ext2_io.h \
+ $(top_builddir)/lib/ext2fs/ext2_err.h $(top_srcdir)/lib/ext2fs/bitops.h \
+ $(srcdir)/nls-enable.h
 fsck.o: $(srcdir)/fsck.c $(top_srcdir)/version.h $(srcdir)/nls-enable.h \
  $(srcdir)/fsck.h $(top_srcdir)/lib/blkid/blkid.h \
  $(top_builddir)/lib/blkid/blkid_types.h
 util.o: $(srcdir)/util.c $(top_srcdir)/lib/et/com_err.h \
  $(top_srcdir)/lib/e2p/e2p.h $(top_srcdir)/lib/ext2fs/ext2_fs.h \
  $(top_builddir)/lib/ext2fs/ext2_types.h $(top_srcdir)/lib/ext2fs/ext2fs.h \
- $(top_srcdir)/lib/et/com_err.h $(top_srcdir)/lib/ext2fs/ext2_io.h \
- $(top_builddir)/lib/ext2fs/ext2_err.h $(top_srcdir)/lib/ext2fs/bitops.h \
- $(srcdir)/nls-enable.h $(top_srcdir)/lib/blkid/blkid.h \
- $(top_builddir)/lib/blkid/blkid_types.h $(srcdir)/util.h
+ $(top_srcdir)/lib/ext2fs/ext3_extents.h $(top_srcdir)/lib/et/com_err.h \
+ $(top_srcdir)/lib/ext2fs/ext2_io.h $(top_builddir)/lib/ext2fs/ext2_err.h \
+ $(top_srcdir)/lib/ext2fs/bitops.h $(srcdir)/nls-enable.h \
+ $(top_srcdir)/lib/blkid/blkid.h $(top_builddir)/lib/blkid/blkid_types.h \
+ $(srcdir)/util.h
 uuidgen.o: $(srcdir)/uuidgen.c $(top_srcdir)/lib/uuid/uuid.h \
  $(srcdir)/nls-enable.h
 blkid.o: $(srcdir)/blkid.c $(top_srcdir)/lib/blkid/blkid.h \
index fe3b50b..fcae0f0 100644 (file)
@@ -343,7 +343,7 @@ int main (int argc, char ** argv)
        bindtextdomain(NLS_CAT_NAME, LOCALEDIR);
        textdomain(NLS_CAT_NAME);
 #endif
-       initialize_ext2_error_table();
+       add_error_table(&et_ext2_error_table);
        fprintf (stderr, "dumpe2fs %s (%s)\n", E2FSPROGS_VERSION,
                 E2FSPROGS_DATE);
        if (argc && *argv)
@@ -435,5 +435,6 @@ int main (int argc, char ** argv)
                }
        }
        ext2fs_close (fs);
+       remove_error_table(&et_ext2_error_table);
        exit (0);
 }
index 5bbc49b..a6c42fb 100644 (file)
@@ -628,7 +628,7 @@ int main (int argc, char ** argv)
                 E2FSPROGS_DATE);
        if (argc && *argv)
                program_name = *argv;
-       initialize_ext2_error_table();
+       add_error_table(&et_ext2_error_table);
        while ((c = getopt (argc, argv, "rsI")) != EOF)
                switch (c) {
                case 'r':
@@ -683,5 +683,6 @@ int main (int argc, char ** argv)
                write_image_file(fs, fd);
 
        ext2fs_close (fs);
+       remove_error_table(&et_ext2_error_table);
        exit (0);
 }
index 2600190..8b8a00c 100644 (file)
@@ -364,7 +364,7 @@ int main (int argc, char ** argv)
        ext2_filsys fs;
        io_manager io_ptr;
 
-       initialize_ext2_error_table();
+       add_error_table(&et_ext2_error_table);
 
        blkid_get_cache(&cache, NULL);
        PRS(argc, argv);
@@ -382,5 +382,6 @@ int main (int argc, char ** argv)
        if (root_type) 
                get_root_type(fs);
 
+       remove_error_table(&et_ext2_error_table);
        return (ext2fs_close (fs) ? 1 : 0);
 }
index 80a40ac..2e72dca 100644 (file)
@@ -52,6 +52,7 @@ extern int optind;
 #include "ext2fs/ext2fs.h"
 #include "util.h"
 #include "profile.h"
+#include "prof_err.h"
 #include "../version.h"
 #include "nls-enable.h"
 
@@ -952,7 +953,8 @@ static void PRS(int argc, char *argv[])
        
        setbuf(stdout, NULL);
        setbuf(stderr, NULL);
-       initialize_ext2_error_table();
+       add_error_table(&et_ext2_error_table);
+       add_error_table(&et_prof_error_table);
        memset(&fs_param, 0, sizeof(struct ext2_super_block));
        fs_param.s_rev_level = 1;  /* Create revision 1 filesystems now */
 
@@ -1729,5 +1731,7 @@ no_journal:
                        print_check_message(fs);
        }
        val = ext2fs_close(fs);
+       remove_error_table(&et_ext2_error_table);
+       remove_error_table(&et_prof_error_table);
        return (retval || val) ? 1 : 0;
 }
index d5b9eb3..967b589 100644 (file)
@@ -755,7 +755,7 @@ int main (int argc, char ** argv)
 #endif
        if (argc && *argv)
                program_name = *argv;
-       initialize_ext2_error_table();
+       add_error_table(&et_ext2_error_table);
 
        if (strcmp(get_progname(argv[0]), "findfs") == 0)
                do_findfs(argc, argv);
@@ -784,6 +784,7 @@ int main (int argc, char ** argv)
                /* For e2label emulation */
                printf("%.*s\n", (int) sizeof(sb->s_volume_name),
                       sb->s_volume_name);
+               remove_error_table(&et_ext2_error_table);
                exit(0);
        }
        retval = ext2fs_check_if_mounted(device_name, &mount_flags);
@@ -920,5 +921,6 @@ int main (int argc, char ** argv)
 
        if (l_flag)
                list_super (sb);
+       remove_error_table(&et_ext2_error_table);
        return (ext2fs_close (fs) ? 1 : 0);
 }
index ee61c72..e12c00d 100644 (file)
@@ -1,3 +1,8 @@
+2006-12-22  Theodore Tso  <tytso@mit.edu>
+
+       * main.c (main): Use the new {add,remove}_error_table comerr
+               interfaces instead of initialize_*_error_table.
+
 2006-10-01  Theodore Tso  <tytso@mit.edu>
 
        * online.c (online_resize_fs): Check to make sure the filesystem
index 537c9a6..e71bbde 100644 (file)
@@ -171,7 +171,7 @@ int main (int argc, char ** argv)
        textdomain(NLS_CAT_NAME);
 #endif
 
-       initialize_ext2_error_table();
+       add_error_table(&et_ext2_error_table);
 
        fprintf (stderr, "resize2fs %s (%s)\n",
                 E2FSPROGS_VERSION, E2FSPROGS_DATE);
@@ -415,5 +415,6 @@ int main (int argc, char ** argv)
        }
        if (fd > 0)
                close(fd);
+       remove_error_table(&et_ext2_error_table);
        return (0);
 }