Fix more spelling errors found by translators and add pluralization

[tools/e2fsprogs.git] / lib / ext2fs / brel_ma.c

diff --git a/lib/ext2fs/brel_ma.c b/lib/ext2fs/brel_ma.c
index 8913688..e8a8280 100644 (file)
--- a/lib/ext2fs/brel_ma.c
+++ b/lib/ext2fs/brel_ma.c
@@ -1,20 +1,20 @@
 /*
  * brel_ma.c
- * 
+ *
  * Copyright (C) 1996, 1997 Theodore Ts'o.
  *
  * TODO: rewrite to not use a direct array!!!  (Fortunately this
  * module isn't really used yet.)
  *
  * %Begin-Header%
- * This file may be redistributed under the terms of the GNU Public
- * License.
+ * This file may be redistributed under the terms of the GNU Library
+ * General Public License, version 2.
  * %End-Header%
  */
 
+#include "config.h"
 #include <fcntl.h>
 #include <stdio.h>
-#include <stdlib.h>
 #include <string.h>
 #if HAVE_UNISTD_H
 #include <unistd.h>
@@ -23,8 +23,7 @@
 #include <errno.h>
 #endif
 
-#include <linux/ext2_fs.h>
-
+#include "ext2_fs.h"
 #include "ext2fs.h"
 #include "brel.h"
 
@@ -58,27 +57,28 @@ errcode_t ext2fs_brel_memarray_create(char *name, blk_t max_block,
        /*
         * Allocate memory structures
         */
-       retval = EXT2_NO_MEMORY;
-       brel = malloc(sizeof(struct ext2_block_relocation_table));
-       if (!brel)
+       retval = ext2fs_get_mem(sizeof(struct ext2_block_relocation_table),
+                               &brel);
+       if (retval)
                goto errout;
        memset(brel, 0, sizeof(struct ext2_block_relocation_table));
-       
-       brel->name = malloc(strlen(name)+1);
-       if (!brel->name)
+
+       retval = ext2fs_get_mem(strlen(name)+1, &brel->name);
+       if (retval)
                goto errout;
        strcpy(brel->name, name);
-       
-       ma = malloc(sizeof(struct brel_ma));
-       if (!ma)
+
+       retval = ext2fs_get_mem(sizeof(struct brel_ma), &ma);
+       if (retval)
                goto errout;
        memset(ma, 0, sizeof(struct brel_ma));
-       brel->private = ma;
-       
+       brel->priv_data = ma;
+
        size = (size_t) (sizeof(struct ext2_block_relocate_entry) *
                         (max_block+1));
-       ma->entries = malloc(size);
-       if (!ma->entries)
+       retval = ext2fs_get_array(max_block+1,
+               sizeof(struct ext2_block_relocate_entry), &ma->entries);
+       if (retval)
                goto errout;
        memset(ma->entries, 0, size);
        ma->max_block = max_block;
@@ -93,7 +93,7 @@ errcode_t ext2fs_brel_memarray_create(char *name, blk_t max_block,
        brel->move = bma_move;
        brel->delete = bma_delete;
        brel->free = bma_free;
-       
+
        *new_brel = brel;
        return 0;
 
@@ -107,9 +107,9 @@ static errcode_t bma_put(ext2_brel brel, blk_t old,
 {
        struct brel_ma  *ma;
 
-       ma = brel->private;
+       ma = brel->priv_data;
        if (old > ma->max_block)
-               return EXT2_INVALID_ARGUMENT;
+               return EXT2_ET_INVALID_ARGUMENT;
        ma->entries[(unsigned)old] = *ent;
        return 0;
 }
@@ -119,9 +119,9 @@ static errcode_t bma_get(ext2_brel brel, blk_t old,
 {
        struct brel_ma  *ma;
 
-       ma = brel->private;
+       ma = brel->priv_data;
        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];
@@ -139,7 +139,7 @@ static errcode_t bma_next(ext2_brel brel, blk_t *old,
 {
        struct brel_ma  *ma;
 
-       ma = brel->private;
+       ma = brel->priv_data;
        while (++brel->current < ma->max_block) {
                if (ma->entries[(unsigned)brel->current].new == 0)
                        continue;
@@ -155,9 +155,9 @@ static errcode_t bma_move(ext2_brel brel, blk_t old, blk_t new)
 {
        struct brel_ma  *ma;
 
-       ma = brel->private;
+       ma = brel->priv_data;
        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];
@@ -169,9 +169,9 @@ static errcode_t bma_delete(ext2_brel brel, blk_t old)
 {
        struct brel_ma  *ma;
 
-       ma = brel->private;
+       ma = brel->priv_data;
        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;
@@ -185,15 +185,15 @@ static errcode_t bma_free(ext2_brel brel)
        if (!brel)
                return 0;
 
-       ma = brel->private;
+       ma = brel->priv_data;
 
        if (ma) {
                if (ma->entries)
-                       free (ma->entries);
-               free(ma);
+                       ext2fs_free_mem(&ma->entries);
+               ext2fs_free_mem(&ma);
        }
        if (brel->name)
-               free(brel->name);
-       free (brel);
+               ext2fs_free_mem(&brel->name);
+       ext2fs_free_mem(&brel);
        return 0;
 }