[sheepdog] [PATCH 1/2] collie: use xmalloc instead of malloc
Liu Yuan
namei.unix at gmail.com
Mon May 20 17:41:05 CEST 2013
collie can fail in a OOM case without causing any problem.
Signed-off-by: Liu Yuan <namei.unix at gmail.com>
---
collie/cluster.c | 11 +----------
1 file changed, 1 insertion(+), 10 deletions(-)
diff --git a/collie/cluster.c b/collie/cluster.c
index 7cdbba0..dc7ff5a 100644
--- a/collie/cluster.c
+++ b/collie/cluster.c
@@ -143,16 +143,7 @@ static int cluster_info(int argc, char **argv)
char time_str[128];
log_length = sd_epoch * sizeof(struct epoch_log);
-again:
- logs = malloc(log_length);
- if (!logs) {
- if (log_length < 10) {
- fprintf(stderr, "No memory to allocate.\n");
- return EXIT_SYSFAIL;
- }
- log_length /= 2;
- goto again;
- }
+ logs = xmalloc(log_length);
sd_init_req(&hdr, SD_OP_STAT_CLUSTER);
hdr.data_length = log_length;
--
1.7.9.5
More information about the sheepdog
mailing list