summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDominik Riebeling <Dominik.Riebeling@gmail.com>2009-11-22 14:37:31 +0000
committerDominik Riebeling <Dominik.Riebeling@gmail.com>2009-11-22 14:37:31 +0000
commit49ed16cd29679aae501022a47d86b4e11517c097 (patch)
treec02ffb296ffb3c10457e5fbb0b5829d542cf4c00
parentde37ce51edaa09d9394d16fbb43445f9bd11c970 (diff)
downloadrockbox-49ed16cd29679aae501022a47d86b4e11517c097.tar.gz
rockbox-49ed16cd29679aae501022a47d86b4e11517c097.zip
Fix two strings and warnings.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23702 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--rbutil/rbutilqt/base/bootloaderinstallipod.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/rbutil/rbutilqt/base/bootloaderinstallipod.cpp b/rbutil/rbutilqt/base/bootloaderinstallipod.cpp
index 117783890c..0e374a9699 100644
--- a/rbutil/rbutilqt/base/bootloaderinstallipod.cpp
+++ b/rbutil/rbutilqt/base/bootloaderinstallipod.cpp
@@ -73,7 +73,7 @@ bool BootloaderInstallIpod::install(void)
}
if(ipod.macpod) {
- emit logItem(tr("Warning: This is a MacPod, Rockbox only runs on WinPods.\n"
+ emit logItem(tr("Warning: This is a MacPod, Rockbox only runs on WinPods. \n"
"See http://www.rockbox.org/wiki/IpodConversionToFAT32"), LOGERROR);
emit done(true);
return false;
@@ -112,7 +112,7 @@ void BootloaderInstallIpod::installStage2(void)
}
if(ipod.macpod) {
- emit logItem(tr("Warning: This is a MacPod, Rockbox only runs on WinPods.\n"
+ emit logItem(tr("Warning: This is a MacPod, Rockbox only runs on WinPods. \n"
"See http://www.rockbox.org/wiki/IpodConversionToFAT32"), LOGERROR);
emit done(true);
return;
@@ -235,11 +235,11 @@ bool BootloaderInstallIpod::ipodInitialize(struct ipod_t *ipod)
sprintf(ipod->diskname, "\\\\.\\PhysicalDrive%i",
Autodetection::resolveDevicename(m_blfile).toInt());
#elif defined(Q_OS_MACX)
- sprintf(ipod->diskname,
+ sprintf(ipod->diskname, "%s",
qPrintable(Autodetection::resolveDevicename(m_blfile)
.remove(QRegExp("s[0-9]+$"))));
#else
- sprintf(ipod->diskname,
+ sprintf(ipod->diskname, "%s",
qPrintable(Autodetection::resolveDevicename(m_blfile)
.remove(QRegExp("[0-9]+$"))));
#endif