moparisthebest
/
curl
mirror of https://github.com/moparisthebest/curl
1
0
Fork 0
Code Issues Releases Wiki Activity

renamed Curl_ to curl_ for the printf() prefixes

This commit is contained in:
Daniel Stenberg 2001-01-05 12:19:42 +00:00
parent 4031104404
commit 6403257886
3 changed files with 34 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
include/curl/mprintf.h
View File

@ -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 */

2
lib/http.c
View File

@ -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) {

26
lib/mprintf.c
View File

@ -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);
}