From: Viktor Szakats <commit@vsz.me>
Date: Thu, 22 Aug 2024 15:12:09 +0000 (+0200)
Subject: src: replace copy of printf mappings with an include
X-Git-Tag: curl-8_10_0~149
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4be599fe7896e2385b3306d0854b57dc020008fe;p=thirdparty%2Fcurl.git

src: replace copy of printf mappings with an include

Closes #14648
---

diff --git a/lib/curlx.h b/lib/curlx.h
index 053c3465c8..0391d7cd7f 100644
--- a/lib/curlx.h
+++ b/lib/curlx.h
@@ -31,10 +31,8 @@
  * be.
  */
 
-#include <curl/mprintf.h>
-/* this is still a public header file that provides the curl_mprintf()
-   functions while they still are offered publicly. They will be made library-
-   private one day */
+/* map standard printf functions to curl implementations */
+#include "curl_printf.h"
 
 #include "strcase.h"
 /* "strcase.h" provides the strcasecompare protos */
@@ -77,25 +75,4 @@
 
 */
 
-/* We define all "standard" printf() functions to use the curlx_* version
-   instead. It makes the source code transparent and easier to
-   understand/patch. Undefine them first. */
-# undef printf
-# undef fprintf
-# undef msnprintf
-# undef vprintf
-# undef vfprintf
-# undef mvsnprintf
-# undef aprintf
-# undef vaprintf
-
-# define printf curl_mprintf
-# define fprintf curl_mfprintf
-# define msnprintf curl_msnprintf
-# define vprintf curl_mvprintf
-# define vfprintf curl_mvfprintf
-# define mvsnprintf curl_mvsnprintf
-# define aprintf curl_maprintf
-# define vaprintf curl_mvaprintf
-
 #endif /* HEADER_CURL_CURLX_H */