summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael J. Chudobiak <mjc@avtechpulse.com>2012-10-15 12:32:58 -0400
committerMichael J. Chudobiak <mjc@avtechpulse.com>2012-10-15 12:32:58 -0400
commitc3f7e27f94563adc50e857d31c602ec03c2e7332 (patch)
treef8600f1c14d214bd80c9a904b0a3adac62df6658
parent969879565a82fc646b00afcc7549a10f95623fa1 (diff)
astyle fixes
-rw-r--r--device-functions.c5
-rw-r--r--instr-daemon.c2
-rw-r--r--menus.c4
-rw-r--r--parser.c2
4 files changed, 7 insertions, 6 deletions
diff --git a/device-functions.c b/device-functions.c
index 62ca0ff..2ec40e8 100644
--- a/device-functions.c
+++ b/device-functions.c
@@ -4566,7 +4566,8 @@ int IO_Setup_RS232(int baud, char hardhand, gboolean update_flash)
return OK;
}
-int change_password (gchar *old_password, gchar *new_password) {
+int change_password (gchar *old_password, gchar *new_password)
+{
gboolean old_valid = TRUE;
@@ -4577,7 +4578,7 @@ int change_password (gchar *old_password, gchar *new_password) {
// only happens when resetting the password to the default.
if (old_password != NULL) {
printf ("verifying old password: %s\n", old_password); //FIXME with real function
- // check, and set old_valid = FALSE if the password check fails
+ // check, and set old_valid = FALSE if the password check fails
}
if (old_valid == TRUE) {
diff --git a/instr-daemon.c b/instr-daemon.c
index ffd7153..e1e29fb 100644
--- a/instr-daemon.c
+++ b/instr-daemon.c
@@ -349,7 +349,7 @@ static gboolean periodic_poll (void)
}
}
GPIB_check_for_device_clear_signal();
-
+
Update_Main_Menu_If_Visible();
return TRUE;
diff --git a/menus.c b/menus.c
index 55de38a..19662aa 100644
--- a/menus.c
+++ b/menus.c
@@ -1489,8 +1489,8 @@ static void Submenu_Display(int change_selection)
Submenu_Structure[0]=mode_go_to_local;
Submenu_Structure[1]=mode_exit_normal_submenu;
} else {
- Submenu_max_entry=0;
- Submenu_Structure[0]=mode_exit_normal_submenu;
+ Submenu_max_entry=0;
+ Submenu_Structure[0]=mode_exit_normal_submenu;
}
break;
diff --git a/parser.c b/parser.c
index 31b2673..c88bbf5 100644
--- a/parser.c
+++ b/parser.c
@@ -3640,7 +3640,7 @@ static int Go_sys_pwd_92(gchar** response, int channel, char *parameter,int comm
error_num = change_password (old_password, new_password);
}
- g_free (new_password);
+ g_free (new_password);
g_free (old_password);
return error_num;