style fixes

4 files changed, 22 insertions, 23 deletions

diff --git a/device-functions.c b/device-functions.c
index 6a54241..35c2662 100644
--- a/device-functions.c
+++ b/device-functions.c
@@ -4541,14 +4541,13 @@ void Main_update_shift_registers()
 	/* send MSB first, LSB last */
 	/* send highest # SR first */
 
-	int store_trigger_mode[max_channels];
 	int i,j,n;	  /* counters */
 	char data_out;
 	int temp_output_state[max_channels];
 
 	/* suppress triggering during relay switching */
 	if (	globals.Registers.last_relay_driver_settings[0]!=globals.Registers.shift_reg_out[2]
-	        || globals.Registers.last_relay_driver_settings[1]!=globals.Registers.shift_reg_out[3]) {
+	                || globals.Registers.last_relay_driver_settings[1]!=globals.Registers.shift_reg_out[3]) {
 		start_gate_override ();
 	}
 
@@ -4563,7 +4562,7 @@ void Main_update_shift_registers()
 		}
 
 	bus_setpin(out_CLOCK_LINE, 1);
-        bus_setpin(out_STROBE_LINE, 0);
+	bus_setpin(out_STROBE_LINE, 0);
 
 	for (i=(num_out_SRs-1); i>=0; --i) {
 		switch (i) {
@@ -4598,8 +4597,8 @@ void Main_update_shift_registers()
 
 	/* keep trigger suppressed for a time (normally 5ms) after a relay update */
 	if (	globals.Registers.last_relay_driver_settings[0]!=globals.Registers.shift_reg_out[2]
-	        || globals.Registers.last_relay_driver_settings[1]!=globals.Registers.shift_reg_out[3]
-	        || globals.Flags.force_output_fully_off==YES) {
+	                || globals.Registers.last_relay_driver_settings[1]!=globals.Registers.shift_reg_out[3]
+	                || globals.Flags.force_output_fully_off==YES) {
 		g_usleep (1e3 * globals.Timers.Relay_Switching_Delay_in_Milliseconds);
 	}
 
diff --git a/error_utils.c b/error_utils.c
index 8b28cf6..32ea779 100644
--- a/error_utils.c
+++ b/error_utils.c
@@ -135,9 +135,9 @@ void queue_error_for_gpib_only(int error_num)
 
 void queue_error_and_display_on_LCD(int error_num)
 {
-        if (error_num == OK) {
-                return;
-        }
+	if (error_num == OK) {
+		return;
+	}
 
 	gchar* response = NULL;
 	queue_error_and_get_text(&response, error_num);
@@ -148,9 +148,9 @@ void queue_error_and_display_on_LCD(int error_num)
 
 void queue_and_broadcast_sensor_alarm(int error_num) // FIXME - implement
 {
-        if (error_num == OK) {
-                return;
-        }
+	if (error_num == OK) {
+		return;
+	}
 
 	gchar* response = NULL;
 	queue_error_and_get_text(&response, error_num);
diff --git a/instr-daemon.c b/instr-daemon.c
index d9a99c3..7d21ee7 100644
--- a/instr-daemon.c
+++ b/instr-daemon.c
@@ -303,7 +303,7 @@ int main(int argc, char **argv)
 
 static gboolean periodic_poll (void)
 {
-	
+
 	Menu_Check_Buttons ();
 
 	return TRUE;
diff --git a/menus.c b/menus.c
index 0d9a859..2f3ab22 100644
--- a/menus.c
+++ b/menus.c
@@ -236,12 +236,12 @@ void Menu_Update_Display(void)
 	int show_item;
 	int old_cursor_pos;
 
-        if (    (globals.MenuStatus.Type_Of_Menu != Main_Menu_On) ||
-                (globals.MenuStatus.Error_Screen == YES) ||
-                (globals.MenuStatus.Nonstd_Display == YES) ) {
-                LCD_clear();
+	if (    (globals.MenuStatus.Type_Of_Menu != Main_Menu_On) ||
+	                (globals.MenuStatus.Error_Screen == YES) ||
+	                (globals.MenuStatus.Nonstd_Display == YES) ) {
+		LCD_clear();
 		globals.Changes.update_whole_main_menu = TRUE;
-        }
+	}
 
 	LCD_entry=-1;
 	sig_dig = 4;
@@ -1247,12 +1247,12 @@ static void Submenu_Display(int change_selection)
 	int channel;
 
 	// FIXME - check for redundant clearing
-        if (    (globals.MenuStatus.Type_Of_Menu != Submenu_On) ||
-                (globals.MenuStatus.Error_Screen == YES) ||
-                (globals.MenuStatus.Nonstd_Display == YES) || 
-		(!change_selection)) {
-                LCD_clear();
-        }
+	if (    (globals.MenuStatus.Type_Of_Menu != Submenu_On) ||
+	                (globals.MenuStatus.Error_Screen == YES) ||
+	                (globals.MenuStatus.Nonstd_Display == YES) ||
+	                (!change_selection)) {
+		LCD_clear();
+	}
 
 	globals.MenuStatus.Type_Of_Menu=Submenu_On;
 	globals.MenuStatus.Error_Screen=NO;