X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/a45431fa71165d56a6775099fad1c8806c593b0a..d12746bc15d83ab821be36975da0179672708bc1:/src/src/functions.h diff --git a/src/src/functions.h b/src/src/functions.h index 38df27aea..cab7a7363 100644 --- a/src/src/functions.h +++ b/src/src/functions.h @@ -435,8 +435,7 @@ extern void smtp_command_sigterm_exit(void); extern void smtp_data_timeout_exit(void); extern void smtp_data_sigint_exit(void); extern uschar *smtp_cmd_hist(void); -extern int smtp_connect(host_item *, int, uschar *, int, - transport_instance *); +extern int smtp_connect(smtp_connect_args *, const blob *); extern int smtp_sock_connect(host_item *, int, int, uschar *, transport_instance * tb, int, const blob *); extern int smtp_feof(void); @@ -493,6 +492,7 @@ extern uschar *string_copy_malloc(const uschar *); extern uschar *string_copylc(const uschar *); extern uschar *string_copynlc(uschar *, int); extern uschar *string_dequote(const uschar **); +extern gstring *string_fmt_append(gstring *, const char *, ...) ALMOST_PRINTF(2,3); extern BOOL string_format(uschar *, int, const char *, ...) ALMOST_PRINTF(3,4); extern uschar *string_format_size(int, uschar *); extern uschar *string_from_gstring(gstring *); @@ -516,7 +516,7 @@ extern uschar *string_domain_utf8_to_alabel(const uschar *, uschar **); extern uschar *string_localpart_alabel_to_utf8(const uschar *, uschar **); extern uschar *string_localpart_utf8_to_alabel(const uschar *, uschar **); #endif -extern BOOL string_vformat(uschar *, int, const char *, va_list); +extern gstring *string_vformat(gstring *, BOOL, const char *, va_list); extern int strcmpic(const uschar *, const uschar *); extern int strncmpic(const uschar *, const uschar *, int); extern uschar *strstric(uschar *, uschar *, BOOL);