External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-07-30 21:47:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove bogus const return values in storage file APIs

Browse Source 
virStorageFileGetLVMKey and virStorageFileGetSCSIKey
both return heap allocated strings, so the return value
should not be marked const.

Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
This commit is contained in:
Daniel P. Berrange 2012-12-11 16:39:00 +00:00
parent 64212ed20e
commit 3f0010a673
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/util/storage_file.c
View File

@ -1192,7 +1192,7 @@ int virStorageFileIsClusterFS(const char *path)
}
#ifdef LVS
const char *virStorageFileGetLVMKey(const char *path)
char *virStorageFileGetLVMKey(const char *path)
{
/*
* # lvs --noheadings --unbuffered --nosuffix --options "uuid" LVNAME
@ -1237,7 +1237,7 @@ cleanup:
return key;
}
#else
const char *virStorageFileGetLVMKey(const char *path)
char *virStorageFileGetLVMKey(const char *path)
{
virReportSystemError(ENOSYS, _("Unable to get LVM key for %s"), path);
return NULL;
@ -1245,7 +1245,7 @@ const char *virStorageFileGetLVMKey(const char *path)
#endif
#ifdef HAVE_UDEV
const char *virStorageFileGetSCSIKey(const char *path)
char *virStorageFileGetSCSIKey(const char *path)
{
char *key = NULL;
virCommandPtr cmd = virCommandNewArgList(
@ -1275,7 +1275,7 @@ cleanup:
return key;
}
#else
const char *virStorageFileGetSCSIKey(const char *path)
char *virStorageFileGetSCSIKey(const char *path)
{
virReportSystemError(ENOSYS, _("Unable to get SCSI key for %s"), path);
return NULL;

4
src/util/storage_file.h
View File

@ -101,7 +101,7 @@ int virStorageFileIsClusterFS(const char *path);
int virStorageFileIsSharedFSType(const char *path,
int fstypes);
const char *virStorageFileGetLVMKey(const char *path);
const char *virStorageFileGetSCSIKey(const char *path);
char *virStorageFileGetLVMKey(const char *path);
char *virStorageFileGetSCSIKey(const char *path);
#endif /* __VIR_STORAGE_FILE_H__ */