aboutsummaryrefslogtreecommitdiff
path: root/e2fsprogs/old_e2fsprogs/blkid
diff options
context:
space:
mode:
Diffstat (limited to 'e2fsprogs/old_e2fsprogs/blkid')
-rw-r--r--e2fsprogs/old_e2fsprogs/blkid/cache.c3
-rw-r--r--e2fsprogs/old_e2fsprogs/blkid/dev.c3
-rw-r--r--e2fsprogs/old_e2fsprogs/blkid/tag.c3
3 files changed, 3 insertions, 6 deletions
diff --git a/e2fsprogs/old_e2fsprogs/blkid/cache.c b/e2fsprogs/old_e2fsprogs/blkid/cache.c
index 9bae6fb67..d1d29146b 100644
--- a/e2fsprogs/old_e2fsprogs/blkid/cache.c
+++ b/e2fsprogs/old_e2fsprogs/blkid/cache.c
@@ -35,8 +35,7 @@ int blkid_get_cache(blkid_cache *ret_cache, const char *filename)
DBG(DEBUG_CACHE, printf("creating blkid cache (using %s)\n",
filename ? filename : "default cache"));
- if (!(cache = (blkid_cache) calloc(1, sizeof(struct blkid_struct_cache))))
- return -BLKID_ERR_MEM;
+ cache = xzalloc(sizeof(struct blkid_struct_cache));
INIT_LIST_HEAD(&cache->bic_devs);
INIT_LIST_HEAD(&cache->bic_tags);
diff --git a/e2fsprogs/old_e2fsprogs/blkid/dev.c b/e2fsprogs/old_e2fsprogs/blkid/dev.c
index f6503f179..bb0cc914a 100644
--- a/e2fsprogs/old_e2fsprogs/blkid/dev.c
+++ b/e2fsprogs/old_e2fsprogs/blkid/dev.c
@@ -20,8 +20,7 @@ blkid_dev blkid_new_dev(void)
{
blkid_dev dev;
- if (!(dev = (blkid_dev) calloc(1, sizeof(struct blkid_struct_dev))))
- return NULL;
+ dev = xzalloc(sizeof(struct blkid_struct_dev));
INIT_LIST_HEAD(&dev->bid_devs);
INIT_LIST_HEAD(&dev->bid_tags);
diff --git a/e2fsprogs/old_e2fsprogs/blkid/tag.c b/e2fsprogs/old_e2fsprogs/blkid/tag.c
index 006a393fa..c0a93df98 100644
--- a/e2fsprogs/old_e2fsprogs/blkid/tag.c
+++ b/e2fsprogs/old_e2fsprogs/blkid/tag.c
@@ -21,8 +21,7 @@ static blkid_tag blkid_new_tag(void)
{
blkid_tag tag;
- if (!(tag = (blkid_tag) calloc(1, sizeof(struct blkid_struct_tag))))
- return NULL;
+ tag = xzalloc(sizeof(struct blkid_struct_tag));
INIT_LIST_HEAD(&tag->bit_tags);
INIT_LIST_HEAD(&tag->bit_names);