NixOS/nix
NixOS/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2024-09-19 23:03:53 -04:00
Code Activity

download.cc: fix readCallback return type (int -> size_t)

Browse source 
I'm not sure if curl ever asks for enough data at once
for truncation to occur but better safe than sorry.
This commit is contained in:
Will Dietz 2018-06-01 10:53:28 -05:00
parent 73357500ac
commit 54b1c59643
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/libstore/download.cc
View file

@ -213,7 +213,7 @@ struct CurlDownloader : public Downloader
} }
size_t readOffset = 0; size_t readOffset = 0;
int readCallback(char *buffer, size_t size, size_t nitems) size_t readCallback(char *buffer, size_t size, size_t nitems)
{ {
if (readOffset == request.data->length()) if (readOffset == request.data->length())
return 0; return 0;
@ -224,7 +224,7 @@ struct CurlDownloader : public Downloader
return count; return count;
} }
static int readCallbackWrapper(char *buffer, size_t size, size_t nitems, void * userp) static size_t readCallbackWrapper(char *buffer, size_t size, size_t nitems, void * userp)
{ {
return ((DownloadItem *) userp)->readCallback(buffer, size, nitems); return ((DownloadItem *) userp)->readCallback(buffer, size, nitems);
} }