47b8e1dbd3
Viktor Szakats
2025-11-19
Subject
tidy-up: move `CURL_UNCONST()` out from macro `curl_unicodefree()`
Binary
No binary (build failed)
Architecture & Compiler Flags
—
Build Log
(log yok)
Commit Diff GitHub →
lib/curlx/multibyte.h+1 -1
| @@ -78,6 +78,6 @@ typedef union { | |
| #endif /* UNICODE && _WIN32 */ | |
| /* the purpose of this macro is to free() without being traced by memdebug */ | |
| - | #define curlx_unicodefree(ptr) (free)(CURL_UNCONST(ptr)) |
| + | #define curlx_unicodefree(ptr) (free)(ptr) |
| #endif /* HEADER_CURL_MULTIBYTE_H */ | |
src/tool_getparam.c+4 -4
| @@ -3050,7 +3050,7 @@ ParameterError parse_args(int argc, argv_item_t argv[]) | |
| if(i < (argc - 1)) { | |
| nextarg = convert_tchar_to_UTF8(argv[i + 1]); | |
| if(!nextarg) { | |
| - | unicodefree(orig_opt); |
| + | unicodefree(CURL_UNCONST(orig_opt)); |
| return PARAM_NO_MEM; | |
| } | |
| } | |
| @@ -3058,7 +3058,7 @@ ParameterError parse_args(int argc, argv_item_t argv[]) | |
| result = getparameter(orig_opt, nextarg, &passarg, config, | |
| CONFIG_MAX_LEVELS); | |
| - | unicodefree(nextarg); |
| + | unicodefree(CURL_UNCONST(nextarg)); |
| config = global->last; | |
| if(result == PARAM_NEXT_OPERATION) { | |
| /* Reset result as PARAM_NEXT_OPERATION is only used here and not | |
| @@ -3096,7 +3096,7 @@ ParameterError parse_args(int argc, argv_item_t argv[]) | |
| } | |
| if(!result) { | |
| - | unicodefree(orig_opt); |
| + | unicodefree(CURL_UNCONST(orig_opt)); |
| orig_opt = NULL; | |
| } | |
| } | |
| @@ -3119,6 +3119,6 @@ ParameterError parse_args(int argc, argv_item_t argv[]) | |
| helpf("%s", reason); | |
| } | |
| - | unicodefree(orig_opt); |
| + | unicodefree(CURL_UNCONST(orig_opt)); |
| return result; | |
| } | |
src/tool_operate.c+1 -1
| @@ -2249,7 +2249,7 @@ CURLcode operate(int argc, argv_item_t argv[]) | |
| } | |
| } | |
| - | unicodefree(first_arg); |
| + | unicodefree(CURL_UNCONST(first_arg)); |
| if(!result) { | |
| /* Parse the command line arguments */ | |