build: drop explicit curlx from hdr paths, refer headers with curlx/ prefix

To make all src and test code refer to curlx headers the same way.

Also:
- src: move `curlx.h` include to `tool_setup.h`.
- src/tool_setup.h: drop stray `curlx/timeval.h`.
- servers: de-duplicate `curlx.h` and `curl_setup.h` includes.
- libtests, units: drop stray curlx sub-headers in favor of
  `<curlx/curlx.h>`.
- tests: include `curlx.h` with `<>` instead of `""`. To match
  other parts of the codebase.

Closes #17680

src/CMakeLists.txt

@@ -80,8 +80,7 @@ endif()
 
 set_property(DIRECTORY APPEND PROPERTY INCLUDE_DIRECTORIES
   "${PROJECT_BINARY_DIR}/lib"        # for "curl_config.h"
-  "${PROJECT_SOURCE_DIR}/lib"        # for "curl_setup.h"
-  "${PROJECT_SOURCE_DIR}/lib/curlx"  # for curlx functions
+  "${PROJECT_SOURCE_DIR}/lib"        # for "curl_setup.h", curlx
   "${CMAKE_CURRENT_SOURCE_DIR}"      # for "tool_hugehelp.c"
 )
 

src/Makefile.am

@@ -45,7 +45,6 @@ EXTRA_DIST = mk-file-embed.pl mkhelp.pl \
 AM_CPPFLAGS = -I$(top_srcdir)/include        \
               -I$(top_builddir)/lib          \
               -I$(top_srcdir)/lib            \
-              -I$(top_srcdir)/lib/curlx      \
               -I$(srcdir)
 
 bin_PROGRAMS = curl

src/terminal.c

@@ -28,7 +28,6 @@
 #endif
 
 #include "terminal.h"
-#include <curlx.h>
 #include <memdebug.h> /* keep this as LAST include */
 
 #ifdef HAVE_TERMIOS_H

src/tool_cb_dbg.c

@@ -23,8 +23,6 @@
  ***************************************************************************/
 #include "tool_setup.h"
 
-#include <curlx.h>
-
 #include "tool_cfgable.h"
 #include "tool_msgs.h"
 #include "tool_cb_dbg.h"

src/tool_cb_hdr.c

@@ -27,8 +27,6 @@
 #include <unistd.h>
 #endif
 
-#include <curlx.h>
-
 #include "tool_cfgable.h"
 #include "tool_doswin.h"
 #include "tool_msgs.h"

src/tool_cb_prg.c

@@ -23,8 +23,6 @@
  ***************************************************************************/
 #include "tool_setup.h"
 
-#include <curlx.h>
-
 #include "tool_cfgable.h"
 #include "tool_cb_prg.h"
 #include "tool_util.h"

src/tool_cb_rea.c

@@ -27,8 +27,6 @@
 #include <sys/select.h>
 #endif
 
-#include <curlx.h>
-
 #include "tool_cfgable.h"
 #include "tool_cb_rea.h"
 #include "tool_operate.h"

src/tool_cb_see.c

@@ -23,8 +23,6 @@
  ***************************************************************************/
 #include "tool_setup.h"
 
-#include <curlx.h>
-
 #include "tool_cfgable.h"
 #include "tool_operate.h"
 #include "tool_cb_see.h"

src/tool_cb_wrt.c

@@ -30,8 +30,6 @@
 
 #include <sys/stat.h>
 
-#include <curlx.h>
-
 #include "tool_cfgable.h"
 #include "tool_msgs.h"
 #include "tool_cb_wrt.h"

src/tool_cfgable.c

@@ -27,7 +27,6 @@
 #include "tool_formparse.h"
 #include "tool_paramhlp.h"
 #include "tool_main.h"
-#include <curlx.h>
 #include <memdebug.h> /* keep this as LAST include */
 
 void config_init(struct OperationConfig *config)

src/tool_dirhie.c

@@ -29,8 +29,6 @@
 #  include <direct.h>
 #endif
 
-#include <curlx.h>
-
 #include "tool_dirhie.h"
 #include "tool_msgs.h"
 

src/tool_doswin.c

@@ -40,7 +40,6 @@
 #include "tool_doswin.h"
 #include "tool_msgs.h"
 
-#include <curlx.h>
 #include <memdebug.h> /* keep this as LAST include */
 
 #ifdef _WIN32

src/tool_easysrc.c

@@ -27,8 +27,6 @@
 
 #ifndef CURL_DISABLE_LIBCURL_OPTION
 
-#include <curlx.h>
-
 #include "tool_cfgable.h"
 #include "tool_easysrc.h"
 #include "tool_msgs.h"

src/tool_filetime.c

@@ -24,7 +24,6 @@
 #include "tool_filetime.h"
 #include "tool_cfgable.h"
 #include "tool_msgs.h"
-#include <curlx.h>
 
 #ifdef HAVE_UTIME_H
 #  include <utime.h>

src/tool_findfile.c

@@ -36,8 +36,6 @@
 #include <fcntl.h>
 #endif
 
-#include <curlx.h>
-
 #include "tool_findfile.h"
 #include "tool_cfgable.h"
 

src/tool_formparse.c

@@ -23,8 +23,6 @@
  ***************************************************************************/
 #include "tool_setup.h"
 
-#include <curlx.h>
-
 #include "tool_cfgable.h"
 #include "tool_msgs.h"
 #include "tool_getparam.h"

src/tool_getparam.c

@@ -23,7 +23,6 @@
  ***************************************************************************/
 #include "tool_setup.h"
 
-#include <curlx.h>
 #include "tool_cfgable.h"
 #include "tool_cb_prg.h"
 #include "tool_filetime.h"

src/tool_help.c

@@ -23,8 +23,6 @@
  ***************************************************************************/
 #include "tool_setup.h"
 
-#include <curlx.h>
-
 #include "tool_help.h"
 #include "tool_libinfo.h"
 #include "tool_util.h"

src/tool_helpers.c

@@ -23,8 +23,6 @@
  ***************************************************************************/
 #include "tool_setup.h"
 
-#include <curlx.h>
-
 #include "tool_cfgable.h"
 #include "tool_msgs.h"
 #include "tool_getparam.h"

src/tool_ipfs.c

@@ -24,7 +24,6 @@
 #include "tool_setup.h"
 
 #ifndef CURL_DISABLE_IPFS
-#include <curlx.h>
 
 #include "tool_cfgable.h"
 #include "tool_msgs.h"

src/tool_libinfo.c

@@ -23,7 +23,6 @@
  ***************************************************************************/
 #include "tool_setup.h"
 
-#include <curlx.h>
 #include "tool_libinfo.h"
 #include <memdebug.h> /* keep this as LAST include */
 

src/tool_main.c

@@ -37,8 +37,6 @@
 #include <fcntl.h>
 #endif
 
-#include <curlx.h>
-
 #include "tool_cfgable.h"
 #include "tool_doswin.h"
 #include "tool_msgs.h"

src/tool_msgs.c

@@ -23,8 +23,6 @@
  ***************************************************************************/
 #include "tool_setup.h"
 
-#include <curlx.h>
-
 #include "tool_cfgable.h"
 #include "tool_msgs.h"
 #include "tool_cb_prg.h"

src/tool_operate.c

@@ -54,8 +54,6 @@
 #include <uv.h>
 #endif
 
-#include <curlx.h>
-
 #include "tool_cfgable.h"
 #include "tool_cb_dbg.h"
 #include "tool_cb_hdr.h"

src/tool_operhlp.c

@@ -24,7 +24,6 @@
 #include "tool_setup.h"
 #include "tool_operate.h"
 
-#include <curlx.h>
 #include "tool_cfgable.h"
 #include "tool_doswin.h"
 #include "tool_operhlp.h"

src/tool_paramhlp.c

@@ -23,8 +23,6 @@
  ***************************************************************************/
 #include "tool_setup.h"
 
-#include <curlx.h>
-
 #include "tool_cfgable.h"
 #include "tool_getparam.h"
 #include "tool_getpass.h"

src/tool_parsecfg.c

@@ -23,7 +23,6 @@
  ***************************************************************************/
 #include "tool_setup.h"
 
-#include <curlx.h>
 #include "tool_cfgable.h"
 #include "tool_getparam.h"
 #include "tool_helpers.h"

src/tool_progress.c

@@ -25,7 +25,6 @@
 #include "tool_operate.h"
 #include "tool_progress.h"
 #include "tool_util.h"
-#include <curlx.h>
 
 /* The point of this function would be to return a string of the input data,
    but never longer than 5 columns (+ one zero byte).

src/tool_setopt.c

@@ -25,7 +25,6 @@
 
 #ifndef CURL_DISABLE_LIBCURL_OPTION
 
-#include <curlx.h>
 #include "tool_cfgable.h"
 #include "tool_easysrc.h"
 #include "tool_setopt.h"

src/tool_setup.h

@@ -47,7 +47,7 @@ extern FILE *tool_stderr;
 
 #include <curl/curl.h> /* external interface */
 
-#include "timeval.h"
+#include <curlx/curlx.h>
 
 /*
  * Platform specific stuff.

src/tool_ssls.c

@@ -23,7 +23,6 @@
  ***************************************************************************/
 #include "tool_setup.h"
 
-#include <curlx.h>
 #include "tool_cfgable.h"
 #include "tool_cb_dbg.h"
 #include "tool_msgs.h"

src/tool_urlglob.c

@@ -23,7 +23,6 @@
  ***************************************************************************/
 #include "tool_setup.h"
 
-#include <curlx.h>
 #include "tool_cfgable.h"
 #include "tool_doswin.h"
 #include "tool_urlglob.h"

src/tool_util.c

@@ -24,7 +24,6 @@
 #include "tool_setup.h"
 
 #include "tool_util.h"
-#include <curlx.h>
 #include <memdebug.h> /* keep this as LAST include */
 
 #ifdef _WIN32

src/tool_vms.c

@@ -30,7 +30,6 @@
 #include <unixlib.h>
 #endif
 
-#include <curlx.h>
 #include "curlmsg_vms.h"
 #include "tool_vms.h"
 #include <memdebug.h> /* keep this as LAST include */

src/tool_writeout.c

@@ -23,7 +23,6 @@
  ***************************************************************************/
 #include "tool_setup.h"
 
-#include <curlx.h>
 #include "tool_cfgable.h"
 #include "tool_writeout.h"
 #include "tool_writeout_json.h"

src/tool_writeout_json.c

@@ -23,7 +23,6 @@
  ***************************************************************************/
 #include "tool_setup.h"
 
-#include <curlx.h>
 #include "tool_cfgable.h"
 #include "tool_writeout_json.h"
 #include "tool_writeout.h"

src/var.c

@@ -23,7 +23,6 @@
  ***************************************************************************/
 #include "tool_setup.h"
 
-#include <curlx.h>
 #include "tool_cfgable.h"
 #include "tool_getparam.h"
 #include "tool_helpers.h"

src/var.h

@@ -25,7 +25,6 @@
  ***************************************************************************/
 
 #include "tool_getparam.h"
-#include <curlx.h>
 
 struct tool_var {
   struct tool_var *next;

tests/client/CMakeLists.txt

@@ -43,8 +43,7 @@ add_dependencies(testdeps ${BUNDLE})
 target_link_libraries(${BUNDLE} ${LIB_SELECTED} ${CURL_LIBS})
 target_include_directories(${BUNDLE} PRIVATE
   "${PROJECT_BINARY_DIR}/lib"            # for "curl_config.h"
-  "${PROJECT_SOURCE_DIR}/lib"            # for "curl_setup.h"
-  "${PROJECT_SOURCE_DIR}/lib/curlx"      # for curlx
+  "${PROJECT_SOURCE_DIR}/lib"            # for "curl_setup.h", curlx
   "${CMAKE_CURRENT_SOURCE_DIR}"          # for the generated bundle source to find included test sources
 )
 set_property(TARGET ${BUNDLE} APPEND PROPERTY COMPILE_DEFINITIONS "CURL_NO_OLDIES")

tests/client/Makefile.am

@@ -36,7 +36,6 @@ AUTOMAKE_OPTIONS = foreign nostdinc
 AM_CPPFLAGS = -I$(top_srcdir)/include        \
               -I$(top_builddir)/lib          \
               -I$(top_srcdir)/lib            \
-              -I$(top_srcdir)/lib/curlx      \
               -I$(srcdir)
 
 # Get BUNDLE, FIRSTFILES, CURLX_CFILES, TESTFILES variables

tests/client/first.h

@@ -36,7 +36,7 @@ extern const struct entry_s s_entries[];
 
 #include <curl/curl.h>
 
-#include "curlx.h"
+#include <curlx/curlx.h>
 
 #define ERR()                                                                 \
   do {                                                                        \

tests/libtest/CMakeLists.txt

@@ -52,8 +52,7 @@ add_dependencies(testdeps ${BUNDLE})
 target_link_libraries(${BUNDLE} ${LIB_SELECTED} ${CURL_LIBS})
 target_include_directories(${BUNDLE} PRIVATE
   "${PROJECT_BINARY_DIR}/lib"            # for "curl_config.h"
-  "${PROJECT_SOURCE_DIR}/lib"            # for "curl_setup.h"
-  "${PROJECT_SOURCE_DIR}/lib/curlx"      # for curlx
+  "${PROJECT_SOURCE_DIR}/lib"            # for "curl_setup.h", curlx
   "${CMAKE_CURRENT_SOURCE_DIR}"          # for the generated bundle source to find included test sources
   "${PROJECT_SOURCE_DIR}/tests/unit"     # for "curlcheck.h"
 )

tests/libtest/Makefile.am

@@ -36,7 +36,6 @@ AUTOMAKE_OPTIONS = foreign nostdinc
 AM_CPPFLAGS = -I$(top_srcdir)/include        \
               -I$(top_builddir)/lib          \
               -I$(top_srcdir)/lib            \
-              -I$(top_srcdir)/lib/curlx      \
               -I$(srcdir)                    \
               -I$(top_srcdir)/tests/unit
 

tests/libtest/first.h

@@ -34,6 +34,6 @@ struct entry_s {
 
 extern const struct entry_s s_entries[];
 
-#include "curlx.h"
+#include <curlx/curlx.h>
 
 #endif /* HEADER_LIBTEST_FIRST_H */

tests/server/CMakeLists.txt

@@ -39,8 +39,7 @@ add_dependencies(testdeps ${BUNDLE})
 target_link_libraries(${BUNDLE} ${CURL_LIBS})
 target_include_directories(${BUNDLE} PRIVATE
   "${PROJECT_BINARY_DIR}/lib"            # for "curl_config.h"
-  "${PROJECT_SOURCE_DIR}/lib"            # for "curl_setup.h"
-  "${PROJECT_SOURCE_DIR}/lib/curlx"      # for curlx
+  "${PROJECT_SOURCE_DIR}/lib"            # for "curl_setup.h", curlx
   "${CMAKE_CURRENT_SOURCE_DIR}"          # for the generated bundle source to find included test sources
 )
 set_property(TARGET ${BUNDLE} APPEND PROPERTY COMPILE_DEFINITIONS "WITHOUT_LIBCURL")

tests/server/Makefile.am

@@ -36,7 +36,6 @@ AUTOMAKE_OPTIONS = foreign nostdinc
 AM_CPPFLAGS = -I$(top_srcdir)/include        \
               -I$(top_builddir)/lib          \
               -I$(top_srcdir)/lib            \
-              -I$(top_srcdir)/lib/curlx      \
               -I$(srcdir)
 
 # Get BUNDLE, FIRSTFILES, UTILS, CURLX_CFILES, TESTFILES variables

tests/server/first.h

@@ -50,7 +50,7 @@ extern const struct entry_s s_entries[];
 #include <netdb.h>
 #endif
 
-#include <curlx.h> /* from the private lib dir */
+#include <curlx/curlx.h>
 
 /* adjust for old MSVC */
 #if defined(_MSC_VER) && (_MSC_VER < 1900)

tests/server/sockfilt.c

@@ -85,9 +85,8 @@
  * it!
  */
 
-
 /* buffer is this excessively large only to be able to support things like
-  test 1003 which tests exceedingly large server response lines */
+   test 1003 which tests exceedingly large server response lines */
 #define BUFFER_SIZE 17010
 
 static bool verbose = FALSE;

tests/tunit/CMakeLists.txt

@@ -39,8 +39,7 @@ add_dependencies(testdeps ${BUNDLE})
 target_link_libraries(${BUNDLE} curltool curlu)
 target_include_directories(${BUNDLE} PRIVATE
   "${PROJECT_BINARY_DIR}/lib"            # for "curl_config.h"
-  "${PROJECT_SOURCE_DIR}/lib"            # for "curl_setup.h"
-  "${PROJECT_SOURCE_DIR}/lib/curlx"      # for curlx
+  "${PROJECT_SOURCE_DIR}/lib"            # for "curl_setup.h", curlx
   "${PROJECT_SOURCE_DIR}/src"            # for tool headers
   "${PROJECT_SOURCE_DIR}/tests/libtest"  # for "first.h"
   "${PROJECT_SOURCE_DIR}/tests/unit"     # for "curlcheck.h"

tests/tunit/Makefile.am

@@ -36,7 +36,6 @@ AUTOMAKE_OPTIONS = foreign nostdinc
 AM_CPPFLAGS = -I$(top_srcdir)/include        \
               -I$(top_builddir)/lib          \
               -I$(top_srcdir)/lib            \
-              -I$(top_srcdir)/lib/curlx      \
               -I$(top_srcdir)/src            \
               -I$(top_srcdir)/tests/libtest  \
               -I$(top_srcdir)/tests/unit     \

tests/unit/CMakeLists.txt

@@ -39,8 +39,7 @@ add_dependencies(testdeps ${BUNDLE})
 target_link_libraries(${BUNDLE} curlu)
 target_include_directories(${BUNDLE} PRIVATE
   "${PROJECT_BINARY_DIR}/lib"            # for "curl_config.h"
-  "${PROJECT_SOURCE_DIR}/lib"            # for "curl_setup.h"
-  "${PROJECT_SOURCE_DIR}/lib/curlx"      # for curlx
+  "${PROJECT_SOURCE_DIR}/lib"            # for "curl_setup.h", curlx
   "${PROJECT_SOURCE_DIR}/tests/libtest"  # for "first.h"
   "${CMAKE_CURRENT_SOURCE_DIR}"          # for the generated bundle source to find included test sources
 )

tests/unit/Makefile.am

@@ -36,7 +36,6 @@ AUTOMAKE_OPTIONS = foreign nostdinc
 AM_CPPFLAGS = -I$(top_srcdir)/include        \
               -I$(top_builddir)/lib          \
               -I$(top_srcdir)/lib            \
-              -I$(top_srcdir)/lib/curlx      \
               -I$(top_srcdir)/tests/libtest  \
               -I$(srcdir)
 

tests/unit/unit1302.c

@@ -25,7 +25,7 @@
 
 #include "urldata.h"
 #include "url.h" /* for Curl_safefree */
-#include "curlx/base64.h"
+#include <curlx/base64.h>
 #include "memdebug.h" /* LAST include file */
 
 static CURLcode test_unit1302(char *arg)

tests/unit/unit1305.c

@@ -33,8 +33,6 @@
 #include <arpa/inet.h>
 #endif
 
-#include <curlx.h>
-
 #include "hash.h"
 #include "hostip.h"
 

tests/unit/unit1323.c

@@ -23,7 +23,7 @@
  ***************************************************************************/
 #include "curlcheck.h"
 
-#include "timeval.h"
+#include <curlx/timeval.h>
 
 static CURLcode test_unit1323(char *arg)
 {

tests/unit/unit1602.c

@@ -23,8 +23,6 @@
  ***************************************************************************/
 #include "curlcheck.h"
 
-#include <curlx.h>
-
 #include "hash.h"
 
 #include <memdebug.h> /* LAST include file */

tests/unit/unit1603.c

@@ -23,8 +23,8 @@
  ***************************************************************************/
 #include "curlcheck.h"
 
-#include <curlx.h>
 #include "hash.h"
+
 #include <memdebug.h> /* LAST include file */
 
 static const size_t slots = 3;

tests/unit/unit1616.c

@@ -23,8 +23,8 @@
  ***************************************************************************/
 #include "curlcheck.h"
 
-#include <curlx.h>
-#include <uint-hash.h>
+#include "uint-hash.h"
+
 #include <memdebug.h> /* LAST include file */
 
 static void t1616_mydtor(unsigned int id, void *elem)

tests/unit/unit1650.c

@@ -23,8 +23,9 @@
  ***************************************************************************/
 #include "curlcheck.h"
 
+#include <curlx/dynbuf.h>
+
 #include "doh.h"
-#include "dynbuf.h"
 
 static CURLcode test_unit1650(char *arg)
 {

tests/unit/unit1664.c

@@ -30,7 +30,7 @@
 #include <netinet/in6.h>
 #endif
 
-#include "curlx/strparse.h"
+#include <curlx/strparse.h>
 
 #include "memdebug.h" /* LAST include file */
 

tests/unit/unit1979.c

@@ -23,8 +23,9 @@
  ***************************************************************************/
 #include "curlcheck.h"
 
+#include <curlx/dynbuf.h>
+
 #include "http_aws_sigv4.h"
-#include "dynbuf.h"
 
 static CURLcode test_unit1979(char *arg)
 {

tests/unit/unit1980.c

@@ -23,8 +23,9 @@
  ***************************************************************************/
 #include "curlcheck.h"
 
+#include <curlx/dynbuf.h>
+
 #include "http_aws_sigv4.h"
-#include "dynbuf.h"
 
 static CURLcode test_unit1980(char *arg)
 {

tests/unit/unit2600.c

@@ -23,7 +23,7 @@
  ***************************************************************************/
 #include "curlcheck.h"
 
-#include <curlx.h>
+#include <curlx/curlx.h>
 
 #ifdef HAVE_NETINET_IN_H
 #include <netinet/in.h>

tests/unit/unit2602.c

@@ -23,8 +23,9 @@
  ***************************************************************************/
 #include "curlcheck.h"
 
+#include <curlx/dynbuf.h>
+
 #include "urldata.h"
-#include "dynbuf.h"
 #include "dynhds.h"
 #include "curl_trc.h"