mprintf.h: remove #ifdef CURLDEBUG (df5578a7) · Commits · CYBER - Cyber Security / TS 103 523 MSP / TLMSP / TLMSP curl

include/curl/mprintf.h

+1 −8

Original line number	Diff line number	Diff line
		@@ -7,7 +7,7 @@
		* \| (__\| \|_\| \| _ <\| \|___
		* \___\|\___/\|_\| \_\_____\|
		*
		* Copyright (C) 1998 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al.
		* Copyright (C) 1998 - 2015, 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
		@@ -57,15 +57,8 @@ CURL_EXTERN char curl_mvaprintf(const char format, va_list args);
		# undef vaprintf
		# define printf curl_mprintf
		# define fprintf curl_mfprintf
		#ifdef CURLDEBUG
		/* When built with CURLDEBUG we define away the sprintf functions since we
		don't want internal code to be using them */
		# define sprintf sprintf_was_used
		# define vsprintf vsprintf_was_used
		#else
		# define sprintf curl_msprintf
		# define vsprintf curl_mvsprintf
		#endif
		# define snprintf curl_msnprintf
		# define vprintf curl_mvprintf
		# define vfprintf curl_mvfprintf

+2 −1

Original line number	Diff line number	Diff line
		@@ -64,7 +64,8 @@ LIB_HFILES = arpa_telnet.h netrc.h file.h timeval.h hostip.h progress.h \
		curl_ntlm.h curl_gssapi.h curl_ntlm_wb.h curl_ntlm_core.h \
		curl_ntlm_msgs.h curl_sasl.h curl_multibyte.h hostcheck.h bundles.h \
		conncache.h curl_setup_once.h multihandle.h setup-vms.h pipeline.h \
		dotdot.h x509asn1.h http2.h sigpipe.h smb.h curl_endian.h curl_des.h
		dotdot.h x509asn1.h http2.h sigpipe.h smb.h curl_endian.h curl_des.h \
		curl_printf.h

		LIB_RCFILES = libcurl.rc

+2 −4

Original line number	Diff line number	Diff line
		@@ -5,7 +5,7 @@
		* \| (__\| \|_\| \| _ <\| \|___
		* \___\|\___/\|_\| \_\_____\|
		*
		* Copyright (C) 1998 - 2014, Daniel Stenberg, <daniel@haxx.se>, et al.
		* Copyright (C) 1998 - 2015, 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
		@@ -68,9 +68,7 @@
		#include "connect.h"
		#include "select.h"
		#include "progress.h"

		#define _MPRINTF_REPLACE /* use our functions only */
		#include <curl/mprintf.h>
		#include "curl_printf.h"

		# if defined(CURL_STATICLIB) && !defined(CARES_STATICLIB) && \
		(defined(WIN32) \|\| defined(_WIN32) \|\| defined(__SYMBIAN32__))

+3 −5

Original line number	Diff line number	Diff line
		@@ -5,7 +5,7 @@
		* \| (__\| \|_\| \| _ <\| \|___
		* \___\|\___/\|_\| \_\_____\|
		*
		* Copyright (C) 1998 - 2014, Daniel Stenberg, <daniel@haxx.se>, et al.
		* Copyright (C) 1998 - 2015, 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
		@@ -69,11 +69,9 @@
		#include "inet_ntop.h"
		#include "curl_threads.h"
		#include "connect.h"

		#define _MPRINTF_REPLACE /* use our functions only */
		#include <curl/mprintf.h>

		#include "curl_printf.h"
		#include "curl_memory.h"

		/* The last #include file should be: */
		#include "memdebug.h"

+2 −5

Original line number	Diff line number	Diff line
		@@ -5,7 +5,7 @@
		* \| (__\| \|_\| \| _ <\| \|___
		* \___\|\___/\|_\| \_\_____\|
		*
		* Copyright (C) 1998 - 2014, Daniel Stenberg, <daniel@haxx.se>, et al.
		* Copyright (C) 1998 - 2015, 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
		@@ -23,10 +23,7 @@
		/* Base64 encoding/decoding */

		#include "curl_setup.h"

		#define _MPRINTF_REPLACE /* use our functions only */
		#include <curl/mprintf.h>

		#include "curl_printf.h"
		#include "urldata.h" /* for the SessionHandle definition */
		#include "warnless.h"
		#include "curl_base64.h"