libfdisk: add firstsector utils

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

1 files changed, 3 insertions, 41 deletions

diff --git a/fdisks/utils.c b/fdisks/utils.c
index 275fee139..24f169efd 100644
--- a/fdisks/utils.c
+++ b/fdisks/utils.c
@@ -69,26 +69,6 @@ static int __probe_labels(struct fdisk_context *cxt)
 	return 1; /* not found */
 }
 
-static int __init_firstsector_buffer(struct fdisk_context *cxt)
-{
-	DBG(TOPOLOGY, dbgprint("initialize first sector buffer"));
-
-	cxt->firstsector = calloc(1, MAX_SECTOR_SIZE);
-	if (!cxt->firstsector)
-		goto fail;
-
-	/* read MBR */
-	if (512 != read(cxt->dev_fd, cxt->firstsector, 512)) {
-		if (errno == 0)
-			errno = EINVAL;	/* probably too small file/device */
-		goto fail;
-	}
-
-	return 0;
-fail:
-	return -errno;
-}
-
 static unsigned long __get_sector_size(int fd)
 {
 	int sect_sz;
@@ -236,24 +216,6 @@ static int __discover_topology(struct fdisk_context *cxt)
 	return 0;
 }
 
-
-/**
- * fdisk_zeroize_firstsector:
- * @cxt: fdisk context
- *
- * Zeros in-memory first sector buffer
- */
-void fdisk_zeroize_firstsector(struct fdisk_context *cxt)
-{
-	if (!cxt)
-		return;
-
-	if (cxt->firstsector) {
-		DBG(CONTEXT, dbgprint("zeroize in-memory first sector buffer"));
-		memset(cxt->firstsector, 0, MAX_SECTOR_SIZE);
-	}
-}
-
 /**
  * fdisk_dev_sectsz_is_default:
  * @cxt: fdisk context
@@ -475,12 +437,12 @@ struct fdisk_context *fdisk_new_context_from_filename(const char *fname, int rea
 	if (!cxt->dev_path)
 		goto fail;
 
-	if (__init_firstsector_buffer(cxt) < 0)
-		goto fail;
-
 	__discover_topology(cxt);
 	__discover_system_geometry(cxt);
 
+	if (fdisk_read_firstsector(cxt) < 0)
+		goto fail;
+
 	/* detect labels and apply labes specific stuff (e.g geomery)
 	 * to the context */
 	__probe_labels(cxt);