hrev51696 adds 1 changeset to branch 'master'
old head: 0df6decf1b36c5da6d045450c60d0535c34364cc
new head: 29f98e1f3360c812f4d0df7147fc759bcc0cab8b
overview:
http://cgit.haiku-os.org/haiku/log/?qt=range&q=29f98e1f3360+%5E0df6decf1b36
----------------------------------------------------------------------------
29f98e1f3360: HaikuDepot : More Backend Communications Improvements
Fixes for x86_64 build.
[ Andrew Lindesay <apl@xxxxxxxxxxxxxx> ]
----------------------------------------------------------------------------
Revision: hrev51696
Commit: 29f98e1f3360c812f4d0df7147fc759bcc0cab8b
URL: http://cgit.haiku-os.org/haiku/commit/?id=29f98e1f3360
Author: Andrew Lindesay <apl@xxxxxxxxxxxxxx>
Date: Tue Dec 19 21:47:04 2017 UTC
----------------------------------------------------------------------------
3 files changed, 5 insertions(+), 4 deletions(-)
src/apps/haikudepot/List.h | 1 +
src/apps/haikudepot/model/PackageInfo.cpp | 2 +-
src/apps/haikudepot/server/AbstractServerProcess.cpp | 6 +++---
----------------------------------------------------------------------------
diff --git a/src/apps/haikudepot/List.h b/src/apps/haikudepot/List.h
index f6abc1d..42f6c2f 100644
--- a/src/apps/haikudepot/List.h
+++ b/src/apps/haikudepot/List.h
@@ -7,6 +7,7 @@
#include <new>
+#include <stdio.h>
#include <stdlib.h>
#include <string.h>
diff --git a/src/apps/haikudepot/model/PackageInfo.cpp
b/src/apps/haikudepot/model/PackageInfo.cpp
index 6607a35..e783f8b 100644
--- a/src/apps/haikudepot/model/PackageInfo.cpp
+++ b/src/apps/haikudepot/model/PackageInfo.cpp
@@ -1067,7 +1067,7 @@ DepotInfo::AddPackage(const PackageInfoRef& package)
static int32 PackageFixedNameCompare(const void* context,
const PackageInfoRef& package)
{
- const BString* packageName = static_cast<BString*>(context);
+ const BString* packageName = static_cast<const BString*>(context);
return packageName->Compare(package->Name());
}
diff --git a/src/apps/haikudepot/server/AbstractServerProcess.cpp
b/src/apps/haikudepot/server/AbstractServerProcess.cpp
index 5b8b77f..c78614f 100644
--- a/src/apps/haikudepot/server/AbstractServerProcess.cpp
+++ b/src/apps/haikudepot/server/AbstractServerProcess.cpp
@@ -411,10 +411,10 @@ AbstractServerProcess::DownloadToLocalFile(const BPath&
targetFilePath,
return APP_ERR_NOT_MODIFIED;
} else if (BHttpRequest::IsRedirectionStatusCode(statusCode)) {
if (location.Length() != 0) {
- BUrl location(result.Url(), location);
+ BUrl redirectUrl(result.Url(), location);
fprintf(stdout, "[%s] will redirect to; %s\n",
- Name(), location.UrlString().String());
- return DownloadToLocalFile(targetFilePath, location,
+ Name(), redirectUrl.UrlString().String());
+ return DownloadToLocalFile(targetFilePath, redirectUrl,
redirects + 1, 0);
}
