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

libnetservices.a: properly handle the size change to off_t on 32 bit platforms.

Browse Source 
This is a missed use of the updated headers in hrev54926

Change-Id: I9be83d29aadec20549bd4cc0d11238a40d8978f4
This commit is contained in:
Niels Sascha Reedijk
2021-01-28 10:30:02 +00:00
parent 1a0b4125b6
commit e1467b2bf1
2 changed files with 55 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/kits/network/libnetservices/UrlProtocolAsynchronousListener.cpp
+24
View File
@@ -134,6 +134,7 @@ BUrlProtocolAsynchronousListener::MessageReceived(BMessage* message)
} }
break; break;
#ifdef LIBNETAPI_DEPRECATED
case B_URL_PROTOCOL_DOWNLOAD_PROGRESS: case B_URL_PROTOCOL_DOWNLOAD_PROGRESS:
{ {
int32 bytesReceived; int32 bytesReceived;
@@ -155,6 +156,29 @@ BUrlProtocolAsynchronousListener::MessageReceived(BMessage* message)
UploadProgress(caller, bytesSent, bytesTotal); UploadProgress(caller, bytesSent, bytesTotal);
} }
break; break;
#else
case B_URL_PROTOCOL_DOWNLOAD_PROGRESS:
{
off_t bytesReceived;
off_t bytesTotal;
message->FindInt64("url:bytesReceived", &bytesReceived);
message->FindInt64("url:bytesTotal", &bytesTotal);
DownloadProgress(caller, bytesReceived, bytesTotal);
}
break;
case B_URL_PROTOCOL_UPLOAD_PROGRESS:
{
off_t bytesSent;
off_t bytesTotal;
message->FindInt64("url:bytesSent", &bytesSent);
message->FindInt64("url:bytesTotal", &bytesTotal);
UploadProgress(caller, bytesSent, bytesTotal);
}
break;
#endif // LIBNETAPI_DEPRECATED
case B_URL_PROTOCOL_REQUEST_COMPLETED: case B_URL_PROTOCOL_REQUEST_COMPLETED:
{ {
src/kits/network/libnetservices/UrlProtocolDispatchingListener.cpp
+31 -2
View File
@@ -104,9 +104,10 @@ BUrlProtocolDispatchingListener::DataReceived(BUrlRequest* caller,
} }
#ifdef LIBNETAPI_DEPRECATED
void void
BUrlProtocolDispatchingListener::DownloadProgress(BUrlRequest* caller, BUrlProtocolDispatchingListener::DownloadProgress(BUrlRequest* caller,
ssize_t bytesReceived, ssize_t bytesTotal) size_t bytesReceived, size_t bytesTotal)
{ {
BMessage message(B_URL_PROTOCOL_NOTIFICATION); BMessage message(B_URL_PROTOCOL_NOTIFICATION);
message.AddInt32("url:bytesReceived", bytesReceived); message.AddInt32("url:bytesReceived", bytesReceived);
@@ -118,7 +119,7 @@ BUrlProtocolDispatchingListener::DownloadProgress(BUrlRequest* caller,
void void
BUrlProtocolDispatchingListener::UploadProgress(BUrlRequest* caller, BUrlProtocolDispatchingListener::UploadProgress(BUrlRequest* caller,
ssize_t bytesSent, ssize_t bytesTotal) size_t bytesSent, size_t bytesTotal)
{ {
BMessage message(B_URL_PROTOCOL_NOTIFICATION); BMessage message(B_URL_PROTOCOL_NOTIFICATION);
message.AddInt32("url:bytesSent", bytesSent); message.AddInt32("url:bytesSent", bytesSent);
@@ -128,6 +129,34 @@ BUrlProtocolDispatchingListener::UploadProgress(BUrlRequest* caller,
} }
#else
void
BUrlProtocolDispatchingListener::DownloadProgress(BUrlRequest* caller,
off_t bytesReceived, off_t bytesTotal)
{
BMessage message(B_URL_PROTOCOL_NOTIFICATION);
message.AddInt64("url:bytesReceived", bytesReceived);
message.AddInt64("url:bytesTotal", bytesTotal);
_SendMessage(&message, B_URL_PROTOCOL_DOWNLOAD_PROGRESS, caller);
}
void
BUrlProtocolDispatchingListener::UploadProgress(BUrlRequest* caller,
off_t bytesSent, off_t bytesTotal)
{
BMessage message(B_URL_PROTOCOL_NOTIFICATION);
message.AddInt64("url:bytesSent", bytesSent);
message.AddInt64("url:bytesTotal", bytesTotal);
_SendMessage(&message, B_URL_PROTOCOL_UPLOAD_PROGRESS, caller);
}
#endif // LIBNETAPI_DEPRECATED
void void
BUrlProtocolDispatchingListener::RequestCompleted(BUrlRequest* caller, BUrlProtocolDispatchingListener::RequestCompleted(BUrlRequest* caller,