Revision 0bfcd599 block/curl.c
b/block/curl.c | ||
---|---|---|
104 | 104 |
{ |
105 | 105 |
CURLState *s = ((CURLState*)opaque); |
106 | 106 |
size_t realsize = size * nmemb; |
107 |
long long fsize;
|
|
107 |
size_t fsize;
|
|
108 | 108 |
|
109 |
if(sscanf(ptr, "Content-Length: %lld", &fsize) == 1)
|
|
109 |
if(sscanf(ptr, "Content-Length: %zd", &fsize) == 1) {
|
|
110 | 110 |
s->s->len = fsize; |
111 |
} |
|
111 | 112 |
|
112 | 113 |
return realsize; |
113 | 114 |
} |
... | ... | |
118 | 119 |
size_t realsize = size * nmemb; |
119 | 120 |
int i; |
120 | 121 |
|
121 |
DPRINTF("CURL: Just reading %lld bytes\n", (unsigned long long)realsize);
|
|
122 |
DPRINTF("CURL: Just reading %zd bytes\n", realsize);
|
|
122 | 123 |
|
123 | 124 |
if (!s || !s->orig_buf) |
124 | 125 |
goto read_end; |
... | ... | |
368 | 369 |
s->len = (size_t)d; |
369 | 370 |
else if(!s->len) |
370 | 371 |
goto out; |
371 |
DPRINTF("CURL: Size = %lld\n", (long long)s->len);
|
|
372 |
DPRINTF("CURL: Size = %zd\n", s->len);
|
|
372 | 373 |
|
373 | 374 |
curl_clean_state(state); |
374 | 375 |
curl_easy_cleanup(state->curl); |
... | ... | |
450 | 451 |
state->orig_buf = qemu_malloc(state->buf_len); |
451 | 452 |
state->acb[0] = acb; |
452 | 453 |
|
453 |
snprintf(state->range, 127, "%lld-%lld", (long long)start, (long long)end); |
|
454 |
DPRINTF("CURL (AIO): Reading %d at %lld (%s)\n", (nb_sectors * SECTOR_SIZE), start, state->range); |
|
454 |
snprintf(state->range, 127, "%zd-%zd", start, end); |
|
455 |
DPRINTF("CURL (AIO): Reading %d at %zd (%s)\n", |
|
456 |
(nb_sectors * SECTOR_SIZE), start, state->range); |
|
455 | 457 |
curl_easy_setopt(state->curl, CURLOPT_RANGE, state->range); |
456 | 458 |
|
457 | 459 |
curl_multi_add_handle(s->multi, state->curl); |
Also available in: Unified diff