Commit a21b4ed1 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

https: fix uintmax/uint64 mix-up

parent 99ce7125
...@@ -35,5 +35,5 @@ char *vlc_http_file_get_redirect(struct vlc_http_file *file); ...@@ -35,5 +35,5 @@ char *vlc_http_file_get_redirect(struct vlc_http_file *file);
uintmax_t vlc_http_file_get_size(struct vlc_http_file *file); uintmax_t vlc_http_file_get_size(struct vlc_http_file *file);
bool vlc_http_file_can_seek(struct vlc_http_file *file); bool vlc_http_file_can_seek(struct vlc_http_file *file);
char *vlc_http_file_get_type(struct vlc_http_file *file); char *vlc_http_file_get_type(struct vlc_http_file *file);
int vlc_http_file_seek(struct vlc_http_file *file, uint64_t offset); int vlc_http_file_seek(struct vlc_http_file *file, uintmax_t offset);
struct block_t *vlc_http_file_read(struct vlc_http_file *file); struct block_t *vlc_http_file_read(struct vlc_http_file *file);
...@@ -37,7 +37,7 @@ static const char url[] = "https://www.example.com:8443/dir/file.ext?a=b"; ...@@ -37,7 +37,7 @@ static const char url[] = "https://www.example.com:8443/dir/file.ext?a=b";
static const char ua[] = PACKAGE_NAME "/" PACKAGE_VERSION " (test suite)"; static const char ua[] = PACKAGE_NAME "/" PACKAGE_VERSION " (test suite)";
static const char *replies[2] = { NULL, NULL }; static const char *replies[2] = { NULL, NULL };
static uint64_t offset = 0; static uintmax_t offset = 0;
int main(void) int main(void)
{ {
...@@ -50,7 +50,7 @@ int main(void) ...@@ -50,7 +50,7 @@ int main(void)
vlc_http_file_seek(f, 0); vlc_http_file_seek(f, 0);
assert(vlc_http_file_get_status(f) < 0); assert(vlc_http_file_get_status(f) < 0);
assert(vlc_http_file_get_redirect(f) == NULL); assert(vlc_http_file_get_redirect(f) == NULL);
assert(vlc_http_file_get_size(f) == UINT64_MAX); assert(vlc_http_file_get_size(f) == (uintmax_t)-1);
assert(!vlc_http_file_can_seek(f)); assert(!vlc_http_file_can_seek(f));
assert(vlc_http_file_get_type(f) == NULL); assert(vlc_http_file_get_type(f) == NULL);
assert(vlc_http_file_read(f) == NULL); assert(vlc_http_file_read(f) == NULL);
...@@ -67,7 +67,7 @@ int main(void) ...@@ -67,7 +67,7 @@ int main(void)
assert(f != NULL); assert(f != NULL);
assert(vlc_http_file_get_status(f) == 200); assert(vlc_http_file_get_status(f) == 200);
assert(!vlc_http_file_can_seek(f)); assert(!vlc_http_file_can_seek(f));
assert(vlc_http_file_get_size(f) == UINT64_MAX); assert(vlc_http_file_get_size(f) == (uintmax_t)-1);
str = vlc_http_file_get_type(f); str = vlc_http_file_get_type(f);
assert(str != NULL && !strcmp(str, "video/mpeg")); assert(str != NULL && !strcmp(str, "video/mpeg"));
free(str); free(str);
...@@ -119,7 +119,7 @@ int main(void) ...@@ -119,7 +119,7 @@ int main(void)
f = vlc_http_file_create(NULL, url, ua, NULL); f = vlc_http_file_create(NULL, url, ua, NULL);
assert(f != NULL); assert(f != NULL);
assert(!vlc_http_file_can_seek(f)); assert(!vlc_http_file_can_seek(f));
assert(vlc_http_file_get_size(f) == UINT64_MAX); assert(vlc_http_file_get_size(f) == (uintmax_t)-1);
str = vlc_http_file_get_redirect(f); str = vlc_http_file_get_redirect(f);
assert(str != NULL assert(str != NULL
&& !strcmp(str, "https://www.example.com:8443/somewhere/else/")); && !strcmp(str, "https://www.example.com:8443/somewhere/else/"));
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment