git://git.exim.org
/
exim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
TLS: restore TLS protocol version to default Received: header
[exim.git]
/
src
/
src
/
functions.h
diff --git
a/src/src/functions.h
b/src/src/functions.h
index 37bca23e321efc0d99d19658d7d7cb126f65227f..f4fcd1e19677f0e3bc68159178856777713581fd 100644
(file)
--- a/
src/src/functions.h
+++ b/
src/src/functions.h
@@
-197,8
+197,8
@@
extern BOOL dkim_transport_write_message(transport_ctx *,
#endif
extern dns_address *dns_address_from_rr(dns_answer *, dns_record *);
extern int dns_basic_lookup(dns_answer *, const uschar *, int);
#endif
extern dns_address *dns_address_from_rr(dns_answer *, dns_record *);
extern int dns_basic_lookup(dns_answer *, const uschar *, int);
-extern
void dns_build_reverse(const uschar *,
uschar *);
-extern time_t dns_expire_from_soa(dns_answer *);
+extern
uschar *dns_build_reverse(const
uschar *);
+extern time_t dns_expire_from_soa(dns_answer *
, int
);
extern void dns_init(BOOL, BOOL, BOOL);
extern BOOL dns_is_aa(const dns_answer *);
extern BOOL dns_is_secure(const dns_answer *);
extern void dns_init(BOOL, BOOL, BOOL);
extern BOOL dns_is_aa(const dns_answer *);
extern BOOL dns_is_secure(const dns_answer *);
@@
-520,8
+520,7
@@
extern uschar *string_localpart_utf8_to_alabel(const uschar *, uschar **);
#endif
#define string_format(buf, siz, fmt, ...) \
#endif
#define string_format(buf, siz, fmt, ...) \
- string_format_trc(buf, siz, US __FUNCTION__, __LINE__, \
- fmt __VA_OPT__(,) __VA_ARGS__)
+ string_format_trc(buf, siz, US __FUNCTION__, __LINE__, fmt, __VA_ARGS__)
extern BOOL string_format_trc(uschar *, int, const uschar *, unsigned,
const char *, ...) ALMOST_PRINTF(5,6);
extern BOOL string_format_trc(uschar *, int, const uschar *, unsigned,
const char *, ...) ALMOST_PRINTF(5,6);
@@
-532,8
+531,7
@@
extern gstring *string_vformat_trc(gstring *, const uschar *, unsigned,
unsigned, unsigned, const char *, va_list);
#define string_open_failed(eno, fmt, ...) \
unsigned, unsigned, const char *, va_list);
#define string_open_failed(eno, fmt, ...) \
- string_open_failed_trc(eno, US __FUNCTION__, __LINE__, \
- fmt __VA_OPT__(,) __VA_ARGS__)
+ string_open_failed_trc(eno, US __FUNCTION__, __LINE__, fmt, __VA_ARGS__)
extern uschar *string_open_failed_trc(int, const uschar *, unsigned,
const char *, ...) PRINTF_FUNCTION(4,5);
extern uschar *string_open_failed_trc(int, const uschar *, unsigned,
const char *, ...) PRINTF_FUNCTION(4,5);
@@
-833,11
+831,11
@@
if (g) store_release_above_3(g->s + (g->size = g->ptr + 1), file, line);
#define string_fmt_append(g, fmt, ...) \
string_fmt_append_f_trc(g, US __FUNCTION__, __LINE__, \
#define string_fmt_append(g, fmt, ...) \
string_fmt_append_f_trc(g, US __FUNCTION__, __LINE__, \
- SVFMT_EXTEND|SVFMT_REBUFFER, fmt
__VA_OPT__(,)
__VA_ARGS__)
+ SVFMT_EXTEND|SVFMT_REBUFFER, fmt
,
__VA_ARGS__)
#define string_fmt_append_f(g, flgs, fmt, ...) \
string_fmt_append_f_trc(g, US __FUNCTION__, __LINE__, \
#define string_fmt_append_f(g, flgs, fmt, ...) \
string_fmt_append_f_trc(g, US __FUNCTION__, __LINE__, \
-
flgs, fmt __VA_OPT__(,)
__VA_ARGS__)
+
flgs, fmt,
__VA_ARGS__)
static inline gstring *
string_fmt_append_f_trc(gstring * g, const uschar * func, unsigned line,
static inline gstring *
string_fmt_append_f_trc(gstring * g, const uschar * func, unsigned line,
@@
-939,7
+937,7
@@
static uschar buf[sizeof("0.000s")];
if (diff->tv_sec >= 5 || !LOGGING(millisec))
return readconf_printtime((int)diff->tv_sec);
if (diff->tv_sec >= 5 || !LOGGING(millisec))
return readconf_printtime((int)diff->tv_sec);
-s
printf(CS buf
, "%u.%03us", (uint)diff->tv_sec, (uint)diff->tv_usec/1000);
+s
nprintf(CS buf, sizeof(buf)
, "%u.%03us", (uint)diff->tv_sec, (uint)diff->tv_usec/1000);
return buf;
}
return buf;
}