From Murai Takashi <tmurai01@xxxxxxxxx>:
Murai Takashi has uploaded this change for review. (
https://review.haiku-os.org/c/haiku/+/3349 ;)
Change subject: file_systems/netfs: Fix -Wformat=
......................................................................
file_systems/netfs: Fix -Wformat=
Change-Id: I291900a38cedf6b0bf6b61e55256ba60bff7935d
---
M src/add-ons/kernel/file_systems/netfs/server/ClientConnection.cpp
M src/add-ons/kernel/file_systems/netfs/server/NodeMonitor.cpp
M src/add-ons/kernel/file_systems/netfs/server/VolumeManager.cpp
M src/add-ons/kernel/file_systems/netfs/shared/InsecureConnection.cpp
M src/add-ons/kernel/file_systems/netfs/shared/RequestDumper.cpp
5 files changed, 49 insertions(+), 40 deletions(-)
git pull ssh://git.haiku-os.org:22/haiku refs/changes/49/3349/1
diff --git a/src/add-ons/kernel/file_systems/netfs/server/ClientConnection.cpp
b/src/add-ons/kernel/file_systems/netfs/server/ClientConnection.cpp
index 4ab992a..7914d84 100644
--- a/src/add-ons/kernel/file_systems/netfs/server/ClientConnection.cpp
+++ b/src/add-ons/kernel/file_systems/netfs/server/ClientConnection.cpp
@@ -1608,12 +1608,13 @@
if (result == B_OK) {
_GetNodeInfo(directory, &reply.nodeInfo);
reply.cookie = handle->GetCookie();
+ } else {
+ if (directory) {
+ PRINT("OpenDir() failed: client volume: %" B_PRId32 ", "
+ "node: (%" B_PRIdDEV ", %" B_PRIdINO ")\n",
+ volume->GetID(), directory->GetVolumeID(),
directory->GetID());
+ }
}
-else {
-if (directory)
-PRINT("OpenDir() failed: client volume: %ld, node: (%ld, %lld)\n",
-volume->GetID(), directory->GetVolumeID(), directory->GetID());
-}
managerLocker.Unlock();
@@ -1677,9 +1678,10 @@
result = B_PERMISSION_DENIED;
}
-if (result == B_OK) {
- PRINT("ReadDir: (%ld, %lld)\n", request->volumeID, directory->GetID());
-}
+ if (result == B_OK) {
+ PRINT("ReadDir: (%" B_PRId32 ", %" B_PRIdINO ")\n",
request->volumeID,
+ directory->GetID());
+ }
// rewind, if requested
if (result == B_OK && request->rewind)
@@ -1711,11 +1713,13 @@
//directoryID, reply.error, reply.entryInfos.CountElements(),
//reply.entryInfo.directoryID,
//reply.entryInfo.nodeID, reply.entryInfo.name.GetString()));
-if (directory) {
-PRINT("ReadDir done: volume: %ld, (%ld, %lld) -> (%lx, %ld)\n",
-volume->GetID(), directory->GetVolumeID(), directory->GetID(), result,
-reply.entryInfos.CountElements());
-}
+ if (directory) {
+ PRINT("ReadDir done: volume: %" B_PRId32 ", "
+ "(%" B_PRIdDEV ", %" B_PRIdINO ") -> "
+ "(%" B_PRIx32 ", %" B_PRId32 ")\n",
+ volume->GetID(), directory->GetVolumeID(),
directory->GetID(),
+ result, reply.entryInfos.CountElements());
+ }
managerLocker.Unlock();
@@ -1788,7 +1792,8 @@
// send the reply
reply.error = result;
- PRINT("Walk: (%ld, %lld, `%s') -> (%lx, (%ld, %lld), `%s')\n",
+ PRINT("Walk: (%" B_PRIdDEV ", %" B_PRIdINO ", `%s') -> "
+ "(%" B_PRIx32 ", (%" B_PRIdDEV ", %" B_PRIdINO "), `%s')\n",
request->nodeID.volumeID, request->nodeID.nodeID,
request->name.GetString(), result,
reply.entryInfo.nodeInfo.st.st_dev,
@@ -1854,7 +1859,8 @@
// send the reply
reply.error = result;
- PRINT("MultiWalk: (%ld, %lld, %ld) -> (%lx, %ld)\n",
+ PRINT("MultiWalk: (%" B_PRIdDEV ", %" B_PRIdINO ", %" B_PRId32 ") -> "
+ "(%" B_PRIx32 ", %" B_PRId32 ")\n",
request->nodeID.volumeID, request->nodeID.nodeID, count,
result, reply.entryInfos.CountElements());
return GetChannel()->SendRequest(&reply);
@@ -2432,7 +2438,7 @@
break;
if (countRead == 0)
break;
- PRINT(" query entry: %ld, %lld, \"%s\"\n",
+ PRINT(" query entry: %" B_PRIdDEV ", %" B_PRIdINO ", \"%s\"\n",
dirEntry->d_pdev, dirEntry->d_pino, dirEntry->d_name);
VolumeManagerLocker managerLocker;
@@ -2472,8 +2478,10 @@
// send the reply
reply.error = result;
reply.count = countRead;
- PRINT("ReadQuery: (%lx, %ld, dir: (%ld, %lld), node: (%ld, %lld, `%s')"
- "\n", reply.error, reply.count,
+ PRINT("ReadQuery: (%" B_PRIx32 ", %" B_PRId32 ", "
+ "dir: (%" B_PRIdDEV ", %" B_PRIdINO "), "
+ "node: (% "B_PRIdDEV ", %" B_PRIdINO ", `%s')\n",
+ reply.error, reply.count,
reply.entryInfo.directoryID.volumeID,
reply.entryInfo.directoryID.nodeID,
reply.entryInfo.nodeInfo.st.st_dev,
@@ -2573,8 +2581,8 @@
return;
}
PRINT("ClientConnection::ProcessQueryEvent(): event: %p, type: %s:"
- " directory: (%ld, %lld)\n", event, typeid(event).name(),
- volumeID, directoryID);
+ " directory: (%" B_PRIdDEV ", % "B_PRIdINO ")\n",
+ event, typeid(event).name(), volumeID, directoryID);
// create an array for the IDs of the client volumes a found entry may
// reside on
diff --git a/src/add-ons/kernel/file_systems/netfs/server/NodeMonitor.cpp
b/src/add-ons/kernel/file_systems/netfs/server/NodeMonitor.cpp
index 9948f07..c271d05 100644
--- a/src/add-ons/kernel/file_systems/netfs/server/NodeMonitor.cpp
+++ b/src/add-ons/kernel/file_systems/netfs/server/NodeMonitor.cpp
@@ -101,10 +101,10 @@
if (error == B_OK)
error = watch_node(&ref, flags, this);
}
-if (error == B_OK) {
- PRINT("NodeMonitor: started watching node: (%ld, %lld)\n", ref.device,
- ref.node);
-}
+ if (error == B_OK) {
+ PRINT("NodeMonitor: started watching node: "
+ "(%" B_PRIdDEV ", %" B_PRIdINO ")\n", ref.device,
ref.node);
+ }
return error;
}
@@ -112,8 +112,8 @@
status_t
NodeMonitor::StopWatching(const node_ref& ref)
{
- PRINT("NodeMonitor: stopped watching node: (%ld, %lld)\n", ref.device,
- ref.node);
+ PRINT("NodeMonitor: stopped watching node: "
+ "(%" B_PRIdDEV ", %" B_PRIdINO ")\n", ref.device, ref.node);
return watch_node(&ref, B_STOP_WATCHING, this);
}
diff --git a/src/add-ons/kernel/file_systems/netfs/server/VolumeManager.cpp
b/src/add-ons/kernel/file_systems/netfs/server/VolumeManager.cpp
index f180e22..30f3868 100644
--- a/src/add-ons/kernel/file_systems/netfs/server/VolumeManager.cpp
+++ b/src/add-ons/kernel/file_systems/netfs/server/VolumeManager.cpp
@@ -719,7 +719,7 @@
Entry* entry = GetEntry(volumeID, directoryID, name);
if (!entry) {
// entry not known yet: create it
- PRINT("VolumeManager::LoadEntry(%ld, %lld, `%s')\n", volumeID,
+ PRINT("VolumeManager::LoadEntry(%" B_PRIdDEV ", %" B_PRIdINO ",
`%s')\n", volumeID,
directoryID, name);
// get the volume
@@ -791,7 +791,8 @@
if (!queryDomain || !queryString || !handle)
return B_BAD_VALUE;
bool liveQuery = (flags & B_LIVE_QUERY);
- PRINT("VolumeManager::OpenQuery(%p, \"%s\", 0x%lx, %ld, %ld)\n",
+ PRINT("VolumeManager::OpenQuery(%p, \"%s\", 0x%" B_PRIx32 ", "
+ "%" B_PRId32 ", %" B_PRId32 ")\n",
queryDomain, queryString, flags, remotePort, remoteToken);
// allocate the handle
@@ -827,8 +828,8 @@
// branches of the FS tree and don't have common nodes.
if (!queryDomain->QueryDomainIntersectsWith(volume))
continue;
- PRINT("VolumeManager::OpenQuery(): adding Query for volume %ld"
- "\n", volume->GetID());
+ PRINT("VolumeManager::OpenQuery(): adding Query for volume "
+ "%" B_PRIdDEV "\n", volume->GetID());
// create the query for this volume
BVolume bVolume(volume->GetID());
@@ -1710,7 +1711,7 @@
event->nodeID = st.st_ino;
if (Volume* volume = GetVolume(st.st_dev)) {
if (volume->GetRootID() == st.st_ino) {
- PRINT("Mount point for volume %ld renamed\n",
+ PRINT("Mount point for volume %" B_PRIdDEV "
renamed\n",
volume->GetID());
}
}
diff --git
a/src/add-ons/kernel/file_systems/netfs/shared/InsecureConnection.cpp
b/src/add-ons/kernel/file_systems/netfs/shared/InsecureConnection.cpp
index 253e5e0..9fb49fd 100644
--- a/src/add-ons/kernel/file_systems/netfs/shared/InsecureConnection.cpp
+++ b/src/add-ons/kernel/file_systems/netfs/shared/InsecureConnection.cpp
@@ -161,7 +161,7 @@
// open the remaining channels
int32 allChannels = upStreamChannels + downStreamChannels;
for (int32 i = 1; i < allChannels; i++) {
- PRINT(" creating channel %ld\n", i);
+ PRINT(" creating channel %" B_PRId32 "\n", i);
// open the channel
error = _OpenClientChannel(serverAddr, port, &channel);
if (error != B_OK)
@@ -292,7 +292,7 @@
}
RETURN_ERROR(error);
}
- PRINT(" accepting channel %ld\n", i);
+ PRINT(" accepting channel %" B_PRId32 "\n", i);
// create a channel
channel = new(std::nothrow) InsecureChannel(channelFD);
if (!channel) {
diff --git a/src/add-ons/kernel/file_systems/netfs/shared/RequestDumper.cpp
b/src/add-ons/kernel/file_systems/netfs/shared/RequestDumper.cpp
index 64ef627..114abf0 100644
--- a/src/add-ons/kernel/file_systems/netfs/shared/RequestDumper.cpp
+++ b/src/add-ons/kernel/file_systems/netfs/shared/RequestDumper.cpp
@@ -69,43 +69,43 @@
void
RequestDumper::Visit(RequestMember* member, int32& data)
{
- PRINT("%sint32: %ld\n", _Indentation(), data);
+ PRINT("%sint32: %" B_PRId32 "\n", _Indentation(), data);
}
// Visit
void
RequestDumper::Visit(RequestMember* member, uint32& data)
{
- PRINT("%suint32: %lu\n", _Indentation(), data);
+ PRINT("%suint32: %" B_PRIu32 "\n", _Indentation(), data);
}
// Visit
void
RequestDumper::Visit(RequestMember* member, int64& data)
{
- PRINT("%sint64: %lld\n", _Indentation(), data);
+ PRINT("%sint64: %" B_PRId64 "\n", _Indentation(), data);
}
// Visit
void
RequestDumper::Visit(RequestMember* member, uint64& data)
{
- PRINT("%suint64: %llu\n", _Indentation(), data);
+ PRINT("%suint64: %" B_PRIu64 "\n", _Indentation(), data);
}
// Visit
void
RequestDumper::Visit(RequestMember* member, Data& data)
{
- PRINT("%sdata: %p (%ld bytes)\n", _Indentation(), data.GetData(),
- data.GetSize());
+ PRINT("%sdata: %p (%" B_PRId32 " bytes)\n", _Indentation(),
+ data.GetData(), data.GetSize());
}
// Visit
void
RequestDumper::Visit(RequestMember* member, StringData& data)
{
- PRINT("%sstring: \"%s\" (%p, %ld bytes)\n", _Indentation(),
+ PRINT("%sstring: \"%s\" (%p, %" B_PRId32 " bytes)\n", _Indentation(),
data.GetString(), data.GetString(), data.GetSize());
}
--
To view, visit https://review.haiku-os.org/c/haiku/+/3349
To unsubscribe, or for help writing mail filters, visit
https://review.haiku-os.org/settings
Gerrit-Project: haiku
Gerrit-Branch: master
Gerrit-Change-Id: I291900a38cedf6b0bf6b61e55256ba60bff7935d
Gerrit-Change-Number: 3349
Gerrit-PatchSet: 1
Gerrit-Owner: Murai Takashi <tmurai01@xxxxxxxxx>
Gerrit-MessageType: newchange
