From 4c9eaec1262e1777679818a67542c172f8b426bf Mon Sep 17 00:00:00 2001 From: Perry Werneck Date: Mon, 20 May 2019 09:47:42 -0300 Subject: [PATCH] Fixing build on OpenSUSE Factory & Tumbleweed. --- src/lib3270/ansi.c | 135 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++----------------------------------------------------------------------------- src/lib3270/ctlr.c | 41 +++++++++++++++++++---------------------- src/lib3270/ft.c | 18 +++++++++--------- src/lib3270/ft_dft.c | 4 ++-- src/lib3270/host.c | 2 +- src/lib3270/iocalls.c | 2 +- src/lib3270/kybd.c | 6 +++--- src/lib3270/log.c | 2 +- src/lib3270/private.h | 2 +- src/lib3270/properties.c | 4 ++-- src/lib3270/screen.c | 6 +++--- src/lib3270/selection.c | 2 +- src/lib3270/session.c | 38 +++++++++++++++++++------------------- src/lib3270/ssl/linux/getcrl.c | 2 +- src/lib3270/telnet.c | 18 +++++++++--------- src/lib3270/toggles.c | 8 ++++---- src/lib3270/utf8.c | 2 +- 17 files changed, 135 insertions(+), 157 deletions(-) diff --git a/src/lib3270/ansi.c b/src/lib3270/ansi.c index 27da335..04b709e 100644 --- a/src/lib3270/ansi.c +++ b/src/lib3270/ansi.c @@ -493,13 +493,13 @@ static int dbcs_process(H3270 *hSession, int ch, unsigned char ebc[]); static void ansi_scroll(H3270 *hSession); static enum lib3270_ansi_state -ansi_data_mode(H3270 *hSession unused, int ig1 unused, int ig2 unused) +ansi_data_mode(H3270 GNUC_UNUSED(*hSession), int GNUC_UNUSED(ig1), int GNUC_UNUSED(ig2)) { return DATA; } static enum lib3270_ansi_state -dec_save_cursor(H3270 *hSession, int ig1 unused, int ig2 unused) +dec_save_cursor(H3270 *hSession, int GNUC_UNUSED(ig1), int GNUC_UNUSED(ig2)) { int i; @@ -513,7 +513,7 @@ dec_save_cursor(H3270 *hSession, int ig1 unused, int ig2 unused) return DATA; } -static enum lib3270_ansi_state dec_restore_cursor(H3270 *hSession, int ig1 unused, int ig2 unused) +static enum lib3270_ansi_state dec_restore_cursor(H3270 *hSession, int GNUC_UNUSED(ig1), int GNUC_UNUSED(ig2)) { int i; @@ -528,7 +528,7 @@ static enum lib3270_ansi_state dec_restore_cursor(H3270 *hSession, int ig1 unuse return DATA; } -static enum lib3270_ansi_state ansi_newline(H3270 *hSession, int ig1 unused, int ig2 unused) +static enum lib3270_ansi_state ansi_newline(H3270 *hSession, int GNUC_UNUSED(ig1), int GNUC_UNUSED(ig2)) { int nc; @@ -545,7 +545,7 @@ static enum lib3270_ansi_state ansi_newline(H3270 *hSession, int ig1 unused, int } static enum lib3270_ansi_state -ansi_cursor_up(H3270 *hSession, int nn, int ig2 unused) +ansi_cursor_up(H3270 *hSession, int nn, int GNUC_UNUSED(ig2)) { int rr; @@ -561,7 +561,7 @@ ansi_cursor_up(H3270 *hSession, int nn, int ig2 unused) } static enum lib3270_ansi_state -ansi_esc2(H3270 *hSession unused, int ig1 unused, int ig2 unused) +ansi_esc2(H3270 GNUC_UNUSED(*hSession), int GNUC_UNUSED(ig1), int GNUC_UNUSED(ig2)) { register int i; @@ -571,7 +571,7 @@ ansi_esc2(H3270 *hSession unused, int ig1 unused, int ig2 unused) return N1; } -static enum lib3270_ansi_state ansi_reset(H3270 *hSession, int ig1 unused, int ig2 unused) +static enum lib3270_ansi_state ansi_reset(H3270 *hSession, int GNUC_UNUSED(ig1), int GNUC_UNUSED(ig2)) { int i; // static Boolean first = True; @@ -627,7 +627,7 @@ static enum lib3270_ansi_state ansi_reset(H3270 *hSession, int ig1 unused, int i } static enum lib3270_ansi_state -ansi_insert_chars(H3270 *hSession, int nn, int ig2 unused) +ansi_insert_chars(H3270 *hSession, int nn, int GNUC_UNUSED(ig2)) { int cc = hSession->cursor_addr % hSession->cols; /* current col */ int mc = hSession->cols - cc; /* max chars that can be inserted */ @@ -649,7 +649,7 @@ ansi_insert_chars(H3270 *hSession, int nn, int ig2 unused) } static enum lib3270_ansi_state -ansi_cursor_down(H3270 *hSession, int nn, int ig2 unused) +ansi_cursor_down(H3270 *hSession, int nn, int GNUC_UNUSED(ig2)) { int rr; @@ -664,8 +664,7 @@ ansi_cursor_down(H3270 *hSession, int nn, int ig2 unused) return DATA; } -static enum lib3270_ansi_state -ansi_cursor_right(H3270 *hSession, int nn, int ig2 unused) +static enum lib3270_ansi_state ansi_cursor_right(H3270 *hSession, int nn, int GNUC_UNUSED(ig2)) { int cc; @@ -682,7 +681,7 @@ ansi_cursor_right(H3270 *hSession, int nn, int ig2 unused) } static enum lib3270_ansi_state -ansi_cursor_left(H3270 *hSession, int nn, int ig2 unused) +ansi_cursor_left(H3270 *hSession, int nn, int GNUC_UNUSED(ig2)) { int cc; @@ -715,7 +714,7 @@ ansi_cursor_motion(H3270 *hSession, int n1, int n2) } static enum lib3270_ansi_state -ansi_erase_in_display(H3270 *hSession, int nn, int ig2 unused) +ansi_erase_in_display(H3270 *hSession, int nn, int GNUC_UNUSED(ig2)) { switch (nn) { case 0: /* below */ @@ -733,7 +732,7 @@ ansi_erase_in_display(H3270 *hSession, int nn, int ig2 unused) } static enum lib3270_ansi_state -ansi_erase_in_line(H3270 *hSession, int nn, int ig2 unused) +ansi_erase_in_line(H3270 *hSession, int nn, int GNUC_UNUSED(ig2)) { int nc = hSession->cursor_addr % hSession->cols; @@ -752,7 +751,7 @@ ansi_erase_in_line(H3270 *hSession, int nn, int ig2 unused) } static enum lib3270_ansi_state -ansi_insert_lines(H3270 *hSession, int nn, int ig2 unused) +ansi_insert_lines(H3270 *hSession, int nn, int GNUC_UNUSED(ig2)) { int rr = hSession->cursor_addr / hSession->cols; /* current row */ int mr = hSession->scroll_bottom - rr; /* rows left at and below this one */ @@ -778,7 +777,7 @@ ansi_insert_lines(H3270 *hSession, int nn, int ig2 unused) } static enum lib3270_ansi_state -ansi_delete_lines(H3270 *hSession, int nn, int ig2 unused) +ansi_delete_lines(H3270 *hSession, int nn, int GNUC_UNUSED(ig2)) { int rr = hSession->cursor_addr / hSession->cols; /* current row */ int mr = hSession->scroll_bottom - rr; /* max rows that can be deleted */ @@ -804,7 +803,7 @@ ansi_delete_lines(H3270 *hSession, int nn, int ig2 unused) } static enum lib3270_ansi_state -ansi_delete_chars(H3270 *hSession, int nn, int ig2 unused) +ansi_delete_chars(H3270 *hSession, int nn, int GNUC_UNUSED(ig2)) { int cc = hSession->cursor_addr % hSession->cols; /* current col */ int mc = hSession->cols - cc; /* max chars that can be deleted */ @@ -826,7 +825,7 @@ ansi_delete_chars(H3270 *hSession, int nn, int ig2 unused) } static enum lib3270_ansi_state -ansi_sgr(H3270 *hSession, int ig1 unused, int ig2 unused) +ansi_sgr(H3270 *hSession, int GNUC_UNUSED(ig1), int GNUC_UNUSED(ig2)) { int i; @@ -925,19 +924,19 @@ ansi_sgr(H3270 *hSession, int ig1 unused, int ig2 unused) } static enum lib3270_ansi_state -ansi_bell(H3270 *hSession, int ig1 unused, int ig2 unused) +ansi_bell(H3270 *hSession, int GNUC_UNUSED(ig1), int GNUC_UNUSED(ig2)) { lib3270_ring_bell(hSession); return DATA; } -static enum lib3270_ansi_state ansi_newpage(H3270 *hSession, int ig1 unused, int ig2 unused) +static enum lib3270_ansi_state ansi_newpage(H3270 *hSession, int GNUC_UNUSED(ig1), int GNUC_UNUSED(ig2)) { ctlr_clear(hSession,False); return DATA; } -static enum lib3270_ansi_state ansi_backspace(H3270 *hSession, int ig1 unused, int ig2 unused) +static enum lib3270_ansi_state ansi_backspace(H3270 *hSession, int GNUC_UNUSED(ig1), int GNUC_UNUSED(ig2)) { if (hSession->held_wrap) { @@ -958,8 +957,7 @@ static enum lib3270_ansi_state ansi_backspace(H3270 *hSession, int ig1 unused, i return DATA; } -static enum lib3270_ansi_state -ansi_cr(H3270 *hSession, int ig1 unused, int ig2 unused) +static enum lib3270_ansi_state ansi_cr(H3270 *hSession, int GNUC_UNUSED(ig1), int GNUC_UNUSED(ig2)) { if (hSession->cursor_addr % hSession->cols) cursor_move(hSession,hSession->cursor_addr - (hSession->cursor_addr % hSession->cols)); @@ -971,14 +969,13 @@ ansi_cr(H3270 *hSession, int ig1 unused, int ig2 unused) return DATA; } -static enum lib3270_ansi_state -ansi_lf(H3270 *hSession, int ig1 unused, int ig2 unused) +static enum lib3270_ansi_state ansi_lf(H3270 *hSession, int GNUC_UNUSED(ig1), int GNUC_UNUSED(ig2)) { int nc = hSession->cursor_addr + hSession->cols; hSession->held_wrap = 0; - /* If we're below the scrolling region, don't scroll. */ + // If we're below the scrolling region, don't scroll. if((hSession->cursor_addr / hSession->cols) >= hSession->scroll_bottom) { if (nc < hSession->rows * hSession->cols) @@ -993,8 +990,7 @@ ansi_lf(H3270 *hSession, int ig1 unused, int ig2 unused) return DATA; } -static enum lib3270_ansi_state -ansi_htab(H3270 *hSession, int ig1 unused, int ig2 unused) +static enum lib3270_ansi_state ansi_htab(H3270 *hSession, int GNUC_UNUSED(ig1), int GNUC_UNUSED(ig2)) { int col = hSession->cursor_addr % hSession->cols; int i; @@ -1009,14 +1005,12 @@ ansi_htab(H3270 *hSession, int ig1 unused, int ig2 unused) return DATA; } -static enum lib3270_ansi_state -ansi_escape(H3270 *hSession unused, int ig1 unused, int ig2 unused) +static enum lib3270_ansi_state ansi_escape(H3270 GNUC_UNUSED(*hSession), int GNUC_UNUSED(ig1), int GNUC_UNUSED(ig2)) { return ESC; } -static enum lib3270_ansi_state -ansi_nop(H3270 *hSession unused, int ig1 unused, int ig2 unused) +static enum lib3270_ansi_state ansi_nop(H3270 GNUC_UNUSED(*hSession), int GNUC_UNUSED(ig1), int GNUC_UNUSED(ig2)) { return DATA; } @@ -1036,7 +1030,7 @@ ansi_nop(H3270 *hSession unused, int ig1 unused, int ig2 unused) } static enum lib3270_ansi_state -ansi_printing(H3270 *hSession, int ig1 unused, int ig2 unused) +ansi_printing(H3270 *hSession, int GNUC_UNUSED(ig1), int GNUC_UNUSED(ig2)) { int nc; unsigned char ebc_ch; @@ -1215,8 +1209,7 @@ ansi_printing(H3270 *hSession, int ig1 unused, int ig2 unused) return DATA; } -static enum lib3270_ansi_state -ansi_multibyte(H3270 *hSession, int ig1, int ig2) +static enum lib3270_ansi_state ansi_multibyte(H3270 *hSession, int ig1, int ig2) { char mbs[MB_MAX]; unsigned char ch; @@ -1267,8 +1260,7 @@ ansi_multibyte(H3270 *hSession, int ig1, int ig2) return (*fn)(hSession,n[0], n[1]); } -static enum lib3270_ansi_state -ansi_semicolon(H3270 *hSession, int ig1 unused, int ig2 unused) +static enum lib3270_ansi_state ansi_semicolon(H3270 *hSession, int GNUC_UNUSED(ig1), int GNUC_UNUSED(ig2)) { if (nx >= NN) return DATA; @@ -1276,15 +1268,13 @@ ansi_semicolon(H3270 *hSession, int ig1 unused, int ig2 unused) return hSession->state; } -static enum lib3270_ansi_state -ansi_digit(H3270 *hSession, int ig1 unused, int ig2 unused) +static enum lib3270_ansi_state ansi_digit(H3270 *hSession, int GNUC_UNUSED(ig1), int GNUC_UNUSED(ig2)) { n[nx] = (n[nx] * 10) + (hSession->ansi_ch - '0'); return hSession->state; } -static enum lib3270_ansi_state -ansi_reverse_index(H3270 *hSession, int ig1 unused, int ig2 unused) +static enum lib3270_ansi_state ansi_reverse_index(H3270 *hSession, int GNUC_UNUSED(ig1), int GNUC_UNUSED(ig2)) { int rr = hSession->cursor_addr / hSession->cols; /* current row */ int np = (hSession->scroll_top - 1) - rr; /* number of rows in the scrolling region, above this line */ @@ -1318,21 +1308,19 @@ ansi_reverse_index(H3270 *hSession, int ig1 unused, int ig2 unused) return DATA; } -static enum lib3270_ansi_state ansi_send_attributes(H3270 *hSession, int nn, int ig2 unused) +static enum lib3270_ansi_state ansi_send_attributes(H3270 *hSession, int nn, int GNUC_UNUSED(ig2)) { if (!nn) net_sends(hSession,"\033[?1;2c"); return DATA; } -static enum lib3270_ansi_state -dec_return_terminal_id(H3270 *hSession, int ig1 unused, int ig2 unused) +static enum lib3270_ansi_state dec_return_terminal_id(H3270 *hSession, int GNUC_UNUSED(ig1), int GNUC_UNUSED(ig2)) { return ansi_send_attributes(hSession, 0, 0); } -static enum lib3270_ansi_state -ansi_set_mode(H3270 *hSession, int nn, int ig2 unused) +static enum lib3270_ansi_state ansi_set_mode(H3270 *hSession, int nn, int GNUC_UNUSED(ig2)) { switch (nn) { @@ -1346,8 +1334,7 @@ ansi_set_mode(H3270 *hSession, int nn, int ig2 unused) return DATA; } -static enum lib3270_ansi_state -ansi_reset_mode(H3270 *hSession, int nn, int ig2 unused) +static enum lib3270_ansi_state ansi_reset_mode(H3270 *hSession, int nn, int GNUC_UNUSED(ig2)) { switch (nn) { @@ -1361,8 +1348,7 @@ ansi_reset_mode(H3270 *hSession, int nn, int ig2 unused) return DATA; } -static enum lib3270_ansi_state -ansi_status_report(H3270 *hSession, int nn, int ig2 unused) +static enum lib3270_ansi_state ansi_status_report(H3270 *hSession, int nn, int GNUC_UNUSED(ig2)) { static char cpr[22]; @@ -1380,70 +1366,66 @@ ansi_status_report(H3270 *hSession, int nn, int ig2 unused) return DATA; } -static enum lib3270_ansi_state -ansi_cs_designate(H3270 *hSession, int ig1 unused, int ig2 unused) +static enum lib3270_ansi_state ansi_cs_designate(H3270 *hSession, int GNUC_UNUSED(ig1), int GNUC_UNUSED(ig2)) { hSession->cs_to_change = strchr(gnnames, hSession->ansi_ch) - gnnames; return CSDES; } -static enum lib3270_ansi_state -ansi_cs_designate2(H3270 *hSession, int ig1 unused, int ig2 unused) +static enum lib3270_ansi_state ansi_cs_designate2(H3270 *hSession, int GNUC_UNUSED(ig1), int GNUC_UNUSED(ig2)) { hSession->csd[hSession->cs_to_change] = strchr(csnames, hSession->ansi_ch) - csnames; return DATA; } -static enum lib3270_ansi_state -ansi_select_g0(H3270 *hSession, int ig1 unused, int ig2 unused) +static enum lib3270_ansi_state ansi_select_g0(H3270 *hSession, int GNUC_UNUSED(ig1), int GNUC_UNUSED(ig2)) { hSession->cset = CS_G0; return DATA; } -static enum lib3270_ansi_state -ansi_select_g1(H3270 *hSession, int ig1 unused, int ig2 unused) +static enum lib3270_ansi_state ansi_select_g1(H3270 *hSession, int GNUC_UNUSED(ig1), int GNUC_UNUSED(ig2)) { hSession->cset = CS_G1; return DATA; } static enum lib3270_ansi_state -ansi_select_g2(H3270 *hSession, int ig1 unused, int ig2 unused) +ansi_select_g2(H3270 *hSession, int GNUC_UNUSED(ig1), int GNUC_UNUSED(ig2)) { hSession->cset = CS_G2; return DATA; } static enum lib3270_ansi_state -ansi_select_g3(H3270 *hSession, int ig1 unused, int ig2 unused) +ansi_select_g3(H3270 *hSession, int GNUC_UNUSED(ig1), int GNUC_UNUSED(ig2)) { hSession->cset = CS_G3; return DATA; } static enum lib3270_ansi_state -ansi_one_g2(H3270 *hSession, int ig1 unused, int ig2 unused) +ansi_one_g2(H3270 *hSession, int GNUC_UNUSED(ig1), int GNUC_UNUSED(ig2)) { hSession->once_cset = CS_G2; return DATA; } static enum lib3270_ansi_state -ansi_one_g3(H3270 *hSession, int ig1 unused, int ig2 unused) +ansi_one_g3(H3270 *hSession, int GNUC_UNUSED(ig1), int GNUC_UNUSED(ig2)) { hSession->once_cset = CS_G3; return DATA; } static enum lib3270_ansi_state -ansi_esc3(H3270 *hSession unused, int ig1 unused, int ig2 unused) +ansi_esc3(H3270 GNUC_UNUSED(*hSession), int GNUC_UNUSED(ig1), int GNUC_UNUSED(ig2)) { return DECP; } static enum lib3270_ansi_state -dec_set(H3270 *hSession, int ig1 unused, int ig2 unused) +dec_set(H3270 *hSession, int GNUC_UNUSED(ig1), int GNUC_UNUSED(ig2)) { int i; @@ -1480,7 +1462,7 @@ dec_set(H3270 *hSession, int ig1 unused, int ig2 unused) } static enum lib3270_ansi_state -dec_reset(H3270 *hSession, int ig1 unused, int ig2 unused) +dec_reset(H3270 *hSession, int GNUC_UNUSED(ig1), int GNUC_UNUSED(ig2)) { int i; @@ -1513,7 +1495,7 @@ dec_reset(H3270 *hSession, int ig1 unused, int ig2 unused) return DATA; } -static enum lib3270_ansi_state dec_save(H3270 *hSession, int ig1 unused, int ig2 unused) +static enum lib3270_ansi_state dec_save(H3270 *hSession, int GNUC_UNUSED(ig1), int GNUC_UNUSED(ig2)) { int i; @@ -1543,7 +1525,7 @@ static enum lib3270_ansi_state dec_save(H3270 *hSession, int ig1 unused, int ig2 } static enum lib3270_ansi_state -dec_restore(H3270 *hSession, int ig1 unused, int ig2 unused) +dec_restore(H3270 *hSession, int GNUC_UNUSED(ig1), int GNUC_UNUSED(ig2)) { int i; @@ -1599,7 +1581,7 @@ dec_scrolling_region(H3270 *hSession, int top, int bottom) } static enum lib3270_ansi_state -xterm_text_mode(H3270 *hSession unused, int ig1 unused, int ig2 unused) +xterm_text_mode(H3270 GNUC_UNUSED(*hSession), int GNUC_UNUSED(ig1), int GNUC_UNUSED(ig2)) { nx = 0; n[0] = 0; @@ -1607,14 +1589,14 @@ xterm_text_mode(H3270 *hSession unused, int ig1 unused, int ig2 unused) } static enum lib3270_ansi_state -xterm_text_semicolon(H3270 *hSession unused, int ig1 unused, int ig2 unused) +xterm_text_semicolon(H3270 GNUC_UNUSED(*hSession), int GNUC_UNUSED(ig1), int GNUC_UNUSED(ig2)) { tx = 0; return LIB3270_ANSI_STATE_TEXT2; } static enum lib3270_ansi_state -xterm_text(H3270 *hSession, int ig1 unused, int ig2 unused) +xterm_text(H3270 *hSession, int GNUC_UNUSED(ig1), int GNUC_UNUSED(ig2)) { if (tx < NT) text[tx++] = hSession->ansi_ch; @@ -1622,7 +1604,7 @@ xterm_text(H3270 *hSession, int ig1 unused, int ig2 unused) } static enum lib3270_ansi_state -xterm_text_do(H3270 *hSession unused, int ig1 unused, int ig2 unused) +xterm_text_do(H3270 GNUC_UNUSED(*hSession), int GNUC_UNUSED(ig1), int GNUC_UNUSED(ig2)) { /* #if defined(X3270_DISPLAY) || defined(WC3270) @@ -1666,7 +1648,7 @@ xterm_text_do(H3270 *hSession unused, int ig1 unused, int ig2 unused) } static enum lib3270_ansi_state -ansi_htab_set(H3270 *hSession, int ig1 unused, int ig2 unused) +ansi_htab_set(H3270 *hSession, int GNUC_UNUSED(ig1), int GNUC_UNUSED(ig2)) { register int col = hSession->cursor_addr % hSession->cols; @@ -1675,7 +1657,7 @@ ansi_htab_set(H3270 *hSession, int ig1 unused, int ig2 unused) } static enum lib3270_ansi_state -ansi_htab_clear(H3270 *hSession, int nn, int ig2 unused) +ansi_htab_clear(H3270 *hSession, int nn, int GNUC_UNUSED(ig2)) { register int col, i; @@ -1721,7 +1703,7 @@ static void ansi_scroll(H3270 *hSession) } /* Callback for when we enter ANSI mode. */ -void ansi_in3270(H3270 *session, int in3270, void *dunno unused) +void ansi_in3270(H3270 *session, int in3270, void GNUC_UNUSED(*dunno)) { if (!in3270) (void) ansi_reset(session, 0, 0); @@ -1847,8 +1829,7 @@ ansi_send_pf(H3270 *hSession, int nn) net_sends(hSession,fn_buf); } -void -ansi_send_pa(H3270 *hSession, int nn) +void ansi_send_pa(H3270 *hSession, int nn) { static char fn_buf[4]; static char code[4] = { 'P', 'Q', 'R', 'S' }; @@ -1859,7 +1840,7 @@ ansi_send_pa(H3270 *hSession, int nn) net_sends(hSession,fn_buf); } -void toggle_lineWrap(H3270 *hSession, struct lib3270_toggle *t unused, LIB3270_TOGGLE_TYPE type unused) +void toggle_lineWrap(H3270 *hSession, struct lib3270_toggle GNUC_UNUSED(*t), LIB3270_TOGGLE_TYPE GNUC_UNUSED(type)) { if (lib3270_get_toggle(hSession,LIB3270_TOGGLE_LINE_WRAP)) hSession->wraparound_mode = 1; diff --git a/src/lib3270/ctlr.c b/src/lib3270/ctlr.c index 92adc64..243a8e5 100644 --- a/src/lib3270/ctlr.c +++ b/src/lib3270/ctlr.c @@ -117,7 +117,7 @@ static const unsigned char code_table[64] = /* * Initialize the emulated 3270 hardware. */ -void ctlr_init(H3270 *session, unsigned cmask unused) +void ctlr_init(H3270 *session, unsigned GNUC_UNUSED(cmask)) { /* Register callback routines. */ lib3270_register_schange(session,LIB3270_STATE_HALF_CONNECT, ctlr_half_connect, 0); @@ -390,18 +390,18 @@ static void update_formatted(H3270 *hSession) } -/* - * Called when a host is half connected. - */ -static void ctlr_half_connect(H3270 *hSession, int ignored unused, void *dunno unused) +/// +/// @brief Called when a host is half connected. +/// +static void ctlr_half_connect(H3270 *hSession, int GNUC_UNUSED(ignored), void GNUC_UNUSED(*dunno)) { ticking_start(hSession,True); } -/* - * Called when a host connects, disconnects, or changes ANSI/3270 modes. - */ -static void ctlr_connect(H3270 *hSession, int ignored unused, void *dunno unused) +/// +/// @brief Called when a host connects, disconnects, or changes ANSI/3270 modes. +/// +static void ctlr_connect(H3270 *hSession, int GNUC_UNUSED(ignored), void GNUC_UNUSED(*dunno)) { ticking_stop(hSession); status_untiming(hSession); @@ -2645,7 +2645,7 @@ void ctlr_wrapping_memmove(H3270 *hSession, int baddr_to, int baddr_from, int co * * @param hSession Session handle */ -void ctlr_bcopy(H3270 *hSession, int baddr_from, int baddr_to, int count, int move_ea unused) +void ctlr_bcopy(H3270 *hSession, int baddr_from, int baddr_to, int count, int GNUC_UNUSED(move_ea)) { /* Move the characters. */ if (memcmp((char *) &hSession->ea_buf[baddr_from],(char *) &hSession->ea_buf[baddr_to],count * sizeof(struct lib3270_ea))) @@ -2663,7 +2663,7 @@ void ctlr_bcopy(H3270 *hSession, int baddr_from, int baddr_to, int count, int mo * @param hSession Session handle * */ -void ctlr_aclear(H3270 *hSession, int baddr, int count, int clear_ea unused) +void ctlr_aclear(H3270 *hSession, int baddr, int count, int GNUC_UNUSED(clear_ea)) { if (memcmp((char *) &hSession->ea_buf[baddr], (char *) hSession->zero_buf, count * sizeof(struct lib3270_ea))) { @@ -2674,8 +2674,8 @@ void ctlr_aclear(H3270 *hSession, int baddr, int count, int clear_ea unused) /* XXX: What about clear_ea? */ } -/* - * Scroll the screen 1 row. +/** + * @brief Scroll the screen 1 row. * * This could be accomplished with ctlr_bcopy() and ctlr_aclear(), but this * operation is common enough to warrant a separate path. @@ -2700,8 +2700,8 @@ void ctlr_scroll(H3270 *hSession) } #endif /*]*/ -/* - * Swap the regular and alternate screen buffers +/** + * @brief Swap the regular and alternate screen buffers */ void ctlr_altbuffer(H3270 *session, int alt) { @@ -2728,9 +2728,8 @@ void ctlr_altbuffer(H3270 *session, int alt) } } - -/* - * Set or clear the MDT on an attribute +/** + * @brief Set or clear the MDT on an attribute */ void mdt_set(H3270 *hSession, int baddr) { @@ -2778,7 +2777,6 @@ ctlr_dbcs_state(int baddr) } #endif /*]*/ - /* * Transaction timing. The time between sending an interrupt (PF, PA, Enter, * Clear) and the host unlocking the keyboard is indicated on the status line @@ -2791,9 +2789,8 @@ ctlr_dbcs_state(int baddr) //static void * tick_id; //static struct timeval t_want; -/* Return the difference in milliseconds between two timevals. */ -static long -delta_msec(struct timeval *t1, struct timeval *t0) +/// @brief Return the difference in milliseconds between two timevals. +static long delta_msec(struct timeval *t1, struct timeval *t0) { return (t1->tv_sec - t0->tv_sec) * 1000 + (t1->tv_usec - t0->tv_usec + 500) / 1000; diff --git a/src/lib3270/ft.c b/src/lib3270/ft.c index 3f3b897..bebc4c9 100644 --- a/src/lib3270/ft.c +++ b/src/lib3270/ft.c @@ -164,37 +164,37 @@ static void set_ft_state(H3270FT *session, LIB3270_FT_STATE state); return 0; } - static void def_complete(H3270 *hSession, unsigned long length unused, double kbytes_sec unused, const char *msg, void *userdata unused) + static void def_complete(H3270 *hSession, unsigned long GNUC_UNUSED(length), double GNUC_UNUSED(kbytes_sec), const char *msg, void GNUC_UNUSED(*userdata)) { hSession->ft->cbk.message(hSession,msg,hSession->ft->user_data); } - static void def_failed(H3270 *hSession, unsigned long length,double kbytes_sec,const char *msg, void *userdata) + static void def_failed(H3270 *hSession, unsigned long length, double kbytes_sec, const char *msg, void *userdata) { hSession->ft->cbk.complete(hSession,length,kbytes_sec,msg,userdata); } - static void def_message(H3270 *hSession, const char *msg, void *userdata unused) + static void def_message(H3270 *hSession, const char *msg, void GNUC_UNUSED(*userdata)) { lib3270_write_log(hSession,"ft","%s",msg); } - static void def_update(H3270 *hSession unused, unsigned long current unused, unsigned long length unused, double kbytes_sec unused, void *userdata unused) + static void def_update(H3270 GNUC_UNUSED(*hSession), unsigned long GNUC_UNUSED(current), unsigned long GNUC_UNUSED(length), double GNUC_UNUSED(kbytes_sec), void GNUC_UNUSED(*userdata)) { } - static void def_running(H3270 *hSession unused, int is_cut unused, void *userdata unused) + static void def_running(H3270 GNUC_UNUSED(*hSession), int GNUC_UNUSED(is_cut), void GNUC_UNUSED(*userdata)) { } - static void def_aborting(H3270 *hSession unused, const char *reason unused, void *userdata unused) + static void def_aborting(H3270 GNUC_UNUSED(*hSession), const char GNUC_UNUSED(*reason), void GNUC_UNUSED(*userdata)) { } - static void def_state_changed(H3270 *hSession unused, LIB3270_FT_STATE state unused, const char *text unused, void *userdata unused) + static void def_state_changed(H3270 GNUC_UNUSED(*hSession), LIB3270_FT_STATE GNUC_UNUSED(state), const char GNUC_UNUSED(*text), void GNUC_UNUSED(*userdata)) { } @@ -679,14 +679,14 @@ void ft_aborting(H3270FT *h, const char *reason) } /* Process a disconnect abort. */ -static void ft_connected(H3270 *hSession, int ignored unused, void *dunno unused) +static void ft_connected(H3270 *hSession, int GNUC_UNUSED(ignored), void GNUC_UNUSED(*dunno)) { if (!CONNECTED && lib3270_get_ft_state(hSession) != LIB3270_FT_STATE_NONE) ft_failed(get_ft_handle(hSession),_("Host disconnected, transfer cancelled")); } /* Process an abort from no longer being in 3270 mode. */ -static void ft_in3270(H3270 *hSession, int ignored unused, void *dunno unused) +static void ft_in3270(H3270 *hSession, int GNUC_UNUSED(ignored), void GNUC_UNUSED(*dunno)) { if (!IN_3270 && lib3270_get_ft_state(hSession) != LIB3270_FT_STATE_NONE) ft_failed(get_ft_handle(hSession),_("Not in 3270 mode, transfer cancelled")); diff --git a/src/lib3270/ft_dft.c b/src/lib3270/ft_dft.c index 8f23919..6918dd0 100644 --- a/src/lib3270/ft_dft.c +++ b/src/lib3270/ft_dft.c @@ -91,10 +91,10 @@ static void dft_set_cur_req(H3270 *hSession); static int filter_len(char *s, register int len); /** - * Process a Transfer Data structured field from the host. + * @brief Process a Transfer Data structured field from the host. * */ -void ft_dft_data(H3270 *hSession, unsigned char *data, int length unused) +void ft_dft_data(H3270 *hSession, unsigned char *data, int GNUC_UNUSED(length)) { struct data_buffer *data_bufr = (struct data_buffer *)data; unsigned short data_length, data_type; diff --git a/src/lib3270/host.c b/src/lib3270/host.c index c80440c..c55f206 100644 --- a/src/lib3270/host.c +++ b/src/lib3270/host.c @@ -327,7 +327,7 @@ LIB3270_EXPORT const char * lib3270_get_url(H3270 *hSession) } -LIB3270_EXPORT const char * lib3270_get_default_host(H3270 *hSession unused) +LIB3270_EXPORT const char * lib3270_get_default_host(H3270 GNUC_UNUSED(*hSession)) { #ifdef LIB3270_DEFAULT_HOST return LIB3270_DEFAULT_HOST; diff --git a/src/lib3270/iocalls.c b/src/lib3270/iocalls.c index 0a8a0b8..520bd4d 100644 --- a/src/lib3270/iocalls.c +++ b/src/lib3270/iocalls.c @@ -349,7 +349,7 @@ static int internal_wait(H3270 *hSession, int seconds) return 0; } -static void internal_ring_bell(H3270 *session unused) +static void internal_ring_bell(H3270 GNUC_UNUSED(*session)) { return; } diff --git a/src/lib3270/kybd.c b/src/lib3270/kybd.c index 3bb5ea0..346081e 100644 --- a/src/lib3270/kybd.c +++ b/src/lib3270/kybd.c @@ -395,7 +395,7 @@ void kybd_inhibit(H3270 *session, Boolean inhibit) /** * @brief Called when a host connects or disconnects. */ -void kybd_connect(H3270 *session, int connected, void *dunno unused) +void kybd_connect(H3270 *session, int connected, void GNUC_UNUSED(*dunno)) { if (session->kybdlock & KL_DEFERRED_UNLOCK) RemoveTimer(session, session->unlock_id); @@ -417,7 +417,7 @@ void kybd_connect(H3270 *session, int connected, void *dunno unused) /** * @brief Called when we switch between 3270 and ANSI modes. */ -void kybd_in3270(H3270 *hSession, int in3270 unused, void *dunno unused) +void kybd_in3270(H3270 *hSession, int GNUC_UNUSED(in3270), void GNUC_UNUSED(*dunno)) { if (hSession->kybdlock & KL_DEFERRED_UNLOCK) RemoveTimer(hSession, hSession->unlock_id); @@ -690,7 +690,7 @@ static Boolean ins_prep(H3270 *hSession, int faddr, int baddr, int count) #define GE_WFLAG 0x100 #define PASTE_WFLAG 0x200 -static void key_Character_wrapper(H3270 *hSession, const char *param1, const char *param2 unused) +static void key_Character_wrapper(H3270 *hSession, const char *param1, const char GNUC_UNUSED(*param2)) { int code; Boolean with_ge = False; diff --git a/src/lib3270/log.c b/src/lib3270/log.c index a5ad816..1705b24 100644 --- a/src/lib3270/log.c +++ b/src/lib3270/log.c @@ -81,7 +81,7 @@ loghandler(session,module,0,fmt,arg); } - static void defaultlog(H3270 *session unused, const char *module, int rc unused, const char *fmt, va_list arg_ptr) + static void defaultlog(H3270 GNUC_UNUSED(*session), const char *module, int GNUC_UNUSED(rc), const char *fmt, va_list arg_ptr) { fprintf(stderr,"%s:\t",module); vfprintf(stderr,fmt,arg_ptr); diff --git a/src/lib3270/private.h b/src/lib3270/private.h index ebed83a..9265b24 100644 --- a/src/lib3270/private.h +++ b/src/lib3270/private.h @@ -93,7 +93,7 @@ // #if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ > 4) - #define unused __attribute__((__unused__)) +// #define unused __attribute__((__unused__)) #define GNUC_UNUSED \ __attribute__((__unused__)) diff --git a/src/lib3270/properties.c b/src/lib3270/properties.c index fa8f5fd..68edf3c 100644 --- a/src/lib3270/properties.c +++ b/src/lib3270/properties.c @@ -285,12 +285,12 @@ return properties; } - static const char * get_version(H3270 *hSession unused) + static const char * get_version(H3270 GNUC_UNUSED(*hSession)) { return lib3270_get_version(); } - static const char * get_revision(H3270 *hSession unused) + static const char * get_revision(H3270 GNUC_UNUSED(*hSession)) { return lib3270_get_revision(); } diff --git a/src/lib3270/screen.c b/src/lib3270/screen.c index af21e99..1bd9869 100644 --- a/src/lib3270/screen.c +++ b/src/lib3270/screen.c @@ -722,7 +722,7 @@ void status_lu(H3270 *session, const char *lu) } -static void status_connect(H3270 *hSession, int connected, void *dunno unused) +static void status_connect(H3270 *hSession, int connected, void GNUC_UNUSED(*dunno)) { LIB3270_MESSAGE id = LIB3270_MESSAGE_USER; @@ -748,7 +748,7 @@ static void status_connect(H3270 *hSession, int connected, void *dunno unused) } -static void status_3270_mode(H3270 *hSession, int ignored unused, void *dunno unused) +static void status_3270_mode(H3270 *hSession, int GNUC_UNUSED(ignored), void GNUC_UNUSED(*dunno)) { Boolean oia_boxsolid = (IN_3270 && !IN_SSCP); @@ -767,7 +767,7 @@ static void status_printer(H3270 *session, int on, void *dunno) } */ -void status_timing(H3270 *session unused, struct timeval *t0 unused, struct timeval *t1 unused) +void status_timing(H3270 GNUC_UNUSED(*session), struct timeval GNUC_UNUSED(*t0), struct timeval GNUC_UNUSED(*t1)) { } diff --git a/src/lib3270/selection.c b/src/lib3270/selection.c index 42c417e..e3d3a78 100644 --- a/src/lib3270/selection.c +++ b/src/lib3270/selection.c @@ -165,7 +165,7 @@ static void update_selected_region(H3270 *session) } -void toggle_rectselect(H3270 *session, struct lib3270_toggle *t unused, LIB3270_TOGGLE_TYPE tt unused) +void toggle_rectselect(H3270 *session, struct lib3270_toggle GNUC_UNUSED(*t), LIB3270_TOGGLE_TYPE GNUC_UNUSED(tt)) { if(!session->selected) return; diff --git a/src/lib3270/session.c b/src/lib3270/session.c index 6f69c50..2cd270b 100644 --- a/src/lib3270/session.c +++ b/src/lib3270/session.c @@ -155,49 +155,49 @@ void lib3270_session_free(H3270 *h) } -static void update_char(H3270 *session unused, int addr unused, unsigned char chr unused, unsigned short attr unused, unsigned char cursor unused) +static void update_char(H3270 GNUC_UNUSED(*session), int GNUC_UNUSED(addr), unsigned char GNUC_UNUSED(chr), unsigned short GNUC_UNUSED(attr), unsigned char GNUC_UNUSED(cursor)) { } -static void nop_char(H3270 *session unused, unsigned char chr unused) +static void nop_char(H3270 GNUC_UNUSED(*session), unsigned char GNUC_UNUSED(chr)) { } -static void nop(H3270 *session unused) +static void nop(H3270 GNUC_UNUSED(*session)) { } -static void update_model(H3270 *session unused, const char *name unused, int model unused, int rows unused, int cols unused) +static void update_model(H3270 GNUC_UNUSED(*session), const char GNUC_UNUSED(*name), int GNUC_UNUSED(model), int GNUC_UNUSED(rows), int GNUC_UNUSED(cols)) { } -static void changed(H3270 *session unused, int bstart unused, int bend unused) +static void changed(H3270 GNUC_UNUSED(*session), int GNUC_UNUSED(bstart), int GNUC_UNUSED(bend)) { } -static void update_cursor(H3270 *session unused, unsigned short row unused, unsigned short col unused, unsigned char c unused, unsigned short attr unused) +static void update_cursor(H3270 GNUC_UNUSED(*session), unsigned short GNUC_UNUSED(row), unsigned short GNUC_UNUSED(col), unsigned char GNUC_UNUSED(c), unsigned short GNUC_UNUSED(attr)) { } -static void update_oia(H3270 *session unused, LIB3270_FLAG id unused, unsigned char on unused) +static void update_oia(H3270 GNUC_UNUSED(*session), LIB3270_FLAG GNUC_UNUSED(id), unsigned char GNUC_UNUSED(on)) { } -static void update_selection(H3270 *session unused, int start unused, int end unused) +static void update_selection(H3270 GNUC_UNUSED(*session), int GNUC_UNUSED(start), int GNUC_UNUSED(end)) { } -static void set_cursor(H3270 *session unused, LIB3270_POINTER id unused) +static void set_cursor(H3270 GNUC_UNUSED(*session), LIB3270_POINTER GNUC_UNUSED(id)) { } -static int print(H3270 *session, LIB3270_PRINT_MODE mode unused) +static int print(H3270 *session, LIB3270_PRINT_MODE GNUC_UNUSED(mode)) { lib3270_write_log(session, "print", "%s", "Printing is unavailable"); return errno = ENOTSUP; } -static void message(H3270 *session, LIB3270_NOTIFY id unused, const char *title, const char *msg, const char *text) +static void message(H3270 *session, LIB3270_NOTIFY GNUC_UNUSED(id), const char *title, const char *msg, const char *text) { #ifdef ANDROID __android_log_print(ANDROID_LOG_VERBOSE, PACKAGE_NAME, "%s\n",title); @@ -210,7 +210,7 @@ static void message(H3270 *session, LIB3270_NOTIFY id unused, const char *title #endif // ANDROID } -static void def_popup(H3270 *session, LIB3270_NOTIFY type unused, const char *title, const char *msg, const char *fmt, va_list arg) +static void def_popup(H3270 *session, LIB3270_NOTIFY GNUC_UNUSED(type), const char *title, const char *msg, const char *fmt, va_list arg) { #ifdef ANDROID char *mask = xs_buffer("%s\n",fmt); @@ -223,17 +223,17 @@ static void def_popup(H3270 *session, LIB3270_NOTIFY type unused, const char *ti #endif // ANDROID } -static void def_trace(H3270 *session unused, void *userdata unused, const char *fmt, va_list args) +static void def_trace(H3270 GNUC_UNUSED(*session), void GNUC_UNUSED(*userdata), const char *fmt, va_list args) { vfprintf(stdout,fmt,args); fflush(stdout); } -static void update_ssl(H3270 *session unused, LIB3270_SSL_STATE state unused) +static void update_ssl(H3270 GNUC_UNUSED(*session), LIB3270_SSL_STATE GNUC_UNUSED(state)) { } -static void set_timer(H3270 *session unused, unsigned char on unused) +static void set_timer(H3270 GNUC_UNUSED(*session), unsigned char GNUC_UNUSED(on)) { } @@ -243,24 +243,24 @@ static void screen_disp(H3270 *session) screen_update(session,0,session->rows*session->cols); } -static void nop_int(H3270 *session unused, int width unused) +static void nop_int(H3270 GNUC_UNUSED(*session), int GNUC_UNUSED(width)) { return; } #ifdef HAVE_LIBSSL -static void set_peer_certificate(const X509 *cert unused) +static void set_peer_certificate(const X509 GNUC_UNUSED(*cert)) { } #else -static void set_peer_certificate)(const void *cert unused) +static void set_peer_certificate)(const void GNUC_UNUSED(*cert)) { } #endif // HAVE_LIBSSL -static void default_update_luname(H3270 *session unused, const char *name unused) +static void default_update_luname(H3270 GNUC_UNUSED(*session), const char GNUC_UNUSED(*name)) { } diff --git a/src/lib3270/ssl/linux/getcrl.c b/src/lib3270/ssl/linux/getcrl.c index 7506d7d..68b0ce9 100644 --- a/src/lib3270/ssl/linux/getcrl.c +++ b/src/lib3270/ssl/linux/getcrl.c @@ -164,7 +164,7 @@ static size_t internal_curl_write_callback(void *contents, size_t size, size_t n return realsize; } -static int internal_curl_trace_callback(CURL *handle unused, curl_infotype type, char *data, size_t size, void *userp) +static int internal_curl_trace_callback(CURL GNUC_UNUSED(*handle), curl_infotype type, char *data, size_t size, void *userp) { const char * text = NULL; diff --git a/src/lib3270/telnet.c b/src/lib3270/telnet.c index 2301cde..5f8ba26 100644 --- a/src/lib3270/telnet.c +++ b/src/lib3270/telnet.c @@ -617,7 +617,7 @@ LIB3270_EXPORT void lib3270_data_recv(H3270 *hSession, size_t nr, const unsigned * @param hSession Session handle * */ -void net_input(H3270 *hSession, int fd unused, LIB3270_IO_FLAG flag unused, void *dunno unused) +void net_input(H3270 *hSession, int GNUC_UNUSED(fd), LIB3270_IO_FLAG GNUC_UNUSED(flag), void GNUC_UNUSED(*dunno)) { // register unsigned char * cp; int nr; @@ -1579,11 +1579,10 @@ static int process_eor(H3270 *hSession) } -/* - * net_exception - * Called when there is an exceptional condition on the socket. +/** + * @brief Called when there is an exceptional condition on the socket. */ -void net_exception(H3270 *session, int fd unused, LIB3270_IO_FLAG flag unused, void *dunno unused) +void net_exception(H3270 *session, int GNUC_UNUSED(fd), LIB3270_IO_FLAG GNUC_UNUSED(flag), void GNUC_UNUSED(*dunno)) { CHECK_SESSION_HANDLE(session); @@ -1600,13 +1599,14 @@ void net_exception(H3270 *session, int fd unused, LIB3270_IO_FLAG flag unused, v } } -/* +/** + * @brief send a 3270 record + * * Flavors of Network Output: * - * 3270 mode - * net_output send a 3270 record + * 3270 mode * - * ANSI mode; call each other in turn + * ANSI mode; call each other in turn * net_sendc net_cookout for 1 byte * net_sends net_cookout for a null-terminated string * net_cookout send user data with cooked-mode processing, ANSI mode diff --git a/src/lib3270/toggles.c b/src/lib3270/toggles.c index 111d252..67e9401 100644 --- a/src/lib3270/toggles.c +++ b/src/lib3270/toggles.c @@ -303,13 +303,13 @@ LIB3270_EXPORT int lib3270_toggle(H3270 *session, LIB3270_TOGGLE ix) return (int) t->value; } -static void toggle_altscreen(H3270 *session, struct lib3270_toggle *t, LIB3270_TOGGLE_TYPE tt unused) +static void toggle_altscreen(H3270 *session, struct lib3270_toggle *t, LIB3270_TOGGLE_TYPE GNUC_UNUSED(tt)) { if(!session->screen_alt) set_viewsize(session,t->value ? 24 : session->maxROWS,80); } -static void toggle_redraw(H3270 *session, struct lib3270_toggle *t unused, LIB3270_TOGGLE_TYPE tt unused) +static void toggle_redraw(H3270 *session, struct lib3270_toggle GNUC_UNUSED(*t), LIB3270_TOGGLE_TYPE GNUC_UNUSED(tt)) { session->cbk.display(session); } @@ -317,11 +317,11 @@ static void toggle_redraw(H3270 *session, struct lib3270_toggle *t unused, LIB32 /* * No-op toggle. */ -static void toggle_nop(H3270 *session unused, struct lib3270_toggle *t unused, LIB3270_TOGGLE_TYPE tt unused ) +static void toggle_nop(H3270 GNUC_UNUSED(*session), struct lib3270_toggle GNUC_UNUSED(*t), LIB3270_TOGGLE_TYPE GNUC_UNUSED(tt)) { } -static void toggle_keepalive(H3270 *session, struct lib3270_toggle *t unused, LIB3270_TOGGLE_TYPE tt unused ) +static void toggle_keepalive(H3270 *session, struct lib3270_toggle GNUC_UNUSED(*t), LIB3270_TOGGLE_TYPE GNUC_UNUSED(tt)) { if(session->sock > 0) { diff --git a/src/lib3270/utf8.c b/src/lib3270/utf8.c index 99b329e..b24c993 100644 --- a/src/lib3270/utf8.c +++ b/src/lib3270/utf8.c @@ -351,7 +351,7 @@ static char *utf8_tab[U_MAX][96] = { * character set. * Returns 0 if the lookup fails. */ -unsigned char utf8_lookup(char *mbs unused, enum ulfail *fail, int *consumed unused) +unsigned char utf8_lookup(char GNUC_UNUSED(*mbs), enum ulfail *fail, int GNUC_UNUSED(*consumed)) { if (fail != NULL) *fail = ULFAIL_NOUTF8; -- libgit2 0.21.2