moparisthebest/curl
1
0
Fork 0
mirror of https://github.com/moparisthebest/curl synced 2024-11-16 14:35:03 -05:00
Code Issues Releases Wiki Activity

unit1604.c: fix implicit conv from 'SANITIZEcode' to 'CURLcode'

Browse Source 
GCC 10 warns about this with warning: implicit conversion
  from 'SANITIZEcode' to 'CURLcode' [-Wenum-conversion]

Since 'expected_result' is not really of type 'CURLcode' and
it is not exposed in any way, we can just use 'SANITIZEcode'.

Reviewed-by: Daniel Stenberg
Reviewed-by: Marcel Raad

Closes #5476
This commit is contained in:
Marc Hoersken 2020-05-28 21:51:25 +02:00
parent c0d4faf8e5
commit 62314d6b71
No known key found for this signature in database
GPG Key ID: 61E03CBED7BC859E
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
tests/unit/unit1604.c
View File

@ -5,7 +5,7 @@
* | (__| |_| | _ <| |___ * | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____| * \___|\___/|_| \_\_____|
* *
* Copyright (C) 1998 - 2018, Daniel Stenberg, <daniel@haxx.se>, et al. * Copyright (C) 1998 - 2020, Daniel Stenberg, <daniel@haxx.se>, et al.
* *
* This software is licensed as described in the file COPYING, which * This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms * you should have received as part of this distribution. The terms
@ -78,7 +78,7 @@ struct data {
const char *input; const char *input;
int flags; int flags;
const char *expected_output; const char *expected_output;
CURLcode expected_result; SANITIZEcode expected_result;
}; };
UNITTEST_START UNITTEST_START
@ -304,8 +304,9 @@ UNITTEST_START
char *flagstr = NULL; char *flagstr = NULL;
char *received_ccstr = NULL; char *received_ccstr = NULL;
char *expected_ccstr = NULL; char *expected_ccstr = NULL;
SANITIZEcode res;
CURLcode res = sanitize_file_name(&output, data[i].input, data[i].flags); res = sanitize_file_name(&output, data[i].input, data[i].flags);
if(res == data[i].expected_result && if(res == data[i].expected_result &&
((!output && !data[i].expected_output) || ((!output && !data[i].expected_output) ||