-
From d8445341c4fc50a970b465c3e4fcb38308178834 Mon Sep 17 00:00:00 2001
From: Sergei Reznikov <diver@gelios.net>
Date: Fri, 4 Jan 2013 16:34:21 +0400
Subject: [PATCH] Compilation fixes for x86_64.
Added quite a few missing components to image:
alert arp bc CortexAddOnHost
CDPlayer CharacterMap DeskCalc
Devices DiskUsage Expander LaunchBox MediaConverter NetworkStatus
PoorMan Pulse Screenshot ShowImage SoundRecorder TV Workspaces
DataTranslations Media Printers ScreenSaver
BSnow Cortex FontDemo OverlayImage Pairs
cddb_daemon midi_server power_daemon print_server print_addon_server
Canon LIPS3 Compatible Canon LIPS4 Compatible Gutenprint
PCL5 Compatible PCL6 Compatible PDF Writer PS Compatible
libgame.so libmedia.so
---
build/jam/Haiku64Image | 63 ++++++++++++--------
.../print/drivers/pdf/source/DocInfoWindow.cpp | 2 +-
.../print/drivers/pdf/source/PrinterDriver.cpp | 2 +-
src/apps/bsnow/SnowView.cpp | 4 +-
src/apps/cdplayer/CDDBSupport.cpp | 14 ++---
src/apps/charactermap/CharacterWindow.cpp | 4 +-
src/apps/cortex/TransportView/TransportView.cpp | 12 ++--
src/apps/deskcalc/DeskCalc.cpp | 2 +-
src/apps/deskcalc/ExpressionTextView.cpp | 2 +-
src/apps/fontdemo/ControlView.cpp | 2 +-
src/apps/mediaconverter/MediaConverterApp.cpp | 16 ++---
src/apps/mediaconverter/MediaConverterWindow.cpp | 4 +-
src/apps/pairs/PairsView.cpp | 2 +-
src/apps/poorman/StatusSlider.cpp | 2 +-
src/apps/poorman/libhttpd/libhttpd.c | 2 +-
src/apps/showimage/ShowImageWindow.cpp | 2 +-
src/apps/soundrecorder/FileUtils.cpp | 2 +-
src/apps/soundrecorder/RecorderWindow.cpp | 4 +-
src/apps/soundrecorder/TrackSlider.cpp | 2 +-
src/apps/tv/Controller.cpp | 2 +-
src/apps/tv/DeviceRoster.cpp | 2 +-
src/apps/tv/MainWin.cpp | 2 +-
src/apps/tv/VideoNode.cpp | 2 +-
src/bin/network/arp/arp.cpp | 14 ++---
src/kits/game/WindowScreen.cpp | 2 +-
src/kits/midi2/MidiRosterLooper.cpp | 4 +-
src/kits/print/PicturePrinter.cpp | 4 +-
src/kits/print/PrinterDriverAddOn.cpp | 4 +-
src/libs/icon/message/MessageImporter.cpp | 6 +-
src/libs/icon/shape/VectorPath.cpp | 4 +-
src/libs/icon/style/GradientTransformable.cpp | 2 +-
src/preferences/printers/JobListView.cpp | 4 +-
src/preferences/printers/PrinterListView.cpp | 4 +-
src/servers/cddb_daemon/cddb_daemon.cpp | 8 +--
src/servers/cddb_daemon/cddb_server.cpp | 2 +-
src/servers/print/ConfigWindow.cpp | 2 +-
36 files changed, 113 insertions(+), 98 deletions(-)
diff --git a/build/jam/Haiku64Image b/build/jam/Haiku64Image
index cc6224c..9a4c4a1 100644
a
|
b
|
|
6 | 6 | # easily add things to the image as I port them. |
7 | 7 | |
8 | 8 | |
9 | | SYSTEM_BIN = "[" addattr base64 basename bash beep cal cat catattr checkfs |
10 | | chgrp chmod chown chroot cksum clear clockconfig cmp collectcatkeys comm |
11 | | compress copyattr cp csplit cut date dd diff diff3 dircolors dirname df du |
12 | | dumpcatalog echo eject env error expand expr factor false find finddir |
13 | | fmt fold fortune ftp gawk gdb gzip gzexe getlimits groups head hostname |
14 | | id ifconfig <bin>install isvolume join kernel_debugger kill less lessecho |
15 | | lesskey link linkcatkeys listdev ln locale locate logger logname ls |
16 | | makebootable md5sum mimeset mkdir mkfifo mkfs mktemp mount mountvolume |
17 | | mv nl nohup notify nproc od open paste patch pathchk ping pr printenv printf |
18 | | ps ptx pwd query rc readlink ReadOnlyBootPrompt rm rmattr rmdir safemode |
19 | | sdiff seq sha1sum shred shuf shutdown sleep sort split stat strace stty su sum sync |
20 | | sysinfo tac tail tee test timeout touch tr true truncate tsort tty unexpand |
21 | | uname uniq unlink unmount unzip <bin>updatedb waitfor wc wget whoami xargs |
22 | | xres yes zdiff zforce zgrep zip zipcloak <bin>zipgrep zipnote zipsplit |
23 | | zmore znew |
| 9 | SYSTEM_BIN = "[" addattr alert arp base64 basename bash bc beep cal cat catattr |
| 10 | checkfs chgrp chmod chown chroot cksum clear clockconfig cmp |
| 11 | collectcatkeys comm compress copyattr CortexAddOnHost cp csplit cut date |
| 12 | dd diff diff3 dircolors dirname df du dumpcatalog echo eject env error |
| 13 | expand expr factor false find finddir fmt fold fortune ftp gawk gdb gzip |
| 14 | gzexe getlimits groups head hostname id ifconfig <bin>install isvolume |
| 15 | join kernel_debugger kill less lessecho lesskey link linkcatkeys listdev |
| 16 | ln locale locate logger logname ls makebootable md5sum mimeset mkdir |
| 17 | mkfifo mkfs mktemp mount mountvolume mv nl nohup notify nproc od open |
| 18 | paste patch pathchk ping pr printenv printf ps ptx pwd query rc readlink |
| 19 | ReadOnlyBootPrompt rm rmattr rmdir safemode sdiff seq sha1sum shred shuf |
| 20 | shutdown sleep sort split stat strace stty su sum sync sysinfo tac tail |
| 21 | tee test timeout touch tr true truncate tsort tty unexpand uname uniq |
| 22 | unlink unmount unzip <bin>updatedb waitfor wc wget whoami xargs xres yes |
| 23 | zdiff zforce zgrep zip zipcloak <bin>zipgrep zipnote zipsplit zmore znew |
24 | 24 | ; |
25 | 25 | |
26 | | SYSTEM_APPS = AboutSystem ActivityMonitor Debugger DriveSetup Installer |
27 | | NetworkStatus ProcessController StyledEdit Terminal |
| 26 | SYSTEM_APPS = AboutSystem ActivityMonitor CDPlayer CharacterMap Debugger DeskCalc |
| 27 | Devices DiskUsage DriveSetup Expander Installer LaunchBox MediaConverter |
| 28 | NetworkStatus PoorMan Pulse ProcessController Screenshot ShowImage |
| 29 | SoundRecorder StyledEdit Terminal TV Workspaces |
28 | 30 | ; |
29 | 31 | |
30 | | SYSTEM_PREFERENCES = Appearance Backgrounds <preference>Deskbar FileTypes |
31 | | Keyboard Keymap Locale Mouse Network Notifications Screen Time Touchpad |
32 | | <preference>Tracker VirtualMemory |
| 32 | SYSTEM_PREFERENCES = Appearance Backgrounds DataTranslations <preference>Deskbar |
| 33 | FileTypes Keyboard Keymap Locale Media Mouse Network Notifications |
| 34 | Printers Screen ScreenSaver Time Touchpad <preference>Tracker |
| 35 | VirtualMemory |
33 | 36 | ; |
34 | 37 | |
35 | | SYSTEM_DEMOS = Sudoku ; |
| 38 | SYSTEM_DEMOS = BSnow Cortex FontDemo OverlayImage Pairs Sudoku ; |
36 | 39 | |
37 | | SYSTEM_LIBS = libbe.so libbsd.so libbnetapi.so libdebug.so libmedia.so |
| 40 | SYSTEM_LIBS = libbe.so libbsd.so libbnetapi.so libgame.so libdebug.so libmedia.so |
38 | 41 | libnetwork.so <revisioned>libroot.so libroot-addon-icu.so |
39 | 42 | libtextencoding.so libtiff.so libtracker.so libtranslation.so |
40 | 43 | $(HAIKU_SHARED_LIBSTDC++) $(HAIKU_SHARED_LIBSUPC++) |
… |
… |
PRIVATE_SYSTEM_LIBS =
|
48 | 51 | libilmimf.so |
49 | 52 | ; |
50 | 53 | |
51 | | SYSTEM_SERVERS = app_server debug_server input_server mount_server |
52 | | net_server notification_server registrar syslog_daemon |
| 54 | SYSTEM_SERVERS = app_server cddb_daemon debug_server input_server midi_server |
| 55 | mount_server net_server notification_server power_daemon print_server |
| 56 | print_addon_server registrar syslog_daemon |
53 | 57 | ; |
54 | 58 | |
55 | 59 | SYSTEM_NETWORK_DEVICES = ethernet loopback ; |
… |
… |
SYSTEM_ADD_ONS_TRANSLATORS = BMPTranslator EXRTranslator GIFTranslator
|
65 | 69 | TIFFTranslator WebPTranslator WonderBrushTranslator |
66 | 70 | ; |
67 | 71 | |
| 72 | SYSTEM_ADD_ONS_PRINT = |
| 73 | Canon\ LIPS3\ Compatible |
| 74 | Canon\ LIPS4\ Compatible |
| 75 | Gutenprint |
| 76 | PCL5\ Compatible |
| 77 | PCL6\ Compatible |
| 78 | PDF\ Writer |
| 79 | PS\ Compatible |
| 80 | |
| 81 | ; |
| 82 | |
68 | 83 | SYSTEM_ADD_ONS_DRIVERS_GRAPHICS = vesa ; |
69 | 84 | SYSTEM_ADD_ONS_DRIVERS_NET = 3com atheros813x ar81xx attansic_l1 attansic_l2 |
70 | 85 | broadcom440x broadcom570x dec21xxx etherpci ipro100 ipro1000 jmicron2x0 |
-
diff --git a/src/add-ons/print/drivers/pdf/source/DocInfoWindow.cpp b/src/add-ons/print/drivers/pdf/source/DocInfoWindow.cpp
index 393ead6..e1dd5e0 100644
a
|
b
|
void
|
425 | 425 | DocInfoWindow::_EmptyKeyList() |
426 | 426 | { |
427 | 427 | while (fKeyList->CountItems() > 0L) |
428 | | delete fKeyList->RemoveItem(0L); |
| 428 | delete fKeyList->RemoveItem((int32)0); |
429 | 429 | } |
430 | 430 | |
431 | 431 | |
-
diff --git a/src/add-ons/print/drivers/pdf/source/PrinterDriver.cpp b/src/add-ons/print/drivers/pdf/source/PrinterDriver.cpp
index 9bdb410..2ccb112 100644
a
|
b
|
PrinterDriver::PrintPage(int32 pageNumber, int32 pageCount)
|
201 | 201 | { |
202 | 202 | char text[128]; |
203 | 203 | |
204 | | sprintf(text, "Faking print of page %ld/%ld...", pageNumber, pageCount); |
| 204 | sprintf(text, "Faking print of page %" B_PRId32 "/%" B_PRId32 "...", pageNumber, pageCount); |
205 | 205 | BAlert *alert = new BAlert("PrinterDriver::PrintPage()", text, "Hmm?"); |
206 | 206 | alert->SetFlags(alert->Flags() | B_CLOSE_ON_ESCAPE); |
207 | 207 | alert->Go(); |
-
diff --git a/src/apps/bsnow/SnowView.cpp b/src/apps/bsnow/SnowView.cpp
index a203ded..1a3765d 100644
a
|
b
|
void SnowView::AttachedToWindow()
|
169 | 169 | fFallenReg = new BRegion; |
170 | 170 | fInvalidator = spawn_thread(SnowMakerThread, INVALIDATOR_THREAD_NAME, B_LOW_PRIORITY, (void *)this); |
171 | 171 | resume_thread(fInvalidator); |
172 | | printf("BSnow: OK: ws = %ld x %ld\n", fCachedWsWidth, fCachedWsHeight); |
| 172 | printf("BSnow: OK: ws = %" B_PRId32 " x %" B_PRId32 "\n", fCachedWsWidth, fCachedWsHeight); |
173 | 173 | #ifdef DEBUG |
174 | 174 | Window()->AddCommonFilter(new BMessageFilter(B_ANY_DELIVERY, B_ANY_SOURCE, msgfilter)); |
175 | 175 | #endif |
… |
… |
void SnowView::Calc()
|
326 | 326 | if (fCachedWsWidth != pFrame.Width() || fCachedWsHeight != pFrame.Height()) { |
327 | 327 | fCachedWsWidth = pFrame.IntegerWidth(); |
328 | 328 | fCachedWsHeight = pFrame.IntegerHeight(); |
329 | | printf("BSnow: Parent resized to %ld %ld\n", fCachedWsWidth, fCachedWsHeight); |
| 329 | printf("BSnow: Parent resized to %" B_PRId32 " %" B_PRId32 "\n", fCachedWsWidth, fCachedWsHeight); |
330 | 330 | fFallenReg->MakeEmpty(); /* remove all the fallen snow */ |
331 | 331 | ResizeTo(pFrame.IntegerWidth(), pFrame.IntegerHeight()); |
332 | 332 | fDragger->MoveTo(pFrame.IntegerWidth()-7, pFrame.IntegerHeight()-7); |
-
diff --git a/src/apps/cdplayer/CDDBSupport.cpp b/src/apps/cdplayer/CDDBSupport.cpp
index 4e6875c..4360ad1 100644
a
|
b
|
CDDBData::Load(const entry_ref &ref)
|
245 | 245 | time->SetMinutes(0); |
246 | 246 | time->SetSeconds(0); |
247 | 247 | |
248 | | STRACE(("CDDBData::Load: Adding Track %s (%ld:%ld)\n", newTrack->String(), |
| 248 | STRACE(("CDDBData::Load: Adding Track %s (%" B_PRId32 ":%" B_PRId32 ")\n", newTrack->String(), |
249 | 249 | time->minutes, time->seconds)); |
250 | 250 | |
251 | 251 | fTrackList.AddItem(newTrack); |
… |
… |
CDDBData::Save(const char *filename)
|
332 | 332 | BString entry; |
333 | 333 | char timestring[10]; |
334 | 334 | |
335 | | sprintf(timestring,"%.2ld:%.2ld", fDiscTime.GetMinutes(), fDiscTime.GetSeconds()); |
| 335 | sprintf(timestring,"%.2" B_PRId32 ":%.2" B_PRId32 "", fDiscTime.GetMinutes(), fDiscTime.GetSeconds()); |
336 | 336 | |
337 | 337 | entry << fArtist << " - " << fAlbum << "\t" << timestring << "\n"; |
338 | 338 | file.Write(entry.String(), entry.Length()); |
… |
… |
CDDBData::Save(const char *filename)
|
351 | 351 | |
352 | 352 | entry = *trackstr; |
353 | 353 | |
354 | | sprintf(timestring,"%.2ld:%.2ld", time->GetMinutes(), time->GetSeconds()); |
| 354 | sprintf(timestring,"%.2" B_PRId32 ":%.2" B_PRId32 "", time->GetMinutes(), time->GetSeconds()); |
355 | 355 | |
356 | 356 | entry << "\t" << timestring << "\n"; |
357 | 357 | file.Write(entry.String(), entry.Length()); |
… |
… |
CDDBData::Save(const char *filename)
|
361 | 361 | } |
362 | 362 | |
363 | 363 | file.WriteAttr("CD:key", B_INT32_TYPE, 0, &fDiscID, sizeof(int32)); |
364 | | STRACE(("CDDBData::Save: Wrote CD identifier: %ld(%lx)\n", fDiscID, fDiscID)); |
| 364 | STRACE(("CDDBData::Save: Wrote CD identifier: %" B_PRId32 "(%" B_PRIx32 ")\n", fDiscID, fDiscID)); |
365 | 365 | file.WriteAttr("CD:tracks", B_STRING_TYPE, 0, tracksattr.String(), tracksattr.Length() + 1); |
366 | 366 | |
367 | 367 | if (fGenre.CountChars() > 0) |
… |
… |
CDDBData::RenameTrack(const int32 &index, const char *newName)
|
391 | 391 | |
392 | 392 | BString *name = (BString*)fTrackList.ItemAt(index); |
393 | 393 | if (name) { |
394 | | STRACE(("CDDBData::RenameTrack(%ld,%s)\n", index, newName)); |
| 394 | STRACE(("CDDBData::RenameTrack(%" B_PRId32 ",%s)\n", index, newName)); |
395 | 395 | name->SetTo(newName); |
396 | 396 | return true; |
397 | 397 | } |
… |
… |
CDDBData::AddTrack(const char *track, const CDAudioTime &time,
|
409 | 409 | STRACE(("CDDBData::AddTrack failed - NULL name\n")); |
410 | 410 | return; |
411 | 411 | } |
412 | | STRACE(("CDDBData::AddTrack(%s, %ld:%.2ld,%d)\n", track, time.minutes, time.seconds, index)); |
| 412 | STRACE(("CDDBData::AddTrack(%s, %" B_PRId32 ":%.2" B_PRId32 ",%d)\n", track, time.minutes, time.seconds, index)); |
413 | 413 | |
414 | 414 | fTrackList.AddItem(new BString(track)); |
415 | 415 | fTimeList.AddItem(new CDAudioTime(time)); |
… |
… |
CDDBQuery::_ReadFromServer(BString &data)
|
691 | 691 | |
692 | 692 | // Query for the existence of the disc in the database |
693 | 693 | char idString[10]; |
694 | | sprintf(idString, "%08lx", fCDData.DiscID()); |
| 694 | sprintf(idString, "%08" B_PRIx32 "", fCDData.DiscID()); |
695 | 695 | BString query; |
696 | 696 | |
697 | 697 | int32 trackCount = GetTrackCount(&fSCSIData); |
-
diff --git a/src/apps/charactermap/CharacterWindow.cpp b/src/apps/charactermap/CharacterWindow.cpp
index 3f22288..05b5b43 100644
a
|
b
|
public:
|
60 | 60 | protected: |
61 | 61 | const char* UpdateText() const |
62 | 62 | { |
63 | | snprintf(fText, sizeof(fText), "%ldpt", Value()); |
| 63 | snprintf(fText, sizeof(fText), "%" B_PRId32 "pt", Value()); |
64 | 64 | return fText; |
65 | 65 | } |
66 | 66 | |
… |
… |
CharacterWindow::MessageReceived(BMessage* message)
|
310 | 310 | sizeof(utf8Hex)); |
311 | 311 | |
312 | 312 | char text[128]; |
313 | | snprintf(text, sizeof(text), " %s: %#lx (%ld), UTF-8: %s", |
| 313 | snprintf(text, sizeof(text), " %s: %#" B_PRIx32 " (%" B_PRId32 "), UTF-8: %s", |
314 | 314 | B_TRANSLATE("Code"), character, character, utf8Hex); |
315 | 315 | |
316 | 316 | char glyph[20]; |
-
diff --git a/src/apps/cortex/TransportView/TransportView.cpp b/src/apps/cortex/TransportView/TransportView.cpp
index 9dc1ef5..9065620 100644
a
|
b
|
void TransportView::_selectGroup(
|
528 | 528 | err = m_manager->findGroup(groupID, &m_group); |
529 | 529 | if(err < B_OK) { |
530 | 530 | PRINT(( |
531 | | "* TransportView::_selectGroup(%ld): findGroup() failed:\n" |
| 531 | "* TransportView::_selectGroup(%" B_PRId32 "): findGroup() failed:\n" |
532 | 532 | " %s\n", |
533 | 533 | groupID, |
534 | 534 | strerror(err))); |
… |
… |
void TransportView::_populateTimeSourceMenu(
|
784 | 784 | B_RAW_TYPE, |
785 | 785 | &r->node(), |
786 | 786 | sizeof(media_node)); |
787 | | sprintf(nameBuffer, "%s: %ld", |
| 787 | sprintf(nameBuffer, "%s: %" B_PRId32 "", |
788 | 788 | r->name(), |
789 | 789 | r->id()); |
790 | 790 | i = new BMenuItem( |
… |
… |
void TransportView::_timeSourceCreated(
|
1088 | 1088 | if(err < B_OK) |
1089 | 1089 | return; |
1090 | 1090 | |
1091 | | // PRINT(("### _timeSourceCreated(): %ld\n", id)); |
| 1091 | // PRINT(("### _timeSourceCreated(): %" B_PRId32 "\n", id)); |
1092 | 1092 | NodeRef* ref; |
1093 | 1093 | err = m_manager->getNodeRef(id, &ref); |
1094 | 1094 | if(err < B_OK) { |
1095 | 1095 | PRINT(( |
1096 | | "!!! TransportView::_timeSourceCreated(): node %ld doesn't exist\n", |
| 1096 | "!!! TransportView::_timeSourceCreated(): node %" B_PRId32 " doesn't exist\n", |
1097 | 1097 | id)); |
1098 | 1098 | return; |
1099 | 1099 | } |
… |
… |
void TransportView::_timeSourceCreated(
|
1105 | 1105 | B_RAW_TYPE, |
1106 | 1106 | &ref->node(), |
1107 | 1107 | sizeof(media_node)); |
1108 | | sprintf(nameBuffer, "%s: %ld", |
| 1108 | sprintf(nameBuffer, "%s: %" B_PRId32 "", |
1109 | 1109 | ref->name(), |
1110 | 1110 | ref->id()); |
1111 | 1111 | BMenuItem* i = new BMenuItem( |
… |
… |
void TransportView::_timeSourceDeleted(
|
1126 | 1126 | if(err < B_OK) |
1127 | 1127 | return; |
1128 | 1128 | |
1129 | | // PRINT(("### _timeSourceDeleted(): %ld\n", id)); |
| 1129 | // PRINT(("### _timeSourceDeleted(): %" B_PRId32 "\n", id)); |
1130 | 1130 | |
1131 | 1131 | BMenu* menu = m_timeSourceView->Menu(); |
1132 | 1132 | ASSERT(menu); |
-
diff --git a/src/apps/deskcalc/DeskCalc.cpp b/src/apps/deskcalc/DeskCalc.cpp
index 7b97aa8..af78d8e 100644
a
|
b
|
main(int argc, char* argv[])
|
38 | 38 | BString result = parser.Evaluate(expression.String()); |
39 | 39 | printf("%s\n", result.String()); |
40 | 40 | } catch (ParseException e) { |
41 | | printf("%s at %ld\n", e.message.String(), e.position + 1); |
| 41 | printf("%s at %" B_PRId32 "\n", e.message.String(), e.position + 1); |
42 | 42 | return 1; |
43 | 43 | } |
44 | 44 | } |
-
diff --git a/src/apps/deskcalc/ExpressionTextView.cpp b/src/apps/deskcalc/ExpressionTextView.cpp
index b9e948b..ae27e55 100644
a
|
b
|
ExpressionTextView::AddExpressionToHistory(const char* expression)
|
373 | 373 | return; |
374 | 374 | } |
375 | 375 | while (fPreviousExpressions.CountItems() > kMaxPreviousExpressions) |
376 | | delete (BString*)fPreviousExpressions.RemoveItem(0L); |
| 376 | delete (BString*)fPreviousExpressions.RemoveItem((int32)0); |
377 | 377 | |
378 | 378 | fHistoryPos = fPreviousExpressions.CountItems(); |
379 | 379 | } |
-
diff --git a/src/apps/fontdemo/ControlView.cpp b/src/apps/fontdemo/ControlView.cpp
index 771e840..e5ff30b 100644
a
|
b
|
ControlView::MessageReceived(BMessage* msg)
|
380 | 380 | printf("Failed to add style or family to the message\n"); |
381 | 381 | return; |
382 | 382 | } |
383 | | printf("InstalledStyles(%ld), Font(%s), Style(%s)\n", |
| 383 | printf("InstalledStyles(%" B_PRId32 "), Font(%s), Style(%s)\n", |
384 | 384 | installedStyles, newFontFamilyItem->Label(), |
385 | 385 | newstyleitem->Label()); |
386 | 386 | _UpdateAndSendStyle(msg); |
-
diff --git a/src/apps/mediaconverter/MediaConverterApp.cpp b/src/apps/mediaconverter/MediaConverterApp.cpp
index 67af425..22ca7ec 100644
a
|
b
|
MediaConverterApp::_ConvertFile(BMediaFile* inFile, BMediaFile* outFile,
|
525 | 525 | for (int64 i = start; (i <= end) && !fCancel; i += framesRead) { |
526 | 526 | if ((ret = inVidTrack->ReadFrames(videoBuffer, &framesRead, |
527 | 527 | &mh)) != B_OK) { |
528 | | fprintf(stderr, "Error reading video frame %Ld: %s\n", i, |
| 528 | fprintf(stderr, "Error reading video frame %" B_PRId64 ": %s\n", i, |
529 | 529 | strerror(ret)); |
530 | 530 | snprintf(status.LockBuffer(128), 128, |
531 | | B_TRANSLATE("Error read video frame %Ld"), i); |
| 531 | B_TRANSLATE("Error read video frame %" B_PRId64 ""), i); |
532 | 532 | status.UnlockBuffer(); |
533 | 533 | SetStatusMessage(status.String()); |
534 | 534 | |
… |
… |
MediaConverterApp::_ConvertFile(BMediaFile* inFile, BMediaFile* outFile,
|
537 | 537 | |
538 | 538 | if ((ret = outVidTrack->WriteFrames(videoBuffer, framesRead, |
539 | 539 | mh.u.encoded_video.field_flags)) != B_OK) { |
540 | | fprintf(stderr, "Error writing video frame %Ld: %s\n", i, |
| 540 | fprintf(stderr, "Error writing video frame %" B_PRId64 ": %s\n", i, |
541 | 541 | strerror(ret)); |
542 | 542 | snprintf(status.LockBuffer(128), 128, |
543 | | B_TRANSLATE("Error writing video frame %Ld"), i); |
| 543 | B_TRANSLATE("Error writing video frame %" B_PRId64 ""), i); |
544 | 544 | status.UnlockBuffer(); |
545 | 545 | SetStatusMessage(status.String()); |
546 | 546 | |
… |
… |
MediaConverterApp::_ConvertFile(BMediaFile* inFile, BMediaFile* outFile,
|
551 | 551 | if (currPercent > lastPercent) { |
552 | 552 | lastPercent = currPercent; |
553 | 553 | snprintf(status.LockBuffer(128), 128, |
554 | | B_TRANSLATE("Writing video track: %ld%% complete"), |
| 554 | B_TRANSLATE("Writing video track: %" B_PRId32 "%% complete"), |
555 | 555 | currPercent); |
556 | 556 | status.UnlockBuffer(); |
557 | 557 | SetStatusMessage(status.String()); |
… |
… |
MediaConverterApp::_ConvertFile(BMediaFile* inFile, BMediaFile* outFile,
|
587 | 587 | &mh)) != B_OK) { |
588 | 588 | fprintf(stderr, "Error reading audio frames: %s\n", strerror(ret)); |
589 | 589 | snprintf(status.LockBuffer(128), 128, |
590 | | B_TRANSLATE("Error read audio frame %Ld"), i); |
| 590 | B_TRANSLATE("Error read audio frame %" B_PRId64 ""), i); |
591 | 591 | status.UnlockBuffer(); |
592 | 592 | SetStatusMessage(status.String()); |
593 | 593 | |
… |
… |
MediaConverterApp::_ConvertFile(BMediaFile* inFile, BMediaFile* outFile,
|
598 | 598 | framesRead)) != B_OK) { |
599 | 599 | fprintf(stderr, "Error writing audio frames: %s\n", strerror(ret)); |
600 | 600 | snprintf(status.LockBuffer(128), 128, |
601 | | B_TRANSLATE("Error writing audio frame %Ld"), i); |
| 601 | B_TRANSLATE("Error writing audio frame %" B_PRId64 ""), i); |
602 | 602 | status.UnlockBuffer(); |
603 | 603 | SetStatusMessage(status.String()); |
604 | 604 | |
… |
… |
MediaConverterApp::_ConvertFile(BMediaFile* inFile, BMediaFile* outFile,
|
609 | 609 | if (currPercent > lastPercent) { |
610 | 610 | lastPercent = currPercent; |
611 | 611 | snprintf(status.LockBuffer(128), 128, |
612 | | B_TRANSLATE("Writing audio track: %ld%% complete"), |
| 612 | B_TRANSLATE("Writing audio track: %" B_PRId32 "%% complete"), |
613 | 613 | currPercent); |
614 | 614 | status.UnlockBuffer(); |
615 | 615 | SetStatusMessage(status.String()); |
-
diff --git a/src/apps/mediaconverter/MediaConverterWindow.cpp b/src/apps/mediaconverter/MediaConverterWindow.cpp
index c835ec8..1049be1 100644
a
|
b
|
MediaConverterWindow::BuildAudioVideoMenus()
|
501 | 501 | BMenu* menu = fAudioMenu->Menu(); |
502 | 502 | BMenuItem* item; |
503 | 503 | // clear out old audio codec menu items |
504 | | while ((item = menu->RemoveItem(0L)) != NULL) |
| 504 | while ((item = menu->RemoveItem((int32)0)) != NULL) |
505 | 505 | delete item; |
506 | 506 | |
507 | 507 | bool separator = true; |
… |
… |
MediaConverterWindow::BuildAudioVideoMenus()
|
558 | 558 | |
559 | 559 | // clear out old video codec menu items |
560 | 560 | menu = fVideoMenu->Menu(); |
561 | | while ((item = menu->RemoveItem(0L)) != NULL) |
| 561 | while ((item = menu->RemoveItem((int32)0)) != NULL) |
562 | 562 | delete item; |
563 | 563 | |
564 | 564 | separator = true; |
-
diff --git a/src/apps/pairs/PairsView.cpp b/src/apps/pairs/PairsView.cpp
index 569832c..64074be 100644
a
|
b
|
PairsView::_ReadRandomIcons()
|
183 | 183 | } |
184 | 184 | |
185 | 185 | // delete the remaining bitmaps from the list |
186 | | while (BBitmap* bitmap = (BBitmap*)bitmaps.RemoveItem(0L)) |
| 186 | while (BBitmap* bitmap = (BBitmap*)bitmaps.RemoveItem((int32)0)) |
187 | 187 | delete bitmap; |
188 | 188 | } |
189 | 189 | |
-
diff --git a/src/apps/poorman/StatusSlider.cpp b/src/apps/poorman/StatusSlider.cpp
index 694cda0..9c39ea4 100644
a
|
b
|
StatusSlider::StatusSlider(const char* name, const char* label,
|
23 | 23 | const char* |
24 | 24 | StatusSlider::UpdateText() const |
25 | 25 | { |
26 | | sprintf(fTemp, "%ld %s", Value(), fStatusPrefix); |
| 26 | sprintf(fTemp, "%" B_PRId32 " %s", Value(), fStatusPrefix); |
27 | 27 | |
28 | 28 | return fTemp; |
29 | 29 | } |
-
diff --git a/src/apps/poorman/libhttpd/libhttpd.c b/src/apps/poorman/libhttpd/libhttpd.c
index dd9f5f6..f57f65f 100644
a
|
b
|
ls( httpd_conn* hc )
|
2921 | 2921 | |
2922 | 2922 | /* And print. */ |
2923 | 2923 | (void) fprintf( fp, |
2924 | | "%10lld %s <A HREF=\"/%.500s%s\">%.80s</A>%s%s%s\n", |
| 2924 | "%10" B_PRId64 " %s <A HREF=\"/%.500s%s\">%.80s</A>%s%s%s\n", |
2925 | 2925 | (int64_t) lsb.st_size, |
2926 | 2926 | timestr, encrname, S_ISDIR(sb.st_mode) ? "/" : "", |
2927 | 2927 | nameptrs[i], linkprefix, link, fileclass ); |
-
diff --git a/src/apps/showimage/ShowImageWindow.cpp b/src/apps/showimage/ShowImageWindow.cpp
index b79059e..687be6c 100644
a
|
b
|
ShowImageWindow::MessageReceived(BMessage* message)
|
711 | 711 | |
712 | 712 | while (fGoToPageMenu->CountItems() > 0) { |
713 | 713 | // Remove all page numbers |
714 | | delete fGoToPageMenu->RemoveItem(0L); |
| 714 | delete fGoToPageMenu->RemoveItem((int32)0); |
715 | 715 | } |
716 | 716 | |
717 | 717 | for (int32 i = 1; i <= pages; i++) { |
-
diff --git a/src/apps/soundrecorder/FileUtils.cpp b/src/apps/soundrecorder/FileUtils.cpp
index ba5ccf2..6200866 100644
a
|
b
|
CopyFileData(BFile& dst, BFile& src)
|
27 | 27 | struct stat src_stat; |
28 | 28 | status_t err = src.GetStat(&src_stat); |
29 | 29 | if (err != B_OK) { |
30 | | printf("couldn't get stat: %#010lx\n", err); |
| 30 | printf("couldn't get stat: %#010" B_PRIx32 "\n", err); |
31 | 31 | return err; |
32 | 32 | } |
33 | 33 | |
-
diff --git a/src/apps/soundrecorder/RecorderWindow.cpp b/src/apps/soundrecorder/RecorderWindow.cpp
index 49a182b..9a9e28d 100644
a
|
b
|
RecorderWindow::InitWindow()
|
457 | 457 | error = fRoster->GetDormantNodes(dni, &real_count, 0, &output_format, |
458 | 458 | 0, B_BUFFER_PRODUCER | B_PHYSICAL_INPUT); |
459 | 459 | if (real_count > maxInputCount) { |
460 | | WINDOW((stderr, "dropped %ld inputs\n", real_count - maxInputCount)); |
| 460 | WINDOW((stderr, "dropped %" B_PRId32 " inputs\n", real_count - maxInputCount)); |
461 | 461 | real_count = maxInputCount; |
462 | 462 | } |
463 | 463 | char selected_name[B_MEDIA_NAME_LENGTH] = "Default input"; |
… |
… |
RecorderWindow::ErrorAlert(const char * action, status_t err)
|
1172 | 1172 | { |
1173 | 1173 | char msg[300]; |
1174 | 1174 | if (err != B_OK) |
1175 | | sprintf(msg, "%s: %s. [%lx]", action, strerror(err), (int32) err); |
| 1175 | sprintf(msg, "%s: %s. [%" B_PRId32 "]", action, strerror(err), (int32) err); |
1176 | 1176 | else |
1177 | 1177 | sprintf(msg, "%s.", action); |
1178 | 1178 | BAlert* alert = new BAlert("", msg, B_TRANSLATE("Stop")); |
-
diff --git a/src/apps/soundrecorder/TrackSlider.cpp b/src/apps/soundrecorder/TrackSlider.cpp
index 34e92e5..fb0bb38 100644
a
|
b
|
TrackSlider::_TimeToString(bigtime_t timestamp, char *string)
|
408 | 408 | uint32 seconds = timestamp / 1000000LL; |
409 | 409 | timestamp -= seconds * 1000000LL; |
410 | 410 | uint32 centiseconds = timestamp / 10000LL; |
411 | | sprintf(string, "%02ld:%02ld:%02ld:%02ld", hours, minutes, seconds, |
| 411 | sprintf(string, "%02" B_PRId32 ":%02" B_PRId32 ":%02" B_PRId32 ":%02" B_PRId32 "", hours, minutes, seconds, |
412 | 412 | centiseconds); |
413 | 413 | } |
414 | 414 | |
-
diff --git a/src/apps/tv/Controller.cpp b/src/apps/tv/Controller.cpp
index 512c41f..9f00665 100644
a
|
b
|
Controller::ConnectInterface(int i)
|
147 | 147 | printf(" name '%s'\n", parameter->Name()); |
148 | 148 | printf(" kind '%s'\n", parameter->Kind()); |
149 | 149 | printf(" unit '%s'\n", parameter->Unit()); |
150 | | printf(" flags 0x%08lx\n", parameter->Flags()); |
| 150 | printf(" flags 0x%08" B_PRIx32 "\n", parameter->Flags()); |
151 | 151 | |
152 | 152 | // XXX TODO: matching on Name is weak |
153 | 153 | if (strcmp(parameter->Name(), "Channel") == 0 || strcmp(parameter->Kind(), B_TUNER_CHANNEL) == 0) { |
-
diff --git a/src/apps/tv/DeviceRoster.cpp b/src/apps/tv/DeviceRoster.cpp
index f94a4d1..d2fd4da 100644
a
|
b
|
DeviceRoster::DeviceRoster()
|
41 | 41 | err = MediaRoster()->GetLiveNodes(info, &info_count, NULL, NULL, "DVB*", |
42 | 42 | B_BUFFER_PRODUCER | B_PHYSICAL_INPUT); |
43 | 43 | if (err != B_OK || info_count < 1) { |
44 | | printf("Can't find live DVB node. Found %ld nodes, error %08lx (%s)\n", |
| 44 | printf("Can't find live DVB node. Found %" B_PRId32 " nodes, error %08" B_PRIx32 " (%s)\n", |
45 | 45 | info_count, err, strerror(err)); |
46 | 46 | fDeviceCount = 0; |
47 | 47 | } else { |
-
diff --git a/src/apps/tv/MainWin.cpp b/src/apps/tv/MainWin.cpp
index e3283a9..9f57fd0 100644
a
|
b
|
MainWin::KeyDown(BMessage *msg)
|
974 | 974 | uint32 raw_char = msg->FindInt32("raw_char"); |
975 | 975 | uint32 modifiers = msg->FindInt32("modifiers"); |
976 | 976 | |
977 | | printf("key 0x%lx, raw_char 0x%lx, modifiers 0x%lx\n", key, raw_char, |
| 977 | printf("key 0x%" B_PRIx32 ", raw_char 0x%" B_PRIx32 ", modifiers 0x%" B_PRIx32 "\n", key, raw_char, |
978 | 978 | modifiers); |
979 | 979 | |
980 | 980 | switch (raw_char) { |
-
diff --git a/src/apps/tv/VideoNode.cpp b/src/apps/tv/VideoNode.cpp
index 70c6755..3c924e9 100644
a
|
b
|
VideoNode::CreateBuffers(BRect frame, color_space cspace, bool overlay)
|
446 | 446 | printf("VideoNode::CreateBuffers failed\n"); |
447 | 447 | return B_ERROR; |
448 | 448 | } |
449 | | printf("overlay bitmap: got: bytes per row: %ld\n", |
| 449 | printf("overlay bitmap: got: bytes per row: %" B_PRId32 "\n", |
450 | 450 | fBitmap->BytesPerRow()); |
451 | 451 | fOverlayActive = overlay; |
452 | 452 | UnlockBitmap(); |
-
diff --git a/src/bin/network/arp/arp.cpp b/src/bin/network/arp/arp.cpp
index 9a8be9f..1e41394 100644
a
|
b
|
set_entries_from_file(const char *filename)
|
270 | 270 | char *rest = line; |
271 | 271 | const char *argument = next_argument(&rest); |
272 | 272 | if (argument == NULL) { |
273 | | fprintf(stderr, "%s: Line %ld is invalid (missing hostname).\n", |
| 273 | fprintf(stderr, "%s: Line %" B_PRId32 " is invalid (missing hostname).\n", |
274 | 274 | kProgramName, counter); |
275 | 275 | continue; |
276 | 276 | } |
… |
… |
set_entries_from_file(const char *filename)
|
280 | 280 | // get host by name |
281 | 281 | struct hostent *host = gethostbyname(argument); |
282 | 282 | if (host == NULL) { |
283 | | fprintf(stderr, "%s: Line %ld, host \"%s\" is not known in the IPv4 domain: %s\n", |
| 283 | fprintf(stderr, "%s: Line %" B_PRId32 ", host \"%s\" is not known in the IPv4 domain: %s\n", |
284 | 284 | kProgramName, counter, argument, strerror(errno)); |
285 | 285 | continue; |
286 | 286 | } |
287 | 287 | if (host->h_addrtype != AF_INET) { |
288 | | fprintf(stderr, "%s: Line %ld, host \"%s\" is not known in the IPv4 domain.\n", |
| 288 | fprintf(stderr, "%s: Line " B_PRId32 ", host \"%s\" is not known in the IPv4 domain.\n", |
289 | 289 | kProgramName, counter, argument); |
290 | 290 | continue; |
291 | 291 | } |
… |
… |
set_entries_from_file(const char *filename)
|
299 | 299 | |
300 | 300 | argument = next_argument(&rest); |
301 | 301 | if (argument == NULL) { |
302 | | fprintf(stderr, "%s: Line %ld is invalid (missing ethernet address).\n", |
| 302 | fprintf(stderr, "%s: Line %" B_PRId32 " is invalid (missing ethernet address).\n", |
303 | 303 | kProgramName, counter); |
304 | 304 | continue; |
305 | 305 | } |
306 | 306 | |
307 | 307 | uint8 ethernetAddress[6]; |
308 | 308 | if (!parse_ethernet_address(argument, ethernetAddress)) { |
309 | | fprintf(stderr, "%s: Line %ld, \"%s\" is not a valid ethernet address.\n", |
| 309 | fprintf(stderr, "%s: Line %" B_PRId32 ", \"%s\" is not a valid ethernet address.\n", |
310 | 310 | kProgramName, counter, argument); |
311 | 311 | continue; |
312 | 312 | } |
… |
… |
set_entries_from_file(const char *filename)
|
316 | 316 | uint32 flags = ARP_FLAG_PERMANENT; |
317 | 317 | while ((argument = next_argument(&rest)) != NULL) { |
318 | 318 | if (!set_flags(flags, argument)) { |
319 | | fprintf(stderr, "%s: Line %ld, ignoring invalid flag \"%s\".\n", |
| 319 | fprintf(stderr, "%s: Line %" B_PRId32 ", ignoring invalid flag \"%s\".\n", |
320 | 320 | kProgramName, counter, argument); |
321 | 321 | } |
322 | 322 | } |
323 | 323 | |
324 | 324 | status_t status = set_entry(&address, ethernetAddress, flags); |
325 | 325 | if (status != B_OK) { |
326 | | fprintf(stderr, "%s: Line %ld, ARP entry could not been set: %s\n", |
| 326 | fprintf(stderr, "%s: Line %" B_PRId32 ", ARP entry could not been set: %s\n", |
327 | 327 | kProgramName, counter, strerror(status)); |
328 | 328 | } |
329 | 329 | } |
-
diff --git a/src/kits/game/WindowScreen.cpp b/src/kits/game/WindowScreen.cpp
index 38d482b..a5773de 100644
a
|
b
|
BWindowScreen::Suspend(char* label)
|
536 | 536 | CALLED(); |
537 | 537 | if (fDebugState) { |
538 | 538 | fprintf(stderr, "## Debugger(\"%s\").", label); |
539 | | fprintf(stderr, " Press Alt-F%ld or Cmd-F%ld to resume.\n", |
| 539 | fprintf(stderr, " Press Alt-F%" B_PRId32 " or Cmd-F%" B_PRId32 " to resume.\n", |
540 | 540 | fWorkspaceIndex + 1, fWorkspaceIndex + 1); |
541 | 541 | |
542 | 542 | if (IsLocked()) |
-
diff --git a/src/kits/midi2/MidiRosterLooper.cpp b/src/kits/midi2/MidiRosterLooper.cpp
index c4b64ea..34d5392 100644
a
|
b
|
BMidiRosterLooper::~BMidiRosterLooper()
|
47 | 47 | BMidiEndpoint* endp = EndpointAt(t); |
48 | 48 | if (endp->fRefCount > 0) { |
49 | 49 | fprintf( |
50 | | stderr, "[midi] WARNING: Endpoint %ld (%p) has " |
51 | | "not been Release()d properly (refcount = %ld)\n", |
| 50 | stderr, "[midi] WARNING: Endpoint %" B_PRId32 " (%p) has " |
| 51 | "not been Release()d properly (refcount = %" B_PRId32 ")\n", |
52 | 52 | endp->ID(), endp, endp->fRefCount); |
53 | 53 | } else { |
54 | 54 | delete endp; |
-
diff --git a/src/kits/print/PicturePrinter.cpp b/src/kits/print/PicturePrinter.cpp
index b90d0f6..5f7a253 100644
a
|
b
|
void PicturePrinter::SetFontFlags(int32 flags) {
|
399 | 399 | if (flags == 0) Print("none set"); |
400 | 400 | PRINT_FLAG(B_DISABLE_ANTIALIASING); |
401 | 401 | PRINT_FLAG(B_FORCE_ANTIALIASING); |
402 | | if (flags != f) printf("Unknown Additional Flags %ld", flags & ~f); |
| 402 | if (flags != f) printf("Unknown Additional Flags %" B_PRId32 "", flags & ~f); |
403 | 403 | Cr(); |
404 | 404 | } |
405 | 405 | |
… |
… |
void PicturePrinter::SetFontFace(int32 flags) {
|
420 | 420 | PRINT_FLAG(B_OUTLINED_FACE); |
421 | 421 | PRINT_FLAG(B_UNDERSCORE_FACE); |
422 | 422 | PRINT_FLAG(B_STRIKEOUT_FACE); |
423 | | if (flags != f) printf("Unknown Additional Flags %ld", flags & ~f); |
| 423 | if (flags != f) printf("Unknown Additional Flags %" B_PRId32 "", flags & ~f); |
424 | 424 | Cr(); |
425 | 425 | } |
426 | 426 | |
-
diff --git a/src/kits/print/PrinterDriverAddOn.cpp b/src/kits/print/PrinterDriverAddOn.cpp
index 9befde3..3368658 100644
a
|
b
|
PrinterDriverAddOn::TakeJob(const char* spoolFile, BDirectory* spoolFolder)
|
143 | 143 | // This seems to be required for legacy? |
144 | 144 | // HP PCL3 add-on crashes without it! |
145 | 145 | BMessage parameters(B_REFS_RECEIVED); |
146 | | parameters.AddInt32("file", (int32)&file); |
147 | | parameters.AddInt32("printer", (int32)spoolFolder); |
| 146 | parameters.AddInt32("file", (addr_t)&file); |
| 147 | parameters.AddInt32("printer", (addr_t)spoolFolder); |
148 | 148 | |
149 | 149 | BMessage* message = (*func)(&file, spoolFolder, ¶meters); |
150 | 150 | if (message == NULL || message->what != 'okok') |
-
diff --git a/src/libs/icon/message/MessageImporter.cpp b/src/libs/icon/message/MessageImporter.cpp
index 403b2cc..bcf7821 100644
a
|
b
|
MessageImporter::_ImportShapes(const BMessage* archive, PathContainer* paths,
|
182 | 182 | int32 styleIndex; |
183 | 183 | if (shapeArchive.FindInt32("style ref", &styleIndex) < B_OK) { |
184 | 184 | printf("MessageImporter::_ImportShapes() - " |
185 | | "Shape %ld doesn't reference a Style!", i); |
| 185 | "Shape %" B_PRId32 " doesn't reference a Style!", i); |
186 | 186 | continue; |
187 | 187 | } |
188 | 188 | #ifdef ICON_O_MATIC |
… |
… |
MessageImporter::_ImportShapes(const BMessage* archive, PathContainer* paths,
|
192 | 192 | #endif |
193 | 193 | if (!style) { |
194 | 194 | printf("MessageImporter::_ImportShapes() - " |
195 | | "Shape %ld wants Style %ld, which does not exist\n", |
| 195 | "Shape %" B_PRId32 " wants Style %" B_PRId32 ", which does not exist\n", |
196 | 196 | i, styleIndex); |
197 | 197 | continue; |
198 | 198 | } |
… |
… |
MessageImporter::_ImportShapes(const BMessage* archive, PathContainer* paths,
|
218 | 218 | #endif |
219 | 219 | if (!path) { |
220 | 220 | printf("MessageImporter::_ImportShapes() - " |
221 | | "Shape %ld referenced path %ld, " |
| 221 | "Shape %" B_PRId32 " referenced path %" B_PRId32 ", " |
222 | 222 | "which does not exist\n", i, pathIndex); |
223 | 223 | continue; |
224 | 224 | } |
-
diff --git a/src/libs/icon/shape/VectorPath.cpp b/src/libs/icon/shape/VectorPath.cpp
index a2f88a8..b800a07 100644
a
|
b
|
void
|
976 | 976 | VectorPath::PrintToStream() const |
977 | 977 | { |
978 | 978 | for (int32 i = 0; i < fPointCount; i++) { |
979 | | printf("point %ld: (%f, %f) -> (%f, %f) -> (%f, %f) (%d)\n", i, |
| 979 | printf("point %" B_PRId32 ": (%f, %f) -> (%f, %f) -> (%f, %f) (%d)\n", i, |
980 | 980 | fPath[i].point_in.x, fPath[i].point_in.y, |
981 | 981 | fPath[i].point.x, fPath[i].point.y, |
982 | 982 | fPath[i].point_out.x, fPath[i].point_out.y, fPath[i].connected); |
… |
… |
VectorPath::_SetPointCount(int32 count)
|
1085 | 1085 | // reallocation might have failed |
1086 | 1086 | fPointCount = 0; |
1087 | 1087 | fAllocCount = 0; |
1088 | | fprintf(stderr, "VectorPath::_SetPointCount(%ld) - allocation failed!\n", |
| 1088 | fprintf(stderr, "VectorPath::_SetPointCount(%" B_PRId32 ") - allocation failed!\n", |
1089 | 1089 | count); |
1090 | 1090 | } |
1091 | 1091 | |
-
diff --git a/src/libs/icon/style/GradientTransformable.cpp b/src/libs/icon/style/GradientTransformable.cpp
index 50c8525..5baf553 100644
a
|
b
|
Gradient::PrintToStream() const
|
591 | 591 | string_for_interpolation(fInterpolation), |
592 | 592 | fInheritTransformation); |
593 | 593 | for (int32 i = 0; BGradient::ColorStop* step = ColorAt(i); i++) { |
594 | | printf(" %ld: offset: %.1f -> color(%d, %d, %d, %d)\n", |
| 594 | printf(" %" B_PRId32 ": offset: %.1f -> color(%d, %d, %d, %d)\n", |
595 | 595 | i, step->offset, |
596 | 596 | step->color.red, |
597 | 597 | step->color.green, |
-
diff --git a/src/preferences/printers/JobListView.cpp b/src/preferences/printers/JobListView.cpp
index 473ec65..ff371d9 100644
a
|
b
|
JobListView::JobListView(BRect frame)
|
42 | 42 | JobListView::~JobListView() |
43 | 43 | { |
44 | 44 | while (!IsEmpty()) |
45 | | delete RemoveItem(0L); |
| 45 | delete RemoveItem((int32)0); |
46 | 46 | } |
47 | 47 | |
48 | 48 | |
… |
… |
JobListView::SetSpoolFolder(SpoolFolder* folder)
|
61 | 61 | { |
62 | 62 | // clear list |
63 | 63 | while (!IsEmpty()) |
64 | | delete RemoveItem(0L); |
| 64 | delete RemoveItem((int32)0); |
65 | 65 | |
66 | 66 | if (folder == NULL) |
67 | 67 | return; |
-
diff --git a/src/preferences/printers/PrinterListView.cpp b/src/preferences/printers/PrinterListView.cpp
index bfc5f50..1c7deaa 100644
a
|
b
|
PrinterListView::PrinterListView(BRect frame)
|
45 | 45 | PrinterListView::~PrinterListView() |
46 | 46 | { |
47 | 47 | while (!IsEmpty()) |
48 | | delete RemoveItem(0L); |
| 48 | delete RemoveItem((int32)0); |
49 | 49 | } |
50 | 50 | |
51 | 51 | |
… |
… |
PrinterListView::BuildPrinterList()
|
54 | 54 | { |
55 | 55 | // clear list |
56 | 56 | while (!IsEmpty()) |
57 | | delete RemoveItem(0L); |
| 57 | delete RemoveItem((int32)0); |
58 | 58 | |
59 | 59 | // Find directory containing printer definition nodes |
60 | 60 | BPath path; |
-
diff --git a/src/servers/cddb_daemon/cddb_daemon.cpp b/src/servers/cddb_daemon/cddb_daemon.cpp
index ef2529d..a3b269b 100644
a
|
b
|
CDDBDaemon::_Lookup(const dev_t device)
|
84 | 84 | uint32 cddbId; |
85 | 85 | if (!_CanLookup(device, &cddbId, toc)) { |
86 | 86 | free(toc); |
87 | | printf("Skipping device with id %ld.\n", device); |
| 87 | printf("Skipping device with id %" B_PRId32 ".\n", device); |
88 | 88 | return B_BAD_TYPE; |
89 | 89 | } |
90 | 90 | |
91 | | printf("Looking up CD with CDDB Id %08lx.\n", cddbId); |
| 91 | printf("Looking up CD with CDDB Id %08" B_PRId32 ".\n", cddbId); |
92 | 92 | |
93 | 93 | CDDBServer cddb_server("freedb.freedb.org:80"); |
94 | 94 | |
… |
… |
CDDBDaemon::_Lookup(const dev_t device)
|
123 | 123 | // Delete itens in the query response BList; |
124 | 124 | int32 count = queryResponse.CountItems(); |
125 | 125 | for (int32 i = 0; i < count; ++i) { |
126 | | delete (QueryResponseData*)queryResponse.RemoveItem(0L); |
| 126 | delete (QueryResponseData*)queryResponse.RemoveItem((int32)0); |
127 | 127 | } |
128 | 128 | |
129 | 129 | queryResponse.MakeEmpty(); |
… |
… |
CDDBDaemon::_Lookup(const dev_t device)
|
131 | 131 | // Delete itens in the track data BList in the read response data; |
132 | 132 | count = readResponse.tracks.CountItems(); |
133 | 133 | for (int32 i = 0; i < count; ++i) { |
134 | | delete (TrackData*)readResponse.tracks.RemoveItem(0L); |
| 134 | delete (TrackData*)readResponse.tracks.RemoveItem((int32)0); |
135 | 135 | } |
136 | 136 | |
137 | 137 | readResponse.tracks.MakeEmpty(); |
-
diff --git a/src/servers/cddb_daemon/cddb_server.cpp b/src/servers/cddb_daemon/cddb_server.cpp
index 8bbc93f..2961e1e 100644
a
|
b
|
CDDBServer::Query(uint32 cddbId, const scsi_toc_toc* toc, BList* queryResponse)
|
56 | 56 | |
57 | 57 | // Convert CDDB id to hexadecimal format. |
58 | 58 | char hexCddbId[9]; |
59 | | sprintf(hexCddbId, "%08lx", cddbId); |
| 59 | sprintf(hexCddbId, "%08" B_PRId32 "", cddbId); |
60 | 60 | |
61 | 61 | // Assemble the Query command. |
62 | 62 | int32 numTracks = toc->last_track + 1 - toc->first_track; |
-
diff --git a/src/servers/print/ConfigWindow.cpp b/src/servers/print/ConfigWindow.cpp
index eebea2d..6a8f6fb 100644
a
|
b
|
ConfigWindow::SetupPrintersMenu(BMenu* menu)
|
414 | 414 | { |
415 | 415 | // clear menu |
416 | 416 | while (menu->CountItems() != 0) |
417 | | delete menu->RemoveItem(0L); |
| 417 | delete menu->RemoveItem((int32)0); |
418 | 418 | |
419 | 419 | // fill menu with printer names |
420 | 420 | BAutolock lock(gLock); |