mirror of
https://github.com/curl/curl.git
synced 2024-12-15 06:40:09 +08:00
c04504885d
Sources used `lib/curlx.h` with both `ENABLE_CURLX_PRINTF` set and unset
before including it.
In a cmake "unity" batch where the first included source had it unset,
the next sources did not get the macros requested with
`ENABLE_CURLX_PRINTF` because `lib/curl.x` had already been included
without them.
Fix it by by making the macros enabled permanently and globally for
internal sources, and dropping `ENABLE_CURLX_PRINTF`.
This came up while testing unity builds with smaller batches. The full,
default unity build where all `src` is bundled up in a single unit, was
not affected.
Fixes:
```
$ cmake -B build -DCMAKE_UNITY_BUILD=ON -DCMAKE_UNITY_BUILD_BATCH_SIZE=15
$ make -C build
...
curl/src/tool_getparam.c: In function ‘getparameter’:
curl/src/tool_getparam.c:2409:11: error: implicit declaration of function ‘msnprintf’; did you mean ‘vsnprintf’? [-Wimplicit-function-declaration]
2409 | msnprintf(buffer, sizeof(buffer), "%" CURL_FORMAT_CURL_OFF_T "-",
| ^~~~~~~~~
| vsnprintf
curl/src/tool_getparam.c:2409:11: warning: nested extern declaration of ‘msnprintf’ [-Wnested-externs]
[...]
```
Reported-by: Daniel Stenberg
Bug: https://github.com/curl/curl/pull/14626#issuecomment-2301663491
Closes #14632
87 lines
2.5 KiB
C
87 lines
2.5 KiB
C
/***************************************************************************
|
|
* _ _ ____ _
|
|
* Project ___| | | | _ \| |
|
|
* / __| | | | |_) | |
|
|
* | (__| |_| | _ <| |___
|
|
* \___|\___/|_| \_\_____|
|
|
*
|
|
* Copyright (C) Daniel Stenberg, <daniel@haxx.se>, et al.
|
|
*
|
|
* This software is licensed as described in the file COPYING, which
|
|
* you should have received as part of this distribution. The terms
|
|
* are also available at https://curl.se/docs/copyright.html.
|
|
*
|
|
* You may opt to use, copy, modify, merge, publish, distribute and/or sell
|
|
* copies of the Software, and permit persons to whom the Software is
|
|
* furnished to do so, under the terms of the COPYING file.
|
|
*
|
|
* This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
|
|
* KIND, either express or implied.
|
|
*
|
|
* SPDX-License-Identifier: curl
|
|
*
|
|
***************************************************************************/
|
|
#include "curlcheck.h"
|
|
|
|
#include "curlx.h"
|
|
|
|
#include "hash.h"
|
|
|
|
#include "memdebug.h" /* LAST include file */
|
|
|
|
static struct Curl_hash hash_static;
|
|
|
|
static void mydtor(void *elem)
|
|
{
|
|
int *ptr = (int *)elem;
|
|
free(ptr);
|
|
}
|
|
|
|
static CURLcode unit_setup(void)
|
|
{
|
|
Curl_hash_offt_init(&hash_static, 15, mydtor);
|
|
return CURLE_OK;
|
|
}
|
|
|
|
static void unit_stop(void)
|
|
{
|
|
Curl_hash_destroy(&hash_static);
|
|
}
|
|
|
|
UNITTEST_START
|
|
int *value, *v;
|
|
int *value2;
|
|
int *nodep;
|
|
|
|
curl_off_t key = 20;
|
|
curl_off_t key2 = 25;
|
|
|
|
|
|
value = malloc(sizeof(int));
|
|
abort_unless(value != NULL, "Out of memory");
|
|
*value = 199;
|
|
nodep = Curl_hash_offt_set(&hash_static, key, value);
|
|
if(!nodep)
|
|
free(value);
|
|
abort_unless(nodep, "insertion into hash failed");
|
|
v = Curl_hash_offt_get(&hash_static, key);
|
|
abort_unless(v == value, "lookup present entry failed");
|
|
v = Curl_hash_offt_get(&hash_static, key2);
|
|
abort_unless(!v, "lookup missing entry failed");
|
|
Curl_hash_clean(&hash_static);
|
|
|
|
/* Attempt to add another key/value pair */
|
|
value2 = malloc(sizeof(int));
|
|
abort_unless(value2 != NULL, "Out of memory");
|
|
*value2 = 204;
|
|
nodep = Curl_hash_offt_set(&hash_static, key2, value2);
|
|
if(!nodep)
|
|
free(value2);
|
|
abort_unless(nodep, "insertion into hash failed");
|
|
v = Curl_hash_offt_get(&hash_static, key2);
|
|
abort_unless(v == value2, "lookup present entry failed");
|
|
v = Curl_hash_offt_get(&hash_static, key);
|
|
abort_unless(!v, "lookup missing entry failed");
|
|
|
|
UNITTEST_STOP
|