aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam Stenvall <neggelandia@gmail.com>2014-07-15 12:07:19 +0300
committerSam Stenvall <neggelandia@gmail.com>2014-07-15 12:08:05 +0300
commita7e85581174cd8c6031cae569be5ca0b9025351a (patch)
treec06068bca6ef5e3362d8409f3358db3101138ff2
parent7d448c6662077efd0ce56ee3323af23180d20123 (diff)
fix build when HAL is enabled
-rw-r--r--xbmc/linux/HALManager.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/xbmc/linux/HALManager.cpp b/xbmc/linux/HALManager.cpp
index 3f322d14ee..a6b63d4e61 100644
--- a/xbmc/linux/HALManager.cpp
+++ b/xbmc/linux/HALManager.cpp
@@ -598,7 +598,7 @@ bool CHALManager::ApproveDevice(CStorageDevice *device)
approve = false;
// Ignore some mountpoints, unless a weird setup these should never contain anything usefull for an enduser.
- if (strcmp(device->MountPoint, "/") == 0 || strcmp(device->MountPoint, "/boot/") == 0 || strcmp(device->MountPoint, "/mnt/") == 0 || strcmp(device->MountPoint, "/home/") == 0)
+ if (strcmp(device->MountPoint.c_str(), "/") == 0 || strcmp(device->MountPoint.c_str(), "/boot/") == 0 || strcmp(device->MountPoint.c_str(), "/mnt/") == 0 || strcmp(device->MountPoint.c_str(), "/home/") == 0)
approve = false;
if (device->HalIgnore)
@@ -612,7 +612,7 @@ bool CHALManager::Eject(const std::string& path)
{
for (unsigned int i = 0; i < m_Volumes.size(); i++)
{
- if (m_Volumes[i].MountPoint.Equals(path))
+ if (m_Volumes[i].MountPoint == path)
return m_Volumes[i].HotPlugged ? UnMount(m_Volumes[i]) : false;
}
@@ -693,7 +693,7 @@ bool CHALManager::Mount(CStorageDevice *volume, const std::string &mountpath)
std::string temporaryString;
- if (volume->FileSystem.Equals("vfat"))
+ if (volume->FileSystem == "vfat")
{
int mask = umask (0);
temporaryString = StringUtils::Format("umask=%#o", mask);