diff options
Diffstat (limited to 'lib/libdisk/chunk.c')
| -rw-r--r-- | lib/libdisk/chunk.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/lib/libdisk/chunk.c b/lib/libdisk/chunk.c index aa8f30811be3..a28ebe7a3caf 100644 --- a/lib/libdisk/chunk.c +++ b/lib/libdisk/chunk.c @@ -99,7 +99,7 @@ Clone_Chunk(struct chunk *c1) if(!c1) return 0; c2 = new_chunk(); - if (!c2) barfout(1, "malloc failed"); + if (!c2) return NULL; *c2 = *c1; if (c1->private_data && c1->private_clone) c2->private_data = c2->private_clone(c2->private_data); @@ -128,7 +128,7 @@ Insert_Chunk(struct chunk *c2, u_long offset, u_long size, const char *name, return __LINE__; ct = new_chunk(); - if (!ct) barfout(1, "malloc failed"); + if (!ct) return __LINE__; memset(ct, 0, sizeof *ct); ct->disk = c2->disk; ct->offset = offset; @@ -149,7 +149,7 @@ Insert_Chunk(struct chunk *c2, u_long offset, u_long size, const char *name, if(type==freebsd || type==extended) { cs = new_chunk(); - if (!cs) barfout(1, "malloc failed"); + if (!cs) return __LINE__; memset(cs, 0, sizeof *cs); cs->disk = c2->disk; cs->offset = offset; @@ -166,7 +166,7 @@ Insert_Chunk(struct chunk *c2, u_long offset, u_long size, const char *name, /* Make a new chunk for any trailing unused space */ if (c2->end > ct->end) { cs = new_chunk(); - if (!cs) barfout(1, "malloc failed"); + if (!cs) return __LINE__; *cs = *c2; cs->disk = c2->disk; cs->offset = ct->end + 1; @@ -224,10 +224,10 @@ Add_Chunk(struct disk *d, long offset, u_long size, const char *name, if (type == whole) { d->chunks = c1 = new_chunk(); - if (!c1) barfout(1, "malloc failed"); + if (!c1) return __LINE__; memset(c1, 0, sizeof *c1); c2 = c1->part = new_chunk(); - if (!c2) barfout(1, "malloc failed"); + if (!c2) return __LINE__; memset(c2,0,sizeof *c2); c2->disk = c1->disk = d; c2->offset = c1->offset = offset; |