From: Karel Zak <kzak@redhat.com>
Date: Wed, 20 Mar 2013 13:46:03 +0000 (+0100)
Subject: libfdisk: (gpt) rmeove xalloc calls
X-Git-Tag: v2.23-rc1~24
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d06f321df1587fbb7d27a1f0e33e948a1cf743c2;p=thirdparty%2Futil-linux.git

libfdisk: (gpt) rmeove xalloc calls

Signed-off-by: Karel Zak <kzak@redhat.com>
---

diff --git a/libfdisk/src/gpt.c b/libfdisk/src/gpt.c
index 2c3f946678..58ebdc6884 100644
--- a/libfdisk/src/gpt.c
+++ b/libfdisk/src/gpt.c
@@ -37,7 +37,6 @@
 #include "fdiskP.h"
 
 #include "nls.h"
-#include "xalloc.h"
 #include "crc32.h"
 #include "blkdev.h"
 #include "bitops.h"
@@ -1076,10 +1075,12 @@ failed:
 static char *encode_to_utf8(unsigned char *src, size_t count)
 {
 	uint16_t c;
-	char *dest = xmalloc(count * sizeof(char));
+	char *dest;
 	size_t i, j, len = count;
 
-	memset(dest, 0, sizeof(char) * count);
+	dest = calloc(1, count);
+	if (!dest)
+		return NULL;
 
 	for (j = i = 0; i + 2 <= count; i += 2) {
 		/* always little endian */