From 2fc4a256ce16196ddb8d6f5a56809880632ac279 Mon Sep 17 00:00:00 2001
From: Karel Zak
Date: Fri, 15 Jun 2012 13:14:30 +0200
Subject: lib/blkdev: return static strings by blkdev_scsi_type_to_name()

Signed-off-by: Karel Zak <kzak@redhat.com>
---
 lib/blkdev.c | 41 +++++++++++++++++++----------------------
 1 file changed, 19 insertions(+), 22 deletions(-)

(limited to 'lib/blkdev.c')

diff --git a/lib/blkdev.c b/lib/blkdev.c
index 35ec36954..9193b64e4 100644
--- a/lib/blkdev.c
+++ b/lib/blkdev.c
@@ -290,48 +290,45 @@ int blkdev_get_geometry(int fd, unsigned int *h, unsigned int *s)
 }
 
 /*
- * Convert scsi type to human readable string.  Return value is
- * expected to free'd after use.
+ * Convert scsi type to human readable string.
  */
-char *blkdev_scsi_type_to_name(int type)
+const char *blkdev_scsi_type_to_name(int type)
 {
-	char *type_str = NULL;
-
 	switch (type) {
 	case SCSI_TYPE_DISK:
-		return xstrdup("disk");
+		return "disk";
 	case SCSI_TYPE_TAPE:
-		return xstrdup("tape");
+		return "tape";
 	case SCSI_TYPE_PRINTER:
-		return xstrdup("printer");
+		return "printer";
 	case SCSI_TYPE_PROCESSOR:
-		return xstrdup("processor");
+		return "processor";
 	case SCSI_TYPE_WORM:
-		return xstrdup("worm");
+		return "worm";
 	case SCSI_TYPE_ROM:
-		return xstrdup("rom");
+		return "rom";
 	case SCSI_TYPE_SCANNER:
-		return xstrdup("scanner");
+		return "scanner";
 	case SCSI_TYPE_MOD:
-		return xstrdup("mo-disk");
+		return "mo-disk";
 	case SCSI_TYPE_MEDIUM_CHANGER:
-		return xstrdup("changer");
+		return "changer";
 	case SCSI_TYPE_COMM:
-		return xstrdup("comm");
+		return "comm";
 	case SCSI_TYPE_RAID:
-		return xstrdup("raid");
+		return "raid";
 	case SCSI_TYPE_ENCLOSURE:
-		return xstrdup("enclosure");
+		return "enclosure";
 	case SCSI_TYPE_RBC:
-		return xstrdup("rbc");
+		return "rbc";
 	case SCSI_TYPE_OSD:
-		return xstrdup("osd");
+		return "osd";
 	case SCSI_TYPE_NO_LUN:
-		return xstrdup("no-lun");
+		return "no-lun";
 	default:
-		xasprintf(&type_str, "0x%02x", type);
-		return type_str;
+		break;
 	}
+	return NULL;
 }
 
 #ifdef TEST_PROGRAM
-- 
cgit v1.2.3-55-g7522