mirror of
https://github.com/curl/curl.git
synced 2026-08-25 04:13:32 +03:00
lib: use lib source directory as base include path
Backtrack on previous change that aimed to solve the wrong `share.h` being included. It turns out it did not fix this issue. At the same time it introduced relative header filenames and the need to include the same headers differently depending on the source files' location, reducing readability and editability. Replace this method by re-adding curl's lib source directory to the header path and addressing headers by the their full, relative name to that base directory. Aligning with this method already used in src and tests. With these advantages: - makes includes easier to read, recognize, grep, sort, write, and copy between sources, - syncs the way these headers are included across curl components, - avoids the ambiguity between system `schannel.h`, `rustls.h` vs. local headers using the same names in `lib/vtls`, - silences clang-tidy `readability-duplicate-include` checker, which detects the above issue, Ref: https://clang.llvm.org/extra/clang-tidy/checks/readability/duplicate-include.html - possibly silences TIOBE coding standard warnings: `6.10.2.a: Don't use relative paths in #include statements.` - long shot: it works well with concatenated test sources, for clang-tidy-friendly custom unity builds. Ref: #20667 Slight downside: it's not enforced. If there happens to be a collision between a local `lib/*.h` header and a system one, the solution is to rename (possibly with its `.c` counterpart) into the `curl_` namespace. This is also the method used by curl in the past. Also: - curlx/inet_pton: reduce scope of an include. - toolx/tool_time: apply this to an include, and update VS project files accordingly. Also dropping unnecessary lib/curlx header path. - clang-tidy: enable `readability-duplicate-include`. Follow-up to3887069c66#19676 Follow-up to625f2c1644#16991 #16949 Closes #20623
This commit is contained in:
parent
6ad50dc285
commit
3058ed3df8
95 changed files with 545 additions and 537 deletions
|
|
@ -24,7 +24,7 @@
|
|||
* SPDX-License-Identifier: curl
|
||||
*
|
||||
***************************************************************************/
|
||||
#include "../curl_setup.h"
|
||||
#include "curl_setup.h"
|
||||
|
||||
#ifdef USE_LIBSSH
|
||||
|
||||
|
|
@ -42,21 +42,21 @@
|
|||
#include <inet.h>
|
||||
#endif
|
||||
|
||||
#include "../urldata.h"
|
||||
#include "../sendf.h"
|
||||
#include "../curl_trc.h"
|
||||
#include "../hostip.h"
|
||||
#include "../progress.h"
|
||||
#include "../transfer.h"
|
||||
#include "ssh.h"
|
||||
#include "../url.h"
|
||||
#include "../cfilters.h"
|
||||
#include "../connect.h"
|
||||
#include "../parsedate.h" /* for the week day and month names */
|
||||
#include "../curlx/strparse.h"
|
||||
#include "../multiif.h"
|
||||
#include "../select.h"
|
||||
#include "vssh.h"
|
||||
#include "urldata.h"
|
||||
#include "sendf.h"
|
||||
#include "curl_trc.h"
|
||||
#include "hostip.h"
|
||||
#include "progress.h"
|
||||
#include "transfer.h"
|
||||
#include "vssh/ssh.h"
|
||||
#include "url.h"
|
||||
#include "cfilters.h"
|
||||
#include "connect.h"
|
||||
#include "parsedate.h" /* for the week day and month names */
|
||||
#include "curlx/strparse.h"
|
||||
#include "multiif.h"
|
||||
#include "select.h"
|
||||
#include "vssh/vssh.h"
|
||||
|
||||
#ifdef HAVE_UNISTD_H
|
||||
#include <unistd.h>
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@
|
|||
* SPDX-License-Identifier: curl
|
||||
*
|
||||
***************************************************************************/
|
||||
#include "../curl_setup.h"
|
||||
#include "curl_setup.h"
|
||||
|
||||
#ifdef USE_LIBSSH2
|
||||
|
||||
|
|
@ -41,23 +41,23 @@
|
|||
#include <inet.h>
|
||||
#endif
|
||||
|
||||
#include "../urldata.h"
|
||||
#include "../sendf.h"
|
||||
#include "../curl_trc.h"
|
||||
#include "../hostip.h"
|
||||
#include "../progress.h"
|
||||
#include "../transfer.h"
|
||||
#include "ssh.h"
|
||||
#include "../url.h"
|
||||
#include "../cfilters.h"
|
||||
#include "../connect.h"
|
||||
#include "../parsedate.h" /* for the week day and month names */
|
||||
#include "../multiif.h"
|
||||
#include "../select.h"
|
||||
#include "../curlx/fopen.h"
|
||||
#include "vssh.h"
|
||||
#include "../curlx/strparse.h"
|
||||
#include "../curlx/base64.h" /* for base64 encoding/decoding */
|
||||
#include "urldata.h"
|
||||
#include "sendf.h"
|
||||
#include "curl_trc.h"
|
||||
#include "hostip.h"
|
||||
#include "progress.h"
|
||||
#include "transfer.h"
|
||||
#include "vssh/ssh.h"
|
||||
#include "url.h"
|
||||
#include "cfilters.h"
|
||||
#include "connect.h"
|
||||
#include "parsedate.h" /* for the week day and month names */
|
||||
#include "multiif.h"
|
||||
#include "select.h"
|
||||
#include "curlx/fopen.h"
|
||||
#include "vssh/vssh.h"
|
||||
#include "curlx/strparse.h"
|
||||
#include "curlx/base64.h" /* for base64 encoding/decoding */
|
||||
|
||||
static const char *sftp_libssh2_strerror(unsigned long err)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -23,8 +23,8 @@
|
|||
* SPDX-License-Identifier: curl
|
||||
*
|
||||
***************************************************************************/
|
||||
#include "../curl_setup.h"
|
||||
#include "../urldata.h"
|
||||
#include "curl_setup.h"
|
||||
#include "urldata.h"
|
||||
|
||||
extern const struct Curl_protocol Curl_protocol_sftp;
|
||||
extern const struct Curl_protocol Curl_protocol_scp;
|
||||
|
|
|
|||
|
|
@ -21,15 +21,15 @@
|
|||
* SPDX-License-Identifier: curl AND ISC
|
||||
*
|
||||
***************************************************************************/
|
||||
#include "../curl_setup.h"
|
||||
#include "ssh.h"
|
||||
#include "curl_setup.h"
|
||||
#include "vssh/ssh.h"
|
||||
|
||||
#ifdef USE_SSH
|
||||
|
||||
#include "vssh.h"
|
||||
#include "../curlx/strparse.h"
|
||||
#include "../curl_trc.h"
|
||||
#include "../escape.h"
|
||||
#include "vssh/vssh.h"
|
||||
#include "curlx/strparse.h"
|
||||
#include "curl_trc.h"
|
||||
#include "escape.h"
|
||||
|
||||
#ifdef CURLVERBOSE
|
||||
const char *Curl_ssh_statename(sshstate state)
|
||||
|
|
|
|||
|
|
@ -23,11 +23,11 @@
|
|||
* SPDX-License-Identifier: curl
|
||||
*
|
||||
***************************************************************************/
|
||||
#include "../curl_setup.h"
|
||||
#include "curl_setup.h"
|
||||
|
||||
#ifdef USE_SSH
|
||||
|
||||
#include "../urldata.h"
|
||||
#include "urldata.h"
|
||||
|
||||
CURLcode Curl_getworkingpath(struct Curl_easy *data,
|
||||
const char *homedir,
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue