sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-22 22:04:08 +03:00
Code

Merge from HEAD - add PRINTF_ATTRIBUTE to a few more functions.

Browse Source 
(This used to be commit 9e5297131cc53d7161aa74566f147b98e1c27aaa)
This commit is contained in:
Andrew Bartlett 2003-01-03 03:24:23 +00:00
parent a63aa62bdd
commit 43059acb95
7 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
source3/include/includes.h
View File

@ -1156,6 +1156,15 @@ int snprintf(char *,size_t ,const char *, ...) PRINTF_ATTRIBUTE(3,4);
int asprintf(char **,const char *, ...) PRINTF_ATTRIBUTE(2,3);
#endif
void sys_adminlog(int priority, const char *format_str, ...) PRINTF_ATTRIBUTE(2,3);
int pstr_sprintf(pstring s, const char *fmt, ...) PRINTF_ATTRIBUTE(2,3);
int fstr_sprintf(fstring s, const char *fmt, ...) PRINTF_ATTRIBUTE(2,3);
int d_vfprintf(FILE *f, const char *format, va_list ap) PRINTF_ATTRIBUTE(2,0);
int smb_xvasprintf(char **ptr, const char *format, va_list ap) PRINTF_ATTRIBUTE(2,0);
/* we used to use these fns, but now we have good replacements
for snprintf and vsnprintf */
#define slprintf snprintf

2
source3/include/xfile.h
View File

@ -44,4 +44,6 @@ extern XFILE *x_stdin, *x_stdout, *x_stderr;
#define x_getc(f) x_fgetc(f)
int x_vfprintf(XFILE *f, const char *format, va_list ap) PRINTF_ATTRIBUTE(2, 0);
int x_fprintf(XFILE *f, const char *format, ...) PRINTF_ATTRIBUTE(2, 3);
#endif /* _XFILE_H_ */

2
source3/lib/dprintf.c
View File

@ -31,7 +31,7 @@
#include "includes.h"
int d_vfprintf(FILE *f, const char *format, va_list ap)
int d_vfprintf(FILE *f, const char *format, va_list ap)
{
char *p, *p2;
int ret, maxlen, clen;

2
source3/lib/system.c
View File

@ -1233,7 +1233,7 @@ int sys_dup2(int oldfd, int newfd)
Wrapper for Admin Logs.
****************************************************************************/
void sys_adminlog(int priority, char *format_str, ...)
void sys_adminlog(int priority, const char *format_str, ...)
{
va_list ap;
int ret;

2
source3/lib/util.c
View File

@ -2080,7 +2080,7 @@ char *smb_xstrndup(const char *s, size_t n)
vasprintf that aborts on malloc fail
*/
int smb_xvasprintf(char **ptr, const char *format, va_list ap)
int smb_xvasprintf(char **ptr, const char *format, va_list ap)
{
int n;
va_list ap2;

4
source3/lib/util_str.c
View File

@ -1116,7 +1116,7 @@ char *binary_string(char *buf, int len)
Just a typesafety wrapper for snprintf into a pstring.
********************************************************************/
int pstr_sprintf(pstring s, const char *fmt, ...)
int pstr_sprintf(pstring s, const char *fmt, ...)
{
va_list ap;
int ret;
@ -1131,7 +1131,7 @@ int pstr_sprintf(pstring s, const char *fmt, ...)
Just a typesafety wrapper for snprintf into a fstring.
********************************************************************/
int fstr_sprintf(fstring s, const char *fmt, ...)
int fstr_sprintf(fstring s, const char *fmt, ...)
{
va_list ap;
int ret;

4
source3/lib/xfile.c
View File

@ -184,7 +184,7 @@ int x_fwrite(const void *p, size_t size, size_t nmemb, XFILE *f)
}
/* thank goodness for asprintf() */
int x_vfprintf(XFILE *f, const char *format, va_list ap)
int x_vfprintf(XFILE *f, const char *format, va_list ap)
{
char *p;
int len, ret;
@ -199,7 +199,7 @@ int x_vfprintf(XFILE *f, const char *format, va_list ap)
return ret;
}
int x_fprintf(XFILE *f, const char *format, ...)
int x_fprintf(XFILE *f, const char *format, ...)
{
va_list ap;
int ret;