From 735c31bb4adcd3da633cee888efe2d6014333df0 Mon Sep 17 00:00:00 2001 From: Nesterov Alexander Date: Wed, 20 May 2020 18:05:21 +0300 Subject: [PATCH] Resolve type conflict --- 3rdparty/quirc/src/quirc.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/3rdparty/quirc/src/quirc.c b/3rdparty/quirc/src/quirc.c index 0cf5009f92..2499f8df7e 100644 --- a/3rdparty/quirc/src/quirc.c +++ b/3rdparty/quirc/src/quirc.c @@ -27,10 +27,7 @@ struct quirc *quirc_new(void) { struct quirc *q = malloc(sizeof(*q)); - if (!q) - return NULL; - - memset(q, 0, sizeof(*q)); + memset(q, 0, sizeof(*q)); return q; } @@ -123,8 +120,10 @@ static const char *const error_table[] = { const char *quirc_strerror(quirc_decode_error_t err) { - if ((int)err >= 0 && (int)err < sizeof(error_table) / sizeof(error_table[0])) - return error_table[err]; + if ((int) err >= 0) { + if ((unsigned long) err < (unsigned long) (sizeof(error_table) / sizeof(error_table[0]))) + return error_table[err]; + } - return "Unknown error"; + return "Unknown error"; }