diff options
-rw-r--r-- | include/blkdev.h | 2 | ||||
-rw-r--r-- | lib/blkdev.c | 41 |
2 files changed, 20 insertions, 23 deletions
diff --git a/include/blkdev.h b/include/blkdev.h index 8fca522c0..93586a0fb 100644 --- a/include/blkdev.h +++ b/include/blkdev.h @@ -134,7 +134,7 @@ int blkdev_get_geometry(int fd, unsigned int *h, unsigned int *s); #define SCSI_TYPE_NO_LUN 0x7f /* convert scsi type code to name */ -char *blkdev_scsi_type_to_name(int type); +const char *blkdev_scsi_type_to_name(int type); #endif /* BLKDEV_H */ 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 |