summaryrefslogtreecommitdiff
path: root/kpartx
diff options
context:
space:
mode:
authorChristophe Varoqui <root@xa-s05.(none)>2005-12-09 16:59:57 +0100
committerChristophe Varoqui <root@xa-s05.(none)>2005-12-09 16:59:57 +0100
commit50e37c5758a52691a7753d06263427e6fa3352bd (patch)
tree4812ccba76e09260307ded2b80bc432f3af39b8d /kpartx
parent211e447885c70db3ee05889895a12b5945f8a6dd (diff)
downloadmultipath-tools-50e37c5758a52691a7753d06263427e6fa3352bd.tar.gz
multipath-tools-50e37c5758a52691a7753d06263427e6fa3352bd.tar.bz2
multipath-tools-50e37c5758a52691a7753d06263427e6fa3352bd.zip
[devmapper] Compilation fixes
As we're returning a strdup()ed string from dm_mapname() it hardly qualifies as 'const'. Signed-off-by: Hannes Reinecke <hare@suse.de>
Diffstat (limited to 'kpartx')
-rw-r--r--kpartx/devmapper.c5
-rw-r--r--kpartx/devmapper.h2
2 files changed, 4 insertions, 3 deletions
diff --git a/kpartx/devmapper.c b/kpartx/devmapper.c
index 5d3c162..1253941 100644
--- a/kpartx/devmapper.c
+++ b/kpartx/devmapper.c
@@ -119,11 +119,12 @@ out:
}
-const char *
+char *
dm_mapname(int major, int minor)
{
struct dm_task *dmt;
- const char *mapname = NULL, *map;
+ char *mapname = NULL;
+ const char *map;
if (!(dmt = dm_task_create(DM_DEVICE_INFO)))
return NULL;
diff --git a/kpartx/devmapper.h b/kpartx/devmapper.h
index a58f9e6..9607476 100644
--- a/kpartx/devmapper.h
+++ b/kpartx/devmapper.h
@@ -2,5 +2,5 @@ int dm_prereq (char *, int, int, int);
int dm_simplecmd (int, const char *);
int dm_addmap (int, const char *, const char *, const char *, unsigned long);
int dm_map_present (char *);
-const char * dm_mapname(int major, int minor);
+char * dm_mapname(int major, int minor);
dev_t dm_get_first_dep(char *devname);