From 7fde8debc450c19927b82e3434fc5d6a6dd4d35d Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Sat, 11 Jun 2005 22:37:25 +0000 Subject: use malloc instead of xmalloc --- e2fsprogs/blkid/probe.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'e2fsprogs/blkid/probe.c') diff --git a/e2fsprogs/blkid/probe.c b/e2fsprogs/blkid/probe.c index 5fa37ad46..5ae88b1ac 100644 --- a/e2fsprogs/blkid/probe.c +++ b/e2fsprogs/blkid/probe.c @@ -331,7 +331,7 @@ static int probe_swap1(int fd, * pagesize). */ if (lseek(fd, 1024, SEEK_SET) < 0) return 1; - if (!(sws = (struct swap_id_block *)malloc(1024))) return 1; + sws = (struct swap_id_block *)xmalloc(1024); if (read(fd, sws, 1024) != 1024) { free(sws); return 1; @@ -602,9 +602,8 @@ try_again: if (lseek(fd, idx << 10, SEEK_SET) < 0) continue; - if (!(buf = (unsigned char *)malloc(1024))) - continue; - + buf = (unsigned char *)xmalloc(1024); + if (read(fd, buf, 1024) != 1024) { free(buf); continue; -- cgit v1.2.3