vlc | branch: master | Rémi Denis-Courmont <[email protected]> | Sun Dec 13 19:55:43 2015 +0200| [a21b4ed145714f34e7c3df52cf4ab4dd9a122772] | committer: Rémi Denis-Courmont
https: fix uintmax/uint64 mix-up > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=a21b4ed145714f34e7c3df52cf4ab4dd9a122772 --- modules/access/http/file.h | 2 +- modules/access/http/file_test.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/modules/access/http/file.h b/modules/access/http/file.h index f24b50e..a21de1a 100644 --- a/modules/access/http/file.h +++ b/modules/access/http/file.h @@ -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); bool vlc_http_file_can_seek(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); diff --git a/modules/access/http/file_test.c b/modules/access/http/file_test.c index 23ae470..c9728b3 100644 --- a/modules/access/http/file_test.c +++ b/modules/access/http/file_test.c @@ -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 *replies[2] = { NULL, NULL }; -static uint64_t offset = 0; +static uintmax_t offset = 0; int main(void) { @@ -50,7 +50,7 @@ int main(void) vlc_http_file_seek(f, 0); assert(vlc_http_file_get_status(f) < 0); 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_get_type(f) == NULL); assert(vlc_http_file_read(f) == NULL); @@ -67,7 +67,7 @@ int main(void) assert(f != NULL); assert(vlc_http_file_get_status(f) == 200); 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); assert(str != NULL && !strcmp(str, "video/mpeg")); free(str); @@ -119,7 +119,7 @@ int main(void) f = vlc_http_file_create(NULL, url, ua, NULL); assert(f != NULL); 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); assert(str != NULL && !strcmp(str, "https://www.example.com:8443/somewhere/else/";)); _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
