i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

PowerStatus: some 64 bit fixes

Browse Source
This commit is contained in:
Jérôme Duval
2013-05-04 15:31:11 +02:00
parent 14b32de1d5
commit 3e4cf3a1b8
1 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/apps/powerstatus/PowerStatusView.cpp
+9 -7
View File
@@ -321,10 +321,11 @@ PowerStatusView::_SetLabel(char* buffer, size_t bufferLength)
close = ")"; close = ")";
} }
if (!fShowTime && fPercent >= 0) if (!fShowTime && fPercent >= 0) {
snprintf(buffer, bufferLength, "%s%ld%%%s", open, fPercent, close); snprintf(buffer, bufferLength, "%s%" B_PRId32 "%%%s", open, fPercent,
else if (fShowTime && fTimeLeft >= 0) { close);
snprintf(buffer, bufferLength, "%s%ld:%02ld%s", } else if (fShowTime && fTimeLeft >= 0) {
snprintf(buffer, bufferLength, "%s%" B_PRId32 ":%02" B_PRId32 "%s",
open, fTimeLeft / 3600, (fTimeLeft / 60) % 60, close); open, fTimeLeft / 3600, (fTimeLeft / 60) % 60, close);
} }
} }
@@ -372,11 +373,12 @@ PowerStatusView::Update(bool force)
close = ")"; close = ")";
} }
if (fHasBattery) { if (fHasBattery) {
size_t length = snprintf(text, sizeof(text), "%s%ld%%%s", size_t length = snprintf(text, sizeof(text), "%s%" B_PRId32
open, fPercent, close); "%%%s", open, fPercent, close);
if (fTimeLeft) { if (fTimeLeft) {
length += snprintf(text + length, sizeof(text) - length, length += snprintf(text + length, sizeof(text) - length,
"\n%ld:%02ld", fTimeLeft / 3600, (fTimeLeft / 60) % 60); "\n%" B_PRId32 ":%02" B_PRId32, fTimeLeft / 3600,
(fTimeLeft / 60) % 60);
} }
const char* state = NULL; const char* state = NULL;