d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make the v*printf() functions in libsa return int instead of void.

Browse Source 
This makes them compatible with the C standard signatures, avoiding
spurious mismatch errors in the places where the oddball requirements
of standalone code end up putting two declarations of the same function
in play.
This commit is contained in:
Ian Lepore 2018-06-05 17:18:10 +00:00
parent 7a13eeba18
commit 3e9c7874ce
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=334665
2 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
stand/libsa/printf.c
View File

@ -80,11 +80,11 @@ printf(const char *fmt, ...)
return retval;
}
void
int
vprintf(const char *fmt, va_list ap)
{
kvprintf(fmt, putchar_wrapper, NULL, 10, ap);
return (kvprintf(fmt, putchar_wrapper, NULL, 10, ap));
}
int
@ -140,27 +140,32 @@ snprintf(char *buf, size_t size, const char *cfmt, ...)
return retval;
}
void
int
vsnprintf(char *buf, size_t size, const char *cfmt, va_list ap)
{
struct print_buf arg;
int retval;
arg.buf = buf;
arg.size = size;
kvprintf(cfmt, &snprint_func, &arg, 10, ap);
retval = kvprintf(cfmt, &snprint_func, &arg, 10, ap);
if (arg.size >= 1)
*(arg.buf)++ = 0;
return (retval);
}
void
int
vsprintf(char *buf, const char *cfmt, va_list ap)
{
int retval;
retval = kvprintf(cfmt, NULL, (void *)buf, 10, ap);
buf[retval] = '\0';
return (retval);
}
/*

6
stand/libsa/stand.h
View File

@ -270,9 +270,9 @@ extern void mallocstats(void);
extern int printf(const char *fmt, ...) __printflike(1, 2);
extern int sprintf(char *buf, const char *cfmt, ...) __printflike(2, 3);
extern int snprintf(char *buf, size_t size, const char *cfmt, ...) __printflike(3, 4);
extern void vprintf(const char *fmt, __va_list);
extern void vsprintf(char *buf, const char *cfmt, __va_list);
extern void vsnprintf(char *buf, size_t size, const char *cfmt, __va_list);
extern int vprintf(const char *fmt, __va_list);
extern int vsprintf(char *buf, const char *cfmt, __va_list);
extern int vsnprintf(char *buf, size_t size, const char *cfmt, __va_list);
extern void twiddle(u_int callerdiv);
extern void twiddle_divisor(u_int globaldiv);