diff --git a/src/add-ons/kernel/file_systems/userlandfs/server/UserlandRequestHandler.cpp b/src/add-ons/kernel/file_systems/userlandfs/server/UserlandRequestHandler.cpp index bf40720c92..8fa26e335d 100644 --- a/src/add-ons/kernel/file_systems/userlandfs/server/UserlandRequestHandler.cpp +++ b/src/add-ons/kernel/file_systems/userlandfs/server/UserlandRequestHandler.cpp @@ -217,8 +217,8 @@ UserlandRequestHandler::HandleRequest(Request* request) case NODE_MONITORING_EVENT_REQUEST: return _HandleRequest((NodeMonitoringEventRequest*)request); } -PRINT(("UserlandRequestHandler::HandleRequest(): unexpected request: %lu\n", -request->GetType())); + PRINT(("UserlandRequestHandler::HandleRequest(): unexpected request: %" + B_PRIu32 "\n", request->GetType())); return B_BAD_DATA; } @@ -1494,15 +1494,17 @@ UserlandRequestHandler::_HandleRequest(ReadDirRequest* request) &countRead); } -D( -if (result == B_OK && countRead > 0) { - dirent* entry = (dirent*)buffer; - PRINT((" entry: d_dev: %ld, d_pdev: %ld, d_ino: %Ld, d_pino: %Ld, " - "d_reclen: %hu, d_name: %.32s\n", - entry->d_dev, entry->d_pdev, entry->d_ino, entry->d_pino, - entry->d_reclen, entry->d_name)); -} -) + D( + if (result == B_OK && countRead > 0) { + dirent* entry = (dirent*)buffer; + PRINT((" entry: d_dev: %" B_PRIdDEV ", d_pdev: %" B_PRIdDEV ", " + "d_ino: %" B_PRIdINO ", d_pino: %" B_PRIdINO ", " + "d_reclen: %hu, d_name: %.32s\n", + entry->d_dev, entry->d_pdev, + entry->d_ino, entry->d_pino, + entry->d_reclen, entry->d_name)); + } + ) // reconstruct the reply, in case it has been overwritten reply = new(reply) ReadDirReply; diff --git a/src/add-ons/kernel/file_systems/userlandfs/server/haiku/file_cache.cpp b/src/add-ons/kernel/file_systems/userlandfs/server/haiku/file_cache.cpp index ea3819b4bd..cf4e7ac3b5 100644 --- a/src/add-ons/kernel/file_systems/userlandfs/server/haiku/file_cache.cpp +++ b/src/add-ons/kernel/file_systems/userlandfs/server/haiku/file_cache.cpp @@ -31,7 +31,8 @@ struct FileCache { void* file_cache_create(dev_t mountID, ino_t vnodeID, off_t size) { - PRINT(("file_cache_create(%ld, %lld, %lld)\n", mountID, vnodeID, size)); + PRINT(("file_cache_create(%" B_PRIdDEV ", %" B_PRIdINO ", %" + B_PRIdOFF ")\n", mountID, vnodeID, size)); // create the client-side object FileCache* fileCache = new(std::nothrow) FileCache(mountID, vnodeID); @@ -150,8 +151,8 @@ status_t file_cache_read(void *cacheRef, void *cookie, off_t offset, void *bufferBase, size_t *_size) { - PRINT(("file_cache_read(%p, %p, %lld, %p, %lu)\n", cacheRef, cookie, offset, - bufferBase, *_size)); + PRINT(("file_cache_read(%p, %p, %" B_PRIdOFF ", %p, %lu)\n", + cacheRef, cookie, offset, bufferBase, *_size)); FileCache* fileCache = (FileCache*)cacheRef; @@ -164,8 +165,8 @@ status_t file_cache_write(void *cacheRef, void *cookie, off_t offset, const void *buffer, size_t *_size) { - PRINT(("file_cache_write(%p, %p, %lld, %p, %lu)\n", cacheRef, cookie, - offset, buffer, *_size)); + PRINT(("file_cache_write(%p, %p, %" B_PRIdOFF ", %p, %lu)\n", + cacheRef, cookie, offset, buffer, *_size)); FileCache* fileCache = (FileCache*)cacheRef;