aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--include/curl/mprintf.h40
-rw-r--r--lib/http.c2
-rw-r--r--lib/mprintf.c26
3 files changed, 34 insertions, 34 deletions
diff --git a/include/curl/mprintf.h b/include/curl/mprintf.h
index 7e89fe7d4..6bf24791c 100644
--- a/include/curl/mprintf.h
+++ b/include/curl/mprintf.h
@@ -55,28 +55,28 @@
#include <stdarg.h>
-int Curl_mprintf(const char *format, ...);
-int Curl_mfprintf(FILE *fd, const char *format, ...);
-int Curl_msprintf(char *buffer, const char *format, ...);
-int Curl_msnprintf(char *buffer, size_t maxlength, const char *format, ...);
-int Curl_mvprintf(const char *format, va_list args);
-int Curl_mvfprintf(FILE *fd, const char *format, va_list args);
-int Curl_mvsprintf(char *buffer, const char *format, va_list args);
-int Curl_mvsnprintf(char *buffer, size_t maxlength, const char *format, va_list args);
-char *Curl_maprintf(const char *format, ...);
-char *Curl_mvaprintf(const char *format, va_list args);
+int curl_mprintf(const char *format, ...);
+int curl_mfprintf(FILE *fd, const char *format, ...);
+int curl_msprintf(char *buffer, const char *format, ...);
+int curl_msnprintf(char *buffer, size_t maxlength, const char *format, ...);
+int curl_mvprintf(const char *format, va_list args);
+int curl_mvfprintf(FILE *fd, const char *format, va_list args);
+int curl_mvsprintf(char *buffer, const char *format, va_list args);
+int curl_mvsnprintf(char *buffer, size_t maxlength, const char *format, va_list args);
+char *curl_maprintf(const char *format, ...);
+char *curl_mvaprintf(const char *format, va_list args);
#ifdef _MPRINTF_REPLACE
-# define printf Curl_mprintf
-# define fprintf Curl_mfprintf
-# define sprintf Curl_msprintf
-# define snprintf Curl_msnprintf
-# define vprintf Curl_mvprintf
-# define vfprintf Curl_mvfprintf
-# define vsprintf Curl_mvsprintf
-# define vsnprintf Curl_mvsnprintf
-# define aprintf Curl_maprintf
-# define vaprintf Curl_mvaprintf
+# define printf curl_mprintf
+# define fprintf curl_mfprintf
+# define sprintf curl_msprintf
+# define snprintf curl_msnprintf
+# define vprintf curl_mvprintf
+# define vfprintf curl_mvfprintf
+# define vsprintf curl_mvsprintf
+# define vsnprintf curl_mvsnprintf
+# define aprintf curl_maprintf
+# define vaprintf curl_mvaprintf
#endif
#endif /* H_MPRINTF */
diff --git a/lib/http.c b/lib/http.c
index 555845abb..aa96ed0af 100644
--- a/lib/http.c
+++ b/lib/http.c
@@ -161,7 +161,7 @@ CURLcode add_bufferf(send_buffer *in, char *fmt, ...)
char *s;
va_list ap;
va_start(ap, fmt);
- s = Curl_mvaprintf(fmt, ap); /* this allocs a new string to append */
+ s = vaprintf(fmt, ap); /* this allocs a new string to append */
va_end(ap);
if(s) {
diff --git a/lib/mprintf.c b/lib/mprintf.c
index dd6dbabad..1bf9a6e72 100644
--- a/lib/mprintf.c
+++ b/lib/mprintf.c
@@ -207,7 +207,7 @@ struct asprintf {
size_t alloc; /* length of alloc */
};
-int Curl_msprintf(char *buffer, const char *format, ...);
+int curl_msprintf(char *buffer, const char *format, ...);
static int dprintf_DollarString(char *input, char **end)
{
@@ -955,11 +955,11 @@ static int dprintf_formatf(
if(width >= 0) {
/* RECURSIVE USAGE */
- fptr += Curl_msprintf(fptr, "%d", width);
+ fptr += curl_msprintf(fptr, "%d", width);
}
if(prec >= 0) {
/* RECURSIVE USAGE */
- fptr += Curl_msprintf(fptr, ".%d", prec);
+ fptr += curl_msprintf(fptr, ".%d", prec);
}
if (p->flags & FLAGS_LONG)
strcat(fptr, "l");
@@ -1025,7 +1025,7 @@ static int addbyter(int output, FILE *data)
return -1;
}
-int Curl_msnprintf(char *buffer, size_t maxlength, const char *format, ...)
+int curl_msnprintf(char *buffer, size_t maxlength, const char *format, ...)
{
va_list ap_save; /* argument pointer */
int retcode;
@@ -1045,7 +1045,7 @@ int Curl_msnprintf(char *buffer, size_t maxlength, const char *format, ...)
return retcode;
}
-int Curl_mvsnprintf(char *buffer, size_t maxlength, const char *format, va_list ap_save)
+int curl_mvsnprintf(char *buffer, size_t maxlength, const char *format, va_list ap_save)
{
int retcode;
struct nsprintf info;
@@ -1092,7 +1092,7 @@ static int alloc_addbyter(int output, FILE *data)
}
-char *Curl_maprintf(const char *format, ...)
+char *curl_maprintf(const char *format, ...)
{
va_list ap_save; /* argument pointer */
int retcode;
@@ -1113,7 +1113,7 @@ char *Curl_maprintf(const char *format, ...)
return NULL;
}
-char *Curl_mvaprintf(const char *format, va_list ap_save)
+char *curl_mvaprintf(const char *format, va_list ap_save)
{
int retcode;
struct asprintf info;
@@ -1140,7 +1140,7 @@ static int storebuffer(int output, FILE *data)
return output; /* act like fputc() ! */
}
-int Curl_msprintf(char *buffer, const char *format, ...)
+int curl_msprintf(char *buffer, const char *format, ...)
{
va_list ap_save; /* argument pointer */
int retcode;
@@ -1153,7 +1153,7 @@ int Curl_msprintf(char *buffer, const char *format, ...)
extern int fputc(int, FILE *);
-int Curl_mprintf(const char *format, ...)
+int curl_mprintf(const char *format, ...)
{
int retcode;
va_list ap_save; /* argument pointer */
@@ -1163,7 +1163,7 @@ int Curl_mprintf(const char *format, ...)
return retcode;
}
-int Curl_mfprintf(FILE *whereto, const char *format, ...)
+int curl_mfprintf(FILE *whereto, const char *format, ...)
{
int retcode;
va_list ap_save; /* argument pointer */
@@ -1173,7 +1173,7 @@ int Curl_mfprintf(FILE *whereto, const char *format, ...)
return retcode;
}
-int Curl_mvsprintf(char *buffer, const char *format, va_list ap_save)
+int curl_mvsprintf(char *buffer, const char *format, va_list ap_save)
{
int retcode;
retcode = dprintf_formatf(&buffer, storebuffer, format, ap_save);
@@ -1181,12 +1181,12 @@ int Curl_mvsprintf(char *buffer, const char *format, va_list ap_save)
return retcode;
}
-int Curl_mvprintf(const char *format, va_list ap_save)
+int curl_mvprintf(const char *format, va_list ap_save)
{
return dprintf_formatf(stdout, fputc, format, ap_save);
}
-int Curl_mvfprintf(FILE *whereto, const char *format, va_list ap_save)
+int curl_mvfprintf(FILE *whereto, const char *format, va_list ap_save)
{
return dprintf_formatf(whereto, fputc, format, ap_save);
}