From e1467b2bf13ef863b2fc82842eacd5733b890f0b Mon Sep 17 00:00:00 2001
From: Niels Sascha Reedijk <niels.reedijk@gmail.com>
Date: Thu, 28 Jan 2021 10:30:02 +0000
Subject: [PATCH] libnetservices.a: properly handle the size change to off_t on
 32 bit platforms.

This is a missed use of the updated headers in hrev54926

Change-Id: I9be83d29aadec20549bd4cc0d11238a40d8978f4
---
 .../UrlProtocolAsynchronousListener.cpp       | 24 ++++++++++++++
 .../UrlProtocolDispatchingListener.cpp        | 33 +++++++++++++++++--
 2 files changed, 55 insertions(+), 2 deletions(-)

diff --git a/src/kits/network/libnetservices/UrlProtocolAsynchronousListener.cpp b/src/kits/network/libnetservices/UrlProtocolAsynchronousListener.cpp
index 115a7293fc..2995b104ce 100644
--- a/src/kits/network/libnetservices/UrlProtocolAsynchronousListener.cpp
+++ b/src/kits/network/libnetservices/UrlProtocolAsynchronousListener.cpp
@@ -134,6 +134,7 @@ BUrlProtocolAsynchronousListener::MessageReceived(BMessage* message)
 			}
 			break;
 
+#ifdef LIBNETAPI_DEPRECATED
 		case B_URL_PROTOCOL_DOWNLOAD_PROGRESS:
 			{
 				int32 bytesReceived;
@@ -155,6 +156,29 @@ BUrlProtocolAsynchronousListener::MessageReceived(BMessage* message)
 				UploadProgress(caller, bytesSent, bytesTotal);
 			}
 			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:
 			{
diff --git a/src/kits/network/libnetservices/UrlProtocolDispatchingListener.cpp b/src/kits/network/libnetservices/UrlProtocolDispatchingListener.cpp
index d241de90a5..9e54771bbf 100644
--- a/src/kits/network/libnetservices/UrlProtocolDispatchingListener.cpp
+++ b/src/kits/network/libnetservices/UrlProtocolDispatchingListener.cpp
@@ -104,9 +104,10 @@ BUrlProtocolDispatchingListener::DataReceived(BUrlRequest* caller,
 }
 
 
+#ifdef LIBNETAPI_DEPRECATED
 void
 BUrlProtocolDispatchingListener::DownloadProgress(BUrlRequest* caller,
-	ssize_t bytesReceived, ssize_t bytesTotal)
+	size_t bytesReceived, size_t bytesTotal)
 {
 	BMessage message(B_URL_PROTOCOL_NOTIFICATION);
 	message.AddInt32("url:bytesReceived", bytesReceived);
@@ -118,7 +119,7 @@ BUrlProtocolDispatchingListener::DownloadProgress(BUrlRequest* caller,
 
 void
 BUrlProtocolDispatchingListener::UploadProgress(BUrlRequest* caller,
-	ssize_t bytesSent, ssize_t bytesTotal)
+	size_t bytesSent, size_t bytesTotal)
 {
 	BMessage message(B_URL_PROTOCOL_NOTIFICATION);
 	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
 BUrlProtocolDispatchingListener::RequestCompleted(BUrlRequest* caller,