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

netfs: fixes some x86_64 build failures.

Browse Source 
* long is used in vnode_ops in fs_proto.h whereas it should be int32.
* at least one reply object is casted an int32 cookie as a pointer.
This commit is contained in:
Jérôme Duval
2014-11-18 00:05:02 +01:00
parent 073da30265
commit 20f046edb9
6 changed files with 21 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/kernel/file_systems/netfs/client/ShareVolume.cpp
+3 -3
View File
@@ -191,7 +191,7 @@ PRINT(("ShareVolume::~ShareVolume()\n"));
// there shouldn't be any more nodes // there shouldn't be any more nodes
if (fNodes->Size() > 0) { if (fNodes->Size() > 0) {
WARN("ShareVolume::~ShareVolume(): WARNING: There are still " WARN("ShareVolume::~ShareVolume(): WARNING: There are still "
"%ld nodes\n", fNodes->Size()); "%" B_PRId32 " nodes\n", fNodes->Size());
} }
for (NodeMap::Iterator it = fNodes->GetIterator(); it.HasNext();) for (NodeMap::Iterator it = fNodes->GetIterator(); it.HasNext();)
delete it.Next().value; delete it.Next().value;
@@ -203,7 +203,7 @@ PRINT(("ShareVolume::~ShareVolume()\n"));
// there shouldn't be any more entries // there shouldn't be any more entries
if (fEntries->Size() > 0) { if (fEntries->Size() > 0) {
WARN("ShareVolume::~ShareVolume(): WARNING: There are still " WARN("ShareVolume::~ShareVolume(): WARNING: There are still "
"%ld entries\n", fEntries->Size()); "%" B_PRId32 " entries\n", fEntries->Size());
} }
for (EntryMap::Iterator it = fEntries->GetIterator(); it.HasNext();) for (EntryMap::Iterator it = fEntries->GetIterator(); it.HasNext();)
delete it.Next().value; delete it.Next().value;
@@ -2751,7 +2751,7 @@ ShareVolume::_RemoveAttrDirIterator(ShareNode* node,
= fAttrDirIterators->Get(node->GetID()); = fAttrDirIterators->Get(node->GetID());
if (!iteratorList) { if (!iteratorList) {
WARN("ShareVolume::_RemoveAttrDirIterator(): Iterator list not " WARN("ShareVolume::_RemoveAttrDirIterator(): Iterator list not "
"found: node: %lld\n", node->GetID()); "found: node: %" B_PRIdINO "\n", node->GetID());
return; return;
} }
src/add-ons/kernel/file_systems/netfs/client/VolumeSupport.h
+1 -1
View File
@@ -31,7 +31,7 @@ next_dirent(struct dirent*& buffer, size_t& bufferSize)
{ {
// align // align
char* nextBuffer = (char*)buffer + buffer->d_reclen; char* nextBuffer = (char*)buffer + buffer->d_reclen;
nextBuffer = (char*)(((uint32)nextBuffer + 3) & ~0x3); nextBuffer = (char*)(((addr_t)nextBuffer + 3) & ~0x3);
// check, if the buffer is at least large enough to align the current entry // check, if the buffer is at least large enough to align the current entry
int32 len = nextBuffer - (char*)buffer; int32 len = nextBuffer - (char*)buffer;
src/add-ons/kernel/file_systems/netfs/client/netfs.cpp
+9 -3
View File
@@ -669,8 +669,10 @@ netfs_read_dir(void *ns, void *_node, void *cookie, long *count,
Node* node = (Node*)_node; Node* node = (Node*)_node;
PRINT("netfs_read_dir(%p, %p, %p, %ld, %p, %lu)\n", ns, node, cookie, PRINT("netfs_read_dir(%p, %p, %p, %ld, %p, %lu)\n", ns, node, cookie,
*count, buffer, bufferSize); *count, buffer, bufferSize);
int32 _count = *count;
status_t error = node->GetVolume()->ReadDir(node, cookie, buffer, status_t error = node->GetVolume()->ReadDir(node, cookie, buffer,
bufferSize, *count, count); bufferSize, _count, &_count);
*count = _count;
PRINT("netfs_read_dir() done: (%lx, %ld)\n", error, *count); PRINT("netfs_read_dir() done: (%lx, %ld)\n", error, *count);
#if DEBUG #if DEBUG
dirent* entry = buffer; dirent* entry = buffer;
@@ -767,8 +769,10 @@ netfs_read_attrdir(void *ns, void *_node, void *cookie, long *count,
Node* node = (Node*)_node; Node* node = (Node*)_node;
PRINT("netfs_read_attrdir(%p, %p, %p, %ld, %p, %lu)\n", ns, node, PRINT("netfs_read_attrdir(%p, %p, %p, %ld, %p, %lu)\n", ns, node,
cookie, *count, buffer, bufferSize); cookie, *count, buffer, bufferSize);
int32 _count = *count;
status_t error = node->GetVolume()->ReadAttrDir(node, cookie, buffer, status_t error = node->GetVolume()->ReadAttrDir(node, cookie, buffer,
bufferSize, *count, count); bufferSize, _count, &_count);
*count = _count;
PRINT("netfs_read_attrdir() done: (%lx, %ld)\n", error, *count); PRINT("netfs_read_attrdir() done: (%lx, %ld)\n", error, *count);
return error; return error;
} }
@@ -928,8 +932,10 @@ netfs_read_query(void *ns, void *cookie, long *count,
status_t error = B_BAD_VALUE; status_t error = B_BAD_VALUE;
if (volume) { if (volume) {
int32 _count = *count;
error = volume->ReadQuery(iterator, buffer, bufferSize, error = volume->ReadQuery(iterator, buffer, bufferSize,
*count, count); _count, &_count);
*count = _count;
} }
PRINT("netfs_read_query() done: (%lx, %ld)\n", error, *count); PRINT("netfs_read_query() done: (%lx, %ld)\n", error, *count);
src/add-ons/kernel/file_systems/netfs/headers/shared/DebugSupport.h
+3 -3
View File
@@ -100,14 +100,14 @@ void dbg_printf_end();
#define DEBUG_CONTEXT(x) \ #define DEBUG_CONTEXT(x) \
{ \ { \
dbg_printf_begin(); \ dbg_printf_begin(); \
__out(DEBUG_APP " [%Ld: %5ld] ", system_time(), DEBUG_THREAD); \ __out(DEBUG_APP " [%" B_PRIdBIGTIME ": %5" B_PRId32 "] ", system_time(), DEBUG_THREAD); \
x; \ x; \
dbg_printf_end(); \ dbg_printf_end(); \
} }
#define DEBUG_CONTEXT_FUNCTION(prefix, x) \ #define DEBUG_CONTEXT_FUNCTION(prefix, x) \
{ \ { \
dbg_printf_begin(); \ dbg_printf_begin(); \
__out(DEBUG_APP " [%Ld: %5ld] %s" prefix, system_time(), DEBUG_THREAD, \ __out(DEBUG_APP " [%" B_PRIdBIGTIME ": %5" B_PRId32 "] %s" prefix, system_time(), DEBUG_THREAD, \
__PRETTY_FUNCTION__); \ __PRETTY_FUNCTION__); \
x; \ x; \
dbg_printf_end(); \ dbg_printf_end(); \
@@ -115,7 +115,7 @@ void dbg_printf_end();
#define DEBUG_CONTEXT_LINE(x) \ #define DEBUG_CONTEXT_LINE(x) \
{ \ { \
dbg_printf_begin(); \ dbg_printf_begin(); \
__out(DEBUG_APP " [%Ld: %5ld] %s:%d: ", system_time(), DEBUG_THREAD, \ __out(DEBUG_APP " [%" B_PRIdBIGTIME ": %5" B_PRId32 "] %s:%d: ", system_time(), DEBUG_THREAD, \
__PRETTY_FUNCTION__, __LINE__); \ __PRETTY_FUNCTION__, __LINE__); \
x; \ x; \
dbg_printf_end(); \ dbg_printf_end(); \
src/add-ons/kernel/file_systems/netfs/shared/NetAddress.cpp
+3 -3
View File
@@ -144,11 +144,11 @@ NetAddress::GetString(HashString* string, bool includePort) const
char buffer[32]; char buffer[32];
uint32 ip = GetIP(); uint32 ip = GetIP();
if (includePort) { if (includePort) {
sprintf(buffer, "%lu.%lu.%lu.%lu:%hu", sprintf(buffer, "%" B_PRIu32 ".%" B_PRIu32 ".%" B_PRIu32 ".%" B_PRIu32
ip >> 24, (ip >> 16) & 0xff, (ip >> 8) & 0xff, ip & 0xff, ":%hu", ip >> 24, (ip >> 16) & 0xff, (ip >> 8) & 0xff, ip & 0xff,
GetPort()); GetPort());
} else { } else {
sprintf(buffer, "%lu.%lu.%lu.%lu", sprintf(buffer, "%" B_PRIu32 ".%" B_PRIu32 ".%" B_PRIu32 ".%" B_PRIu32,
ip >> 24, (ip >> 16) & 0xff, (ip >> 8) & 0xff, ip & 0xff); ip >> 24, (ip >> 16) & 0xff, (ip >> 8) & 0xff, ip & 0xff);
} }
return (string->SetTo(buffer) ? B_OK : B_NO_MEMORY); return (string->SetTo(buffer) ? B_OK : B_NO_MEMORY);
src/add-ons/kernel/file_systems/netfs/shared/RequestChannel.cpp
+2 -2
View File
@@ -170,7 +170,7 @@ RequestChannel::SendRequest(Request* request)
RETURN_ERROR(error); RETURN_ERROR(error);
if (size < 0 || size > kMaxSaneRequestSize) { if (size < 0 || size > kMaxSaneRequestSize) {
ERROR("RequestChannel::SendRequest(): ERROR: Invalid request size: " ERROR("RequestChannel::SendRequest(): ERROR: Invalid request size: "
"%ld\n", size); "%" B_PRId32 "\n", size);
RETURN_ERROR(B_BAD_DATA); RETURN_ERROR(B_BAD_DATA);
} }
@@ -209,7 +209,7 @@ RequestChannel::ReceiveRequest(Request** _request)
header.size = B_HOST_TO_BENDIAN_INT32(header.size); header.size = B_HOST_TO_BENDIAN_INT32(header.size);
if (header.size < 0 || header.size > kMaxSaneRequestSize) { if (header.size < 0 || header.size > kMaxSaneRequestSize) {
ERROR("RequestChannel::ReceiveRequest(): ERROR: Invalid request size: " ERROR("RequestChannel::ReceiveRequest(): ERROR: Invalid request size: "
"%ld\n", header.size); "%" B_PRId32 "\n", header.size);
RETURN_ERROR(B_BAD_DATA); RETURN_ERROR(B_BAD_DATA);
} }