From cc7952ea94f30b62be70486f42b47bcffee7f8eb Mon Sep 17 00:00:00 2001 From: Simon Wilks Date: Thu, 22 Nov 2012 12:48:52 +0100 Subject: [PATCH] Messaging cleanup. --- apps/hott_telemetry/hott_telemetry_main.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/apps/hott_telemetry/hott_telemetry_main.c b/apps/hott_telemetry/hott_telemetry_main.c index 25830f20f2..515779cb5f 100644 --- a/apps/hott_telemetry/hott_telemetry_main.c +++ b/apps/hott_telemetry/hott_telemetry_main.c @@ -115,8 +115,8 @@ static int open_uart(const char *uart_name, struct termios *uart_config_original int termios_state; /* Back up the original uart configuration to restore it after exit */ + char msg[80]; if ((termios_state = tcgetattr(uart, uart_config_original)) < 0) { - char msg[80]; sprintf(msg, "Error getting baudrate / termios config for %s: %d\n", uart_name, termios_state); close(uart); FATAL_MSG(msg); @@ -130,14 +130,13 @@ static int open_uart(const char *uart_name, struct termios *uart_config_original /* Set baud rate */ if (cfsetispeed(&uart_config, speed) < 0 || cfsetospeed(&uart_config, speed) < 0) { - char msg[80]; - sprintf(msg, "Error setting baudrate / termios config for %s: %d (cfsetispeed, cfsetospeed)\n", uart_name, termios_state); + sprintf(msg, "Error setting baudrate / termios config for %s: %d (cfsetispeed, cfsetospeed)\n", + uart_name, termios_state); close(uart); FATAL_MSG(msg); } if ((termios_state = tcsetattr(uart, TCSANOW, &uart_config)) < 0) { - char msg[80]; sprintf(msg, "Error setting baudrate / termios config for %s (tcsetattr)\n", uart_name); close(uart); FATAL_MSG(msg);