From 9b92bac1ec135862132b1c49b977b53891b73d88 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simon=20B=C3=BCnzli?= Date: Thu, 2 Jan 2014 21:27:15 +0100 Subject: fix various MSVC warnings Some warnings we'd like to enable for MuPDF and still be able to compile it with warnings as errors using MSVC (2008 to 2013): * C4115: 'timeval' : named type definition in parentheses * C4204: nonstandard extension used : non-constant aggregate initializer * C4295: 'hex' : array is too small to include a terminating null character * C4389: '==' : signed/unsigned mismatch * C4702: unreachable code * C4706: assignment within conditional expression Also, globally disable C4701 which is frequently caused by MSVC not being able to correctly figure out fz_try/fz_catch code flow. And don't define isnan for VS2013 and later where that's no longer needed. --- source/xps/xps-common.c | 2 +- source/xps/xps-doc.c | 1 - source/xps/xps-zip.c | 2 -- 3 files changed, 1 insertion(+), 4 deletions(-) (limited to 'source/xps') diff --git a/source/xps/xps-common.c b/source/xps/xps-common.c index ec16d879..b780f428 100644 --- a/source/xps/xps-common.c +++ b/source/xps/xps-common.c @@ -18,7 +18,7 @@ xps_lookup_alternate_content(fz_xml *node) char list[64]; char *next = list, *item; fz_strlcpy(list, fz_xml_att(node, "Requires"), sizeof(list)); - while ((item = fz_strsep(&next, " \t\r\n")) && (!*item || !strcmp(item, "xps"))); + while ((item = fz_strsep(&next, " \t\r\n")) != NULL && (!*item || !strcmp(item, "xps"))); if (!item) return fz_xml_down(node); } diff --git a/source/xps/xps-doc.c b/source/xps/xps-doc.c index 097392e8..86d67d4a 100644 --- a/source/xps/xps-doc.c +++ b/source/xps/xps-doc.c @@ -510,7 +510,6 @@ xps_load_page(xps_document *doc, int number) } fz_throw(doc->ctx, FZ_ERROR_GENERIC, "cannot find page %d", number + 1); - return NULL; } fz_rect * diff --git a/source/xps/xps-zip.c b/source/xps/xps-zip.c index c9dc9840..3aca8cdb 100644 --- a/source/xps/xps-zip.c +++ b/source/xps/xps-zip.c @@ -406,7 +406,6 @@ xps_read_zip_part(xps_document *doc, char *partname) } fz_throw(doc->ctx, FZ_ERROR_GENERIC, "cannot find part '%s'", partname); - return NULL; } static int @@ -502,7 +501,6 @@ xps_read_dir_part(xps_document *doc, char *name) } fz_throw(doc->ctx, FZ_ERROR_GENERIC, "cannot find part '%s'", name); - return NULL; } static int -- cgit v1.2.3