mirror of
https://github.com/curl/curl.git
synced 2024-11-21 01:16:58 +08:00
5a053ffe80
This commit renames lib/setup.h to lib/curl_setup.h and
renames lib/setup_once.h to lib/curl_setup_once.h.
Removes the need and usage of a header inclusion guard foreign
to libcurl. [1]
Removes the need and presence of an alarming notice we carried
in old setup_once.h [2]
----------------------------------------
1 - lib/setup_once.h used __SETUP_ONCE_H macro as header inclusion guard
up to commit ec691ca3 which changed this to HEADER_CURL_SETUP_ONCE_H,
this single inclusion guard is enough to ensure that inclusion of
lib/setup_once.h done from lib/setup.h is only done once.
Additionally lib/setup.h has always used __SETUP_ONCE_H macro to
protect inclusion of setup_once.h even after commit ec691ca3, this
was to avoid a circular header inclusion triggered when building a
c-ares enabled version with c-ares sources available which also has
a setup_once.h header. Commit ec691ca3 exposes the real nature of
__SETUP_ONCE_H usage in lib/setup.h, it is a header inclusion guard
foreign to libcurl belonging to c-ares's setup_once.h
The renaming this commit does, fixes the circular header inclusion,
and as such removes the need and usage of a header inclusion guard
foreign to libcurl. Macro __SETUP_ONCE_H no longer used in libcurl.
2 - Due to the circular interdependency of old lib/setup_once.h and the
c-ares setup_once.h header, old file lib/setup_once.h has carried
back from 2006 up to now days an alarming and prominent notice about
the need of keeping libcurl's and c-ares's setup_once.h in sync.
Given that this commit fixes the circular interdependency, the need
and presence of mentioned notice is removed.
All mentioned interdependencies come back from now old days when
the c-ares project lived inside a curl subdirectory. This commit
removes last traces of such fact.
64 lines
2.6 KiB
C
64 lines
2.6 KiB
C
#ifndef HEADER_CURL_NON_ASCII_H
|
|
#define HEADER_CURL_NON_ASCII_H
|
|
/***************************************************************************
|
|
* _ _ ____ _
|
|
* Project ___| | | | _ \| |
|
|
* / __| | | | |_) | |
|
|
* | (__| |_| | _ <| |___
|
|
* \___|\___/|_| \_\_____|
|
|
*
|
|
* Copyright (C) 1998 - 2011, 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 http://curl.haxx.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.
|
|
*
|
|
***************************************************************************/
|
|
#include "curl_setup.h"
|
|
|
|
#ifdef CURL_DOES_CONVERSIONS
|
|
|
|
#include "urldata.h"
|
|
|
|
/*
|
|
* Curl_convert_clone() returns a malloced copy of the source string (if
|
|
* returning CURLE_OK), with the data converted to network format.
|
|
*
|
|
* If no conversion was needed *outbuf may be NULL.
|
|
*/
|
|
CURLcode Curl_convert_clone(struct SessionHandle *data,
|
|
const char *indata,
|
|
size_t insize,
|
|
char **outbuf);
|
|
|
|
void Curl_convert_init(struct SessionHandle *data);
|
|
void Curl_convert_setup(struct SessionHandle *data);
|
|
void Curl_convert_close(struct SessionHandle *data);
|
|
|
|
CURLcode Curl_convert_to_network(struct SessionHandle *data,
|
|
char *buffer, size_t length);
|
|
CURLcode Curl_convert_from_network(struct SessionHandle *data,
|
|
char *buffer, size_t length);
|
|
CURLcode Curl_convert_from_utf8(struct SessionHandle *data,
|
|
char *buffer, size_t length);
|
|
CURLcode Curl_convert_form(struct SessionHandle *data, struct FormData *form);
|
|
#else
|
|
#define Curl_convert_clone(a,b,c,d) ((void)a, CURLE_OK)
|
|
#define Curl_convert_init(x) Curl_nop_stmt
|
|
#define Curl_convert_setup(x) Curl_nop_stmt
|
|
#define Curl_convert_close(x) Curl_nop_stmt
|
|
#define Curl_convert_to_network(a,b,c) ((void)a, CURLE_OK)
|
|
#define Curl_convert_from_network(a,b,c) ((void)a, CURLE_OK)
|
|
#define Curl_convert_from_utf8(a,b,c) ((void)a, CURLE_OK)
|
|
#define Curl_convert_form(a,b) CURLE_OK
|
|
#endif
|
|
|
|
#endif /* HEADER_CURL_NON_ASCII_H */
|