fdisk: use xalloc lib

Signed-off-by: Francesco Cosoleto <cosoleto@gmail.com>

diff --git a/fdisk/fdisk.c b/fdisk/fdisk.c
index 8d2162690789ad09133dc72a9d488c12f4fe24c5..d5216b2624ae8931c8cf8b6d8240ea83b230703c 100644 (file)
--- a/fdisk/fdisk.c
+++ b/fdisk/fdisk.c
@@ -22,6 +22,7 @@
 #include <time.h>
 #include <limits.h>
 
+#include "xalloc.h"
 #include "nls.h"
 #include "rpmatch.h"
 #include "blkdev.h"
@@ -295,9 +296,6 @@ void fatal(enum failure why) {
                                 _("BLKGETSIZE ioctl failed on %s\n"),
                                disk_device);
                        break;
-               case out_of_memory:
-                       message = _("Unable to allocate any more memory\n");
-                       break;
                default:
                        message = _("Fatal error\n");
        }
@@ -334,9 +332,7 @@ read_pte(int fd, int pno, unsigned long long offset) {
        struct pte *pe = &ptes[pno];
 
        pe->offset = offset;
-       pe->sectorbuffer = malloc(sector_size);
-       if (!pe->sectorbuffer)
-               fatal(out_of_memory);
+       pe->sectorbuffer = xmalloc(sector_size);
        read_sector(fd, offset, pe->sectorbuffer);
        pe->changed = 0;
        pe->part_table = pe->ext_pointer = NULL;
@@ -1174,9 +1170,7 @@ static void init_mbr_buffer(void)
        if (MBRbuffer)
                return;
 
-       MBRbuffer = calloc(1, MAX_SECTOR_SIZE);
-       if (!MBRbuffer)
-               fatal(out_of_memory);
+       MBRbuffer = xcalloc(1, MAX_SECTOR_SIZE);
 }
 
 void zeroize_mbr_buffer(void)
@@ -1423,8 +1417,7 @@ read_int_sx(unsigned int low, unsigned int dflt, unsigned int high,
 
        if (!ms || strlen(mesg)+100 > mslen) {
                mslen = strlen(mesg)+200;
-               if (!(ms = realloc(ms,mslen)))
-                       fatal(out_of_memory);
+               ms = xrealloc(ms,mslen);
        }
 
        if (dflt < low || dflt > high)
@@ -2475,8 +2468,7 @@ add_partition(int n, int sys) {
                ext_index = n;
                pen->ext_pointer = p;
                pe4->offset = extended_offset = start;
-               if (!(pe4->sectorbuffer = calloc(1, sector_size)))
-                       fatal(out_of_memory);
+               pe4->sectorbuffer = xcalloc(1, sector_size);
                pe4->part_table = pt_offset(pe4->sectorbuffer, 0);
                pe4->ext_pointer = pe4->part_table + 1;
                pe4->changed = 1;
@@ -2489,8 +2481,7 @@ add_logical(void) {
        if (partitions > 5 || ptes[4].part_table->sys_ind) {
                struct pte *pe = &ptes[partitions];
 
-               if (!(pe->sectorbuffer = calloc(1, sector_size)))
-                       fatal(out_of_memory);
+               pe->sectorbuffer = xcalloc(1, sector_size);
                pe->part_table = pt_offset(pe->sectorbuffer, 0);
                pe->ext_pointer = pe->part_table + 1;
                pe->offset = 0;

diff --git a/fdisk/fdisk.h b/fdisk/fdisk.h
index 51c066fc768e5b478cd7326eb1a5daa782f718ab..302a7a7a69f1b8dd22072c4807d1c1398af52f8d 100644 (file)
--- a/fdisk/fdisk.h
+++ b/fdisk/fdisk.h
@@ -47,7 +47,7 @@ struct partition {
 
 enum failure {ioctl_error,
        unable_to_open, unable_to_read, unable_to_seek,
-       unable_to_write, out_of_memory};
+       unable_to_write};
 
 enum action {fdisk, require, try_only, create_empty_dos, create_empty_sun};
 

diff --git a/fdisk/fdisksgilabel.c b/fdisk/fdisksgilabel.c
index 3547195cafe8d55403954662059a4f981e28e276..4019eacefb5b7ab5220eb0dc3da0211e386c6824 100644 (file)
--- a/fdisk/fdisksgilabel.c
+++ b/fdisk/fdisksgilabel.c
@@ -22,6 +22,7 @@
 
 #include <endian.h>
 #include "nls.h"
+#include "xalloc.h"
 
 #include "blkdev.h"
 
@@ -825,7 +826,7 @@ sgi_set_ncyl(void)
 sgiinfo *
 fill_sgiinfo(void)
 {
-       sgiinfo*info=calloc(1, sizeof(sgiinfo));
+       sgiinfo *info=xcalloc(1, sizeof(sgiinfo));
        info->magic=SSWAP32(SGI_INFO_MAGIC);
        info->b1=SSWAP32(-1);
        info->b2=SSWAP16(-1);