From dcc8997d116f615195aa7c9ec019fb36c28c6228 Mon Sep 17 00:00:00 2001 From: Darren Tucker Date: Tue, 24 Feb 2015 12:30:59 +1100 Subject: Convert two macros into functions. Convert packet_send_debug and packet_disconnect from macros to functions. Some older GCCs (2.7.x, 2.95.x) see to have problems with variadic macros with only one argument so we convert these two into functions. ok djm@ --- opacket.h | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'opacket.h') diff --git a/opacket.h b/opacket.h index 16fcb9e28..a0a60e550 100644 --- a/opacket.h +++ b/opacket.h @@ -102,10 +102,11 @@ void packet_read_expect(int expected_type); ssh_packet_get_string_ptr(active_state, (length_ptr)) #define packet_get_cstring(length_ptr) \ ssh_packet_get_cstring(active_state, (length_ptr)) -#define packet_send_debug(fmt, args...) \ - ssh_packet_send_debug(active_state, (fmt), ##args) -#define packet_disconnect(fmt, args...) \ - ssh_packet_disconnect(active_state, (fmt), ##args) +void packet_send_debug(const char *, ...) + __attribute__((format(printf, 1, 2))); +void packet_disconnect(const char *, ...) + __attribute__((format(printf, 1, 2))) + __attribute__((noreturn)); #define packet_have_data_to_write() \ ssh_packet_have_data_to_write(active_state) #define packet_not_very_much_data_to_write() \ -- cgit v1.2.3