romenskiy2012/curl
1
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2026-07-24 12:17:16 +03:00
Code Issues Projects Releases Packages Wiki Activity

tests/server: move memory init to memptr.c

Browse source 
To sync with tests/libtest.

Closes #17735
This commit is contained in:
Viktor Szakats 2025-06-24 16:42:17 +02:00
parent 04e90d4814
commit db512ee267
No known key found for this signature in database
GPG key ID: B5ABD165E2AEF201
3 changed files with 51 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

2
tests/server/Makefile.inc
View file

@ -29,7 +29,7 @@ BUNDLE = servers
FIRSTFILES = first.c first.h
# Common files used by test programs
UTILS = getpart.c util.c
UTILS = memptr.c getpart.c util.c
CURLX_CFILES = \
../../lib/curlx/base64.c \

26
tests/server/getpart.c
View file

@ -33,32 +33,6 @@
#define show(x) Curl_nop_stmt
#endif
#if defined(UNDER_CE)
#define system_strdup _strdup
#else
#define system_strdup strdup
#endif
#include "curl_memory.h"
#if defined(_MSC_VER) && defined(_DLL)
# pragma warning(push)
# pragma warning(disable:4232) /* MSVC extension, dllimport identity */
#endif
curl_malloc_callback Curl_cmalloc = (curl_malloc_callback)malloc;
curl_free_callback Curl_cfree = (curl_free_callback)free;
curl_realloc_callback Curl_crealloc = (curl_realloc_callback)realloc;
curl_strdup_callback Curl_cstrdup = (curl_strdup_callback)system_strdup;
curl_calloc_callback Curl_ccalloc = (curl_calloc_callback)calloc;
#if defined(_WIN32) && defined(UNICODE)
curl_wcsdup_callback Curl_cwcsdup = NULL; /* not use in test code */
#endif
#if defined(_MSC_VER) && defined(_DLL)
# pragma warning(pop)
#endif
/*
* line_length()
*

50
tests/server/memptr.c Normal file
View file

@ -0,0 +1,50 @@
/***************************************************************************
* _ _ ____ _
* 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 "first.h"
#include "curl_memory.h"
#ifdef UNDER_CE
#define system_strdup _strdup
#else
#define system_strdup strdup
#endif
#if defined(_MSC_VER) && defined(_DLL)
# pragma warning(push)
# pragma warning(disable:4232) /* MSVC extension, dllimport identity */
#endif
curl_malloc_callback Curl_cmalloc = (curl_malloc_callback)malloc;
curl_free_callback Curl_cfree = (curl_free_callback)free;
curl_realloc_callback Curl_crealloc = (curl_realloc_callback)realloc;
curl_strdup_callback Curl_cstrdup = (curl_strdup_callback)system_strdup;
curl_calloc_callback Curl_ccalloc = (curl_calloc_callback)calloc;
#if defined(_WIN32) && defined(UNICODE)
curl_wcsdup_callback Curl_cwcsdup = NULL; /* not used in test code */
#endif
#if defined(_MSC_VER) && defined(_DLL)
# pragma warning(pop)
#endif