Many files:
Rename new error codes to have _ET_ in them for consistency.
diff --git a/lib/ext2fs/ChangeLog b/lib/ext2fs/ChangeLog
index 9102d0b..60086a0 100644
--- a/lib/ext2fs/ChangeLog
+++ b/lib/ext2fs/ChangeLog
@@ -1,3 +1,7 @@
+Thu Oct 30 11:33:57 1997 Theodore Ts'o <tytso@rsts-11.mit.edu>
+
+ * Rename new error codes to _ET_ in them for consistency.
+
Sat Oct 25 00:06:58 1997 Theodore Ts'o <tytso@rsts-11.mit.edu>
* [all files, basically]: Added definition of ext2fs_get_mem,
diff --git a/lib/ext2fs/alloc.c b/lib/ext2fs/alloc.c
index 104d468..123860c 100644
--- a/lib/ext2fs/alloc.c
+++ b/lib/ext2fs/alloc.c
@@ -65,7 +65,7 @@
} while (i != start_inode);
if (ext2fs_test_inode_bitmap(map, i))
- return EXT2_INODE_ALLOC_FAIL;
+ return EXT2_ET_INODE_ALLOC_FAIL;
*ret = i;
return 0;
}
@@ -97,7 +97,7 @@
if (i >= fs->super->s_blocks_count)
i = fs->super->s_first_data_block;
} while (i != goal);
- return EXT2_BLOCK_ALLOC_FAIL;
+ return EXT2_ET_BLOCK_ALLOC_FAIL;
}
/*
@@ -175,6 +175,6 @@
}
b++;
} while (b != finish);
- return EXT2_BLOCK_ALLOC_FAIL;
+ return EXT2_ET_BLOCK_ALLOC_FAIL;
}
diff --git a/lib/ext2fs/bmove.c b/lib/ext2fs/bmove.c
index 4840821..6972257 100644
--- a/lib/ext2fs/bmove.c
+++ b/lib/ext2fs/bmove.c
@@ -53,7 +53,7 @@
if (++block >= fs->super->s_blocks_count)
block = fs->super->s_first_data_block;
if (block == orig) {
- pb->error = EXT2_BLOCK_ALLOC_FAIL;
+ pb->error = EXT2_ET_BLOCK_ALLOC_FAIL;
return BLOCK_ABORT;
}
} while (ext2fs_test_block_bitmap(pb->reserve, block) ||
diff --git a/lib/ext2fs/brel_ma.c b/lib/ext2fs/brel_ma.c
index ba44ce2..3f82a29 100644
--- a/lib/ext2fs/brel_ma.c
+++ b/lib/ext2fs/brel_ma.c
@@ -109,7 +109,7 @@
ma = brel->private;
if (old > ma->max_block)
- return EXT2_INVALID_ARGUMENT;
+ return EXT2_ET_INVALID_ARGUMENT;
ma->entries[(unsigned)old] = *ent;
return 0;
}
@@ -121,7 +121,7 @@
ma = brel->private;
if (old > ma->max_block)
- return EXT2_INVALID_ARGUMENT;
+ return EXT2_ET_INVALID_ARGUMENT;
if (ma->entries[(unsigned)old].new == 0)
return ENOENT;
*ent = ma->entries[old];
@@ -157,7 +157,7 @@
ma = brel->private;
if ((old > ma->max_block) || (new > ma->max_block))
- return EXT2_INVALID_ARGUMENT;
+ return EXT2_ET_INVALID_ARGUMENT;
if (ma->entries[(unsigned)old].new == 0)
return ENOENT;
ma->entries[(unsigned)new] = ma->entries[old];
@@ -171,7 +171,7 @@
ma = brel->private;
if (old > ma->max_block)
- return EXT2_INVALID_ARGUMENT;
+ return EXT2_ET_INVALID_ARGUMENT;
if (ma->entries[(unsigned)old].new == 0)
return ENOENT;
ma->entries[(unsigned)old].new = 0;
diff --git a/lib/ext2fs/closefs.c b/lib/ext2fs/closefs.c
index 6ef9706..4a880e8 100644
--- a/lib/ext2fs/closefs.c
+++ b/lib/ext2fs/closefs.c
@@ -70,7 +70,7 @@
fs->super->s_wtime = time(NULL);
if (fs->flags & EXT2_FLAG_SWAP_BYTES) {
- retval = EXT2_NO_MEMORY;
+ retval = EXT2_ET_NO_MEMORY;
retval = ext2fs_get_mem(SUPERBLOCK_SIZE,
(void **) &super_shadow);
if (retval)
diff --git a/lib/ext2fs/dblist.c b/lib/ext2fs/dblist.c
index dd4993a..cdf1bef 100644
--- a/lib/ext2fs/dblist.c
+++ b/lib/ext2fs/dblist.c
@@ -191,7 +191,7 @@
dblist->sorted = 0;
return 0;
}
- return EXT2_DB_NOT_FOUND;
+ return EXT2_ET_DB_NOT_FOUND;
}
/*
diff --git a/lib/ext2fs/fileio.c b/lib/ext2fs/fileio.c
index 9165826..ffb11ef 100644
--- a/lib/ext2fs/fileio.c
+++ b/lib/ext2fs/fileio.c
@@ -212,7 +212,7 @@
fs = file->fs;
if (!(file->flags & EXT2_FILE_WRITE))
- return EXT2_FILE_RO;
+ return EXT2_ET_FILE_RO;
again:
b = file->pos / fs->blocksize;
@@ -274,7 +274,7 @@
else if (whence == EXT2_SEEK_END)
file->pos = file->inode.i_size + offset;
else
- return EXT2_INVALID_ARGUMENT;
+ return EXT2_ET_INVALID_ARGUMENT;
if (ret_pos)
*ret_pos = file->pos;
diff --git a/lib/ext2fs/get_pathname.c b/lib/ext2fs/get_pathname.c
index 9b5ce26..baa9af8 100644
--- a/lib/ext2fs/get_pathname.c
+++ b/lib/ext2fs/get_pathname.c
@@ -57,7 +57,7 @@
retval = ext2fs_get_mem(dirent->name_len + 1,
(void **) &gp->name);
if (!gp->name) {
- gp->errcode = EXT2_NO_MEMORY;
+ gp->errcode = EXT2_ET_NO_MEMORY;
return DIRENT_ABORT;
}
strncpy(gp->name, dirent->name, dirent->name_len);
diff --git a/lib/ext2fs/icount.c b/lib/ext2fs/icount.c
index f321e68..56e5013 100644
--- a/lib/ext2fs/icount.c
+++ b/lib/ext2fs/icount.c
@@ -280,14 +280,14 @@
if (icount->count > icount->size) {
fprintf(out, "%s: count > size\n", bad);
- return EXT2_INVALID_ARGUMENT;
+ return EXT2_ET_INVALID_ARGUMENT;
}
for (i=1; i < icount->count; i++) {
if (icount->list[i-1].ino >= icount->list[i].ino) {
fprintf(out, "%s: list[%d].ino=%ld, list[%d].ino=%ld\n",
bad, i-1, icount->list[i-1].ino,
i, icount->list[i].ino);
- ret = EXT2_INVALID_ARGUMENT;
+ ret = EXT2_ET_INVALID_ARGUMENT;
}
}
return ret;
@@ -300,7 +300,7 @@
EXT2_CHECK_MAGIC(icount, EXT2_ET_MAGIC_ICOUNT);
if (!ino || (ino > icount->num_inodes))
- return EXT2_INVALID_ARGUMENT;
+ return EXT2_ET_INVALID_ARGUMENT;
if (ext2fs_test_inode_bitmap(icount->single, ino)) {
*ret = 1;
@@ -328,7 +328,7 @@
EXT2_CHECK_MAGIC(icount, EXT2_ET_MAGIC_ICOUNT);
if (!ino || (ino > icount->num_inodes))
- return EXT2_INVALID_ARGUMENT;
+ return EXT2_ET_INVALID_ARGUMENT;
if (ext2fs_test_inode_bitmap(icount->single, ino)) {
/*
@@ -337,7 +337,7 @@
*/
el = get_icount_el(icount, ino, 1);
if (!el)
- return EXT2_NO_MEMORY;
+ return EXT2_ET_NO_MEMORY;
ext2fs_unmark_inode_bitmap(icount->single, ino);
el->count = 2;
} else if (icount->multiple) {
@@ -350,7 +350,7 @@
if (ext2fs_test_inode_bitmap(icount->multiple, ino)) {
el = get_icount_el(icount, ino, 1);
if (!el)
- return EXT2_NO_MEMORY;
+ return EXT2_ET_NO_MEMORY;
el->count++;
} else {
/*
@@ -375,7 +375,7 @@
}
el = get_icount_el(icount, ino, 1);
if (!el)
- return EXT2_NO_MEMORY;
+ return EXT2_ET_NO_MEMORY;
el->count++;
}
if (icount->multiple)
@@ -391,7 +391,7 @@
struct ext2_icount_el *el;
if (!ino || (ino > icount->num_inodes))
- return EXT2_INVALID_ARGUMENT;
+ return EXT2_ET_INVALID_ARGUMENT;
EXT2_CHECK_MAGIC(icount, EXT2_ET_MAGIC_ICOUNT);
@@ -411,11 +411,11 @@
if (icount->multiple &&
!ext2fs_test_inode_bitmap(icount->multiple, ino))
- return EXT2_INVALID_ARGUMENT;
+ return EXT2_ET_INVALID_ARGUMENT;
el = get_icount_el(icount, ino, 0);
if (!el || el->count == 0)
- return EXT2_INVALID_ARGUMENT;
+ return EXT2_ET_INVALID_ARGUMENT;
el->count--;
if (el->count == 1)
@@ -434,7 +434,7 @@
struct ext2_icount_el *el;
if (!ino || (ino > icount->num_inodes))
- return EXT2_INVALID_ARGUMENT;
+ return EXT2_ET_INVALID_ARGUMENT;
EXT2_CHECK_MAGIC(icount, EXT2_ET_MAGIC_ICOUNT);
@@ -465,7 +465,7 @@
*/
el = get_icount_el(icount, ino, 1);
if (!el)
- return EXT2_NO_MEMORY;
+ return EXT2_ET_NO_MEMORY;
el->count = count;
ext2fs_unmark_inode_bitmap(icount->single, ino);
if (icount->multiple)
diff --git a/lib/ext2fs/initialize.c b/lib/ext2fs/initialize.c
index 5c7fb32..1fcff19 100644
--- a/lib/ext2fs/initialize.c
+++ b/lib/ext2fs/initialize.c
@@ -70,7 +70,7 @@
char *buf;
if (!param || !param->s_blocks_count)
- return EXT2_INVALID_ARGUMENT;
+ return EXT2_ET_INVALID_ARGUMENT;
retval = ext2fs_get_mem(sizeof(struct struct_ext2_filsys),
(void **) &fs);
@@ -139,7 +139,7 @@
super->s_blocks_count = param->s_blocks_count;
super->s_r_blocks_count = param->s_r_blocks_count;
if (super->s_r_blocks_count >= param->s_blocks_count) {
- retval = EXT2_INVALID_ARGUMENT;
+ retval = EXT2_ET_INVALID_ARGUMENT;
goto cleanup;
}
diff --git a/lib/ext2fs/inode.c b/lib/ext2fs/inode.c
index cec4341..8695ff0 100644
--- a/lib/ext2fs/inode.c
+++ b/lib/ext2fs/inode.c
@@ -648,7 +648,7 @@
if (retval)
return retval;
if (!LINUX_S_ISDIR(inode.i_mode))
- return EXT2_NO_DIRECTORY;
+ return EXT2_ET_NO_DIRECTORY;
return 0;
}
diff --git a/lib/ext2fs/irel_ma.c b/lib/ext2fs/irel_ma.c
index be29853..6ff816b 100644
--- a/lib/ext2fs/irel_ma.c
+++ b/lib/ext2fs/irel_ma.c
@@ -145,7 +145,7 @@
ma = irel->private;
if (old > ma->max_inode)
- return EXT2_INVALID_ARGUMENT;
+ return EXT2_ET_INVALID_ARGUMENT;
/*
* Force the orig field to the correct value; the application
@@ -180,7 +180,7 @@
ma = irel->private;
if (old > ma->max_inode)
- return EXT2_INVALID_ARGUMENT;
+ return EXT2_ET_INVALID_ARGUMENT;
if (ma->entries[(unsigned) old].new == 0)
return ENOENT;
*ent = ma->entries[(unsigned) old];
@@ -195,7 +195,7 @@
ma = irel->private;
if (orig > ma->max_inode)
- return EXT2_INVALID_ARGUMENT;
+ return EXT2_ET_INVALID_ARGUMENT;
ino = ma->orig_map[(unsigned) orig];
if (ino == 0)
return ENOENT;
@@ -238,7 +238,7 @@
ma = irel->private;
if (ino > ma->max_inode)
- return EXT2_INVALID_ARGUMENT;
+ return EXT2_ET_INVALID_ARGUMENT;
ref_ent = ma->ref_entries + (unsigned) ino;
ent = ma->entries + (unsigned) ino;
@@ -257,7 +257,7 @@
}
if (ref_ent->num >= ent->max_refs)
- return EXT2_TOO_MANY_REFS;
+ return EXT2_ET_TOO_MANY_REFS;
ref_ent->refs[(unsigned) ref_ent->num++] = *ref;
return 0;
@@ -269,7 +269,7 @@
ma = irel->private;
if (ino > ma->max_inode)
- return EXT2_INVALID_ARGUMENT;
+ return EXT2_ET_INVALID_ARGUMENT;
if (ma->entries[(unsigned) ino].new == 0)
return ENOENT;
ma->ref_current = ino;
@@ -304,7 +304,7 @@
ma = irel->private;
if ((old > ma->max_inode) || (new > ma->max_inode))
- return EXT2_INVALID_ARGUMENT;
+ return EXT2_ET_INVALID_ARGUMENT;
if (ma->entries[(unsigned) old].new == 0)
return ENOENT;
@@ -327,7 +327,7 @@
ma = irel->private;
if (old > ma->max_inode)
- return EXT2_INVALID_ARGUMENT;
+ return EXT2_ET_INVALID_ARGUMENT;
if (ma->entries[(unsigned) old].new == 0)
return ENOENT;
diff --git a/lib/ext2fs/llseek.c b/lib/ext2fs/llseek.c
index 46b82e7..9829444 100644
--- a/lib/ext2fs/llseek.c
+++ b/lib/ext2fs/llseek.c
@@ -114,7 +114,7 @@
{
if ((sizeof(off_t) < sizeof(ext2_loff_t)) &&
(offset >= ((ext2_loff_t) 1 << ((sizeof(off_t)*8) -1)))) {
- errno = EXT2_INVALID_ARGUMENT;
+ errno = EXT2_ET_INVALID_ARGUMENT;
return -1;
}
return lseek (fd, (off_t) offset, origin);
diff --git a/lib/ext2fs/lookup.c b/lib/ext2fs/lookup.c
index 7f17afa..364f2a2 100644
--- a/lib/ext2fs/lookup.c
+++ b/lib/ext2fs/lookup.c
@@ -65,7 +65,7 @@
if (retval)
return retval;
- return (ls.found) ? 0 : EXT2_FILE_NOT_FOUND;
+ return (ls.found) ? 0 : EXT2_ET_FILE_NOT_FOUND;
}
diff --git a/lib/ext2fs/mkdir.c b/lib/ext2fs/mkdir.c
index 72d1942..9348cb7 100644
--- a/lib/ext2fs/mkdir.c
+++ b/lib/ext2fs/mkdir.c
@@ -107,11 +107,11 @@
retval = ext2fs_lookup(fs, parent, name, strlen(name), 0,
&scratch_ino);
if (!retval) {
- retval = EXT2_DIR_EXISTS;
+ retval = EXT2_ET_DIR_EXISTS;
name = 0;
goto cleanup;
}
- if (retval != EXT2_FILE_NOT_FOUND)
+ if (retval != EXT2_ET_FILE_NOT_FOUND)
goto cleanup;
retval = ext2fs_link(fs, parent, name, ino, 0);
if (retval)
diff --git a/lib/ext2fs/openfs.c b/lib/ext2fs/openfs.c
index 582af19..26c7f7b 100644
--- a/lib/ext2fs/openfs.c
+++ b/lib/ext2fs/openfs.c
@@ -82,7 +82,7 @@
*/
if (superblock) {
if (!block_size) {
- retval = EXT2_INVALID_ARGUMENT;
+ retval = EXT2_ET_INVALID_ARGUMENT;
goto cleanup;
}
io_channel_set_blksize(fs->io, block_size);
diff --git a/lib/ext2fs/rs_bitmap.c b/lib/ext2fs/rs_bitmap.c
index 60d0307..aee4725 100644
--- a/lib/ext2fs/rs_bitmap.c
+++ b/lib/ext2fs/rs_bitmap.c
@@ -36,7 +36,7 @@
__u32 bitno;
if (!bmap)
- return EXT2_INVALID_ARGUMENT;
+ return EXT2_ET_INVALID_ARGUMENT;
EXT2_CHECK_MAGIC(bmap, EXT2_ET_MAGIC_GENERIC_BITMAP);
@@ -76,7 +76,7 @@
errcode_t retval;
if (!bmap)
- return EXT2_INVALID_ARGUMENT;
+ return EXT2_ET_INVALID_ARGUMENT;
EXT2_CHECK_MAGIC(bmap, EXT2_ET_MAGIC_INODE_BITMAP);
@@ -93,7 +93,7 @@
errcode_t retval;
if (!bmap)
- return EXT2_INVALID_ARGUMENT;
+ return EXT2_ET_INVALID_ARGUMENT;
EXT2_CHECK_MAGIC(bmap, EXT2_ET_MAGIC_BLOCK_BITMAP);
diff --git a/lib/ext2fs/test_io.c b/lib/ext2fs/test_io.c
index 9c1126c..e2fe1cc 100644
--- a/lib/ext2fs/test_io.c
+++ b/lib/ext2fs/test_io.c
@@ -94,7 +94,7 @@
retval = ext2fs_get_mem(sizeof(struct test_private_data),
(void **) &data);
if (retval) {
- retval = EXT2_NO_MEMORY;
+ retval = EXT2_ET_NO_MEMORY;
goto cleanup;
}
io->manager = test_io_manager;