#define handle (G.handle )
#define saved_disc (G.saved_disc )
#define saved_state (G.saved_state )
-#define INIT_G() do {} while (0)
+#define INIT_G() do { } while (0)
/*
xioctl(handle, TIOCGETD, &saved_disc);
}
-static int set_termios_state_and_warn(struct termios *state)
+static int set_termios_state_or_warn(struct termios *state)
{
int ret;
* Go on after errors: we want to restore as many controlled ttys
* as possible.
*/
-static void restore_state_and_exit(int exitcode) ATTRIBUTE_NORETURN;
+static void restore_state_and_exit(int exitcode) NORETURN;
static void restore_state_and_exit(int exitcode)
{
struct termios state;
memcpy(&state, &saved_state, sizeof(state));
cfsetispeed(&state, B0);
cfsetospeed(&state, B0);
- if (set_termios_state_and_warn(&state))
+ if (set_termios_state_or_warn(&state))
exitcode = 1;
sleep(1);
/* Restore line status */
- if (set_termios_state_and_warn(&saved_state))
+ if (set_termios_state_or_warn(&saved_state))
exit(EXIT_FAILURE);
if (ENABLE_FEATURE_CLEAN_UP)
close(handle);
int disc;
/* Set line status */
- if (set_termios_state_and_warn(state))
+ if (set_termios_state_or_warn(state))
goto bad;
/* Set line discliple (N_SLIP always) */
disc = N_SLIP;
/* Set encapsulation (SLIP, CSLIP, etc) */
if (ioctl_or_warn(handle, SIOCSIFENCAP, &encap) < 0) {
bad:
- restore_state_and_exit(1);
+ restore_state_and_exit(EXIT_FAILURE);
}
}
-static void sig_handler(int signo)
+static void sig_handler(int signo UNUSED_PARAM)
{
- restore_state_and_exit(0);
+ restore_state_and_exit(EXIT_SUCCESS);
}
int slattach_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
-int slattach_main(int argc, char **argv)
+int slattach_main(int argc UNUSED_PARAM, char **argv)
{
/* Line discipline code table */
static const char proto_names[] ALIGN1 =
state.c_cflag = CS8 | HUPCL | CREAD
| ((opt & OPT_L_local) ? CLOCAL : 0)
| ((opt & OPT_F_noflow) ? 0 : CRTSCTS);
+ cfsetispeed(&state, cfgetispeed(&saved_state));
+ cfsetospeed(&state, cfgetospeed(&saved_state));
}
if (opt & OPT_s_baud) {
system(extcmd);
/* Restore states and exit */
- restore_state_and_exit(0);
+ restore_state_and_exit(EXIT_SUCCESS);
}