diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2003-01-03 03:24:23 +0000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2003-01-03 03:24:23 +0000 |
| commit | 43059acb95837fce3c8fdf5fc71b96c403e61939 (patch) | |
| tree | 20908cccfc34f5e4421b252ce698a3cbf534bc44 /source3/include | |
| parent | a63aa62bdd3ef4545cfd68123aa3e7363dcec2e2 (diff) | |
| download | samba-43059acb95837fce3c8fdf5fc71b96c403e61939.tar.gz samba-43059acb95837fce3c8fdf5fc71b96c403e61939.tar.bz2 samba-43059acb95837fce3c8fdf5fc71b96c403e61939.zip | |
Merge from HEAD - add PRINTF_ATTRIBUTE to a few more functions.
(This used to be commit 9e5297131cc53d7161aa74566f147b98e1c27aaa)
Diffstat (limited to 'source3/include')
| -rw-r--r-- | source3/include/includes.h | 9 | ||||
| -rw-r--r-- | source3/include/xfile.h | 2 |
2 files changed, 11 insertions, 0 deletions
diff --git a/source3/include/includes.h b/source3/include/includes.h index 58f1565d80..391d1bf1f9 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -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 diff --git a/source3/include/xfile.h b/source3/include/xfile.h index a573b59a4a..89fa9d1e11 100644 --- a/source3/include/xfile.h +++ b/source3/include/xfile.h @@ -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_ */ |