From 291c9049ba70bb6256099a066243cec1359c9c15 Mon Sep 17 00:00:00 2001 From: Theodore Ts'o Date: Fri, 31 Oct 1997 06:17:08 +0000 Subject: [PATCH] ext2fs.h, ext2_err.et.in, ChangeLog, pass1.c, pass3.c: Rename new error codes to _ET_ in them for consistency. ChangeLog, et_c.awk, et_h.awk: Remove support for non STDC compilers, since the workarounds caused problems with the header file. Makefile.pq: Checkpoint of powerquest work. --- e2fsck/ChangeLog | 5 +++++ e2fsck/Makefile.pq | 10 +++++++--- e2fsck/pass1.c | 2 +- e2fsck/pass3.c | 2 +- lib/et/ChangeLog | 5 +++++ lib/et/et_c.awk | 10 ++-------- lib/et/et_h.awk | 8 +------- lib/ext2fs/Makefile.pq | 10 +++++++--- lib/ext2fs/ext2_err.et.in | 32 ++++++++++++-------------------- lib/ext2fs/ext2fs.h | 4 ++-- resize/Makefile.pq | 11 ++++++++--- 11 files changed, 51 insertions(+), 48 deletions(-) diff --git a/e2fsck/ChangeLog b/e2fsck/ChangeLog index df30e50..aaa3ec4 100644 --- a/e2fsck/ChangeLog +++ b/e2fsck/ChangeLog @@ -1,3 +1,8 @@ +Fri Oct 31 01:12:43 1997 Theodore Ts'o + + * pass1.c, pass3.c: Rename new error codes to _ET_ in them for + consistency. + Sat Oct 25 00:10:58 1997 Theodore Ts'o * pass3.c (get_lost_and_found): Check error return of diff --git a/e2fsck/Makefile.pq b/e2fsck/Makefile.pq index f8e4618..a5e5b49 100644 --- a/e2fsck/Makefile.pq +++ b/e2fsck/Makefile.pq @@ -1,8 +1,12 @@ TOPSRC=.. - -!include $(TOPSRC)\powerquest\MCONFIG +LIBNAME=E2FSCK.LIB +OBJFILE=E2FSCK.LST OBJS= super.obj pass1.obj pass1b.obj pass2.obj pass3.obj pass4.obj \ pass5.obj -ALL: $(OBJS) +!include $(TOPSRC)\powerquest\MCONFIG + +ALL:: $(OBJS) + +!include $(TOPSRC)\powerquest\MAKEFILE.STD diff --git a/e2fsck/pass1.c b/e2fsck/pass1.c index 43ff878..6a2681a 100644 --- a/e2fsck/pass1.c +++ b/e2fsck/pass1.c @@ -1213,6 +1213,6 @@ errcode_t pass1_check_directory(ext2_filsys fs, ino_t ino) return EXT2_ET_CALLBACK_NOTHANDLED; if (!LINUX_S_ISDIR(ctx->stashed_inode->i_mode)) - return EXT2_NO_DIRECTORY; + return EXT2_ET_NO_DIRECTORY; return 0; } diff --git a/e2fsck/pass3.c b/e2fsck/pass3.c index 33541aa..48d3c7c 100644 --- a/e2fsck/pass3.c +++ b/e2fsck/pass3.c @@ -310,7 +310,7 @@ ino_t get_lost_and_found(e2fsck_t ctx) sizeof(name)-1, 0, &ino); if (!retval) return ino; - if (retval != EXT2_FILE_NOT_FOUND) { + if (retval != EXT2_ET_FILE_NOT_FOUND) { pctx.errcode = retval; fix_problem(ctx, PR_3_ERR_FIND_LPF, &pctx); } diff --git a/lib/et/ChangeLog b/lib/et/ChangeLog index b7c9e06..6b80c9a 100644 --- a/lib/et/ChangeLog +++ b/lib/et/ChangeLog @@ -1,3 +1,8 @@ +Fri Oct 31 01:14:41 1997 Theodore Ts'o + + * et_c.awk, et_h.awk: Remove support for non STDC compilers, since + the workarounds caused problems with the header file. + Sun Aug 10 09:40:54 1997 Theodore Ts'o * error_table.h: diff --git a/lib/et/et_c.awk b/lib/et/et_c.awk index e3d4c91..b1af92a 100644 --- a/lib/et/et_c.awk +++ b/lib/et/et_c.awk @@ -109,12 +109,6 @@ c2n["_"]=63 print " * This file is automatically generated; please do not edit it." > outfile print " */" > outfile - print "#ifdef __STDC__" > outfile - print "#define NOARGS void" > outfile - print "#else" > outfile - print "#define NOARGS" > outfile - print "#define const" > outfile - print "#endif" > outfile print "" > outfile print "static const char * const text[] = {" > outfile table_item_count = 0 @@ -171,9 +165,9 @@ END { print "" > outfile print "static struct et_list link = { 0, 0 };" > outfile print "" > outfile - print "void initialize_" table_name "_error_table (NOARGS);" > outfile + print "void initialize_" table_name "_error_table(void);" > outfile print "" > outfile - print "void initialize_" table_name "_error_table (NOARGS) {" > outfile + print "void initialize_" table_name "_error_table(void) {" > outfile print " if (!link.table) {" > outfile print " link.next = _et_list;" > outfile print " link.table = &et;" > outfile diff --git a/lib/et/et_h.awk b/lib/et/et_h.awk index d7688e9..c81a709 100644 --- a/lib/et/et_h.awk +++ b/lib/et/et_h.awk @@ -110,12 +110,6 @@ c2n["_"]=63 print " * " outfile ":" > outfile print " * This file is automatically generated; please do not edit it." > outfile print " */" > outfile - print "#ifdef __STDC__" > outfile - print "#define NOARGS void" > outfile - print "#else" > outfile - print "#define NOARGS" > outfile - print "#define const" > outfile - print "#endif" > outfile print "" > outfile } @@ -140,7 +134,7 @@ c2n["_"]=63 } END { - print "extern void initialize_" table_name "_error_table (NOARGS);" > outfile + print "extern void initialize_" table_name "_error_table(void);" > outfile if (tab_base_high == 0) { print "#define ERROR_TABLE_BASE_" table_name " (" \ sprintf("%d", tab_base_sign*tab_base_low) \ diff --git a/lib/ext2fs/Makefile.pq b/lib/ext2fs/Makefile.pq index 4569238..638c166 100644 --- a/lib/ext2fs/Makefile.pq +++ b/lib/ext2fs/Makefile.pq @@ -1,6 +1,6 @@ TOPSRC=..\.. - -!include $(TOPSRC)\powerquest\MCONFIG +LIBNAME=EXT2.LIB +OBJFILE=EXT2.LST OBJS= alloc.obj \ alloc_tables.obj \ @@ -46,4 +46,8 @@ OBJS= alloc.obj \ valid_blk.obj \ version.obj -ALL: $(OBJS) +!include $(TOPSRC)\powerquest\MCONFIG + +ALL:: $(OBJS) + +!include $(TOPSRC)\powerquest\MAKEFILE.STD diff --git a/lib/ext2fs/ext2_err.et.in b/lib/ext2fs/ext2_err.et.in index 3d4667c..80f5532 100644 --- a/lib/ext2fs/ext2_err.et.in +++ b/lib/ext2fs/ext2_err.et.in @@ -71,15 +71,6 @@ ec EXT2_ET_BAD_MAGIC, ec EXT2_ET_REV_TOO_HIGH, "Filesystem revision too high" -ec EXT2_ET_SB_LSEEK, - "Can't seek to superblock" - -ec EXT2_ET_SB_READ, - "Can't read superblock" - -ec EXT2_ET_SB_WRITE, - "Can't write superblock" - ec EXT2_ET_RO_FILSYS, "Attempt to write to filesystem opened read-only" @@ -224,37 +215,38 @@ ec EXT2_ET_UNSUPP_FEATURE, ec EXT2_ET_RO_UNSUPP_FEATURE, "Filesystem has unsupported read-only feature(s)" -ec EXT2_IO_LLSEEK_FAILED, +ec EXT2_ET_LLSEEK_FAILED, "IO Channel failed to seek on read or write" -ec EXT2_NO_MEMORY, +ec EXT2_ET_NO_MEMORY, "Memory allocation failed" -ec EXT2_INVALID_ARGUMENT, +ec EXT2_ET_INVALID_ARGUMENT, "Invalid argument passed to ext2 library" -ec EXT2_BLOCK_ALLOC_FAIL, +ec EXT2_ET_BLOCK_ALLOC_FAIL, "Could not allocate block in ext2 filesystem" -ec EXT2_INODE_ALLOC_FAIL, +ec EXT2_ET_INODE_ALLOC_FAIL, "Could not allocate inode in ext2 filesystem" -ec EXT2_NO_DIRECTORY, +ec EXT2_ET_NO_DIRECTORY, "Ext2 inode is not a directory" -ec EXT2_TOO_MANY_REFS, +ec EXT2_ET_TOO_MANY_REFS, "Too many references in table" -ec EXT2_FILE_NOT_FOUND, +ec EXT2_ET_FILE_NOT_FOUND, "File not found by ext2_lookup" -ec EXT2_FILE_RO, +ec EXT2_ET_FILE_RO, "File open read-only" -ec EXT2_DB_NOT_FOUND, +ec EXT2_ET_DB_NOT_FOUND, "Ext2 directory block not found" -ec EXT2_DIR_EXISTS, +ec EXT2_ET_DIR_EXISTS, "Ext2 directory already exists" end + diff --git a/lib/ext2fs/ext2fs.h b/lib/ext2fs/ext2fs.h index f06f6dc..41074b7 100644 --- a/lib/ext2fs/ext2fs.h +++ b/lib/ext2fs/ext2fs.h @@ -758,7 +758,7 @@ _INLINE_ errcode_t ext2fs_get_mem(long size, void **ptr) { *ptr = malloc(size); if (!*ptr) - return EXT2_NO_MEMORY; + return EXT2_ET_NO_MEMORY; return 0; } @@ -781,7 +781,7 @@ _INLINE_ errcode_t ext2fs_resize_mem(long size, void **ptr) p = realloc(*ptr, size); if (!p) - return EXT2_NO_MEMORY; + return EXT2_ET_NO_MEMORY; *ptr = p; return 0; } diff --git a/resize/Makefile.pq b/resize/Makefile.pq index 87ff252..c383c87 100644 --- a/resize/Makefile.pq +++ b/resize/Makefile.pq @@ -1,6 +1,6 @@ TOPSRC=.. - -!include $(TOPSRC)\powerquest\MCONFIG +LIBNAME=RESIZE.LIB +OBJFILE=RESIZE.LST OBJS= extent.obj \ ext2_block_move.obj \ @@ -8,4 +8,9 @@ OBJS= extent.obj \ resize2fs.obj \ sim_progress.obj -ALL: $(OBJS) +ALL:: $(OBJS) + +!include $(TOPSRC)\powerquest\MCONFIG + + +!include $(TOPSRC)\powerquest\MAKEFILE.STD -- 1.8.3.1