diff options
author | Michael J. Chudobiak <mjc@avtechpulse.com> | 2012-08-30 16:25:29 -0400 |
---|---|---|
committer | Michael J. Chudobiak <mjc@avtechpulse.com> | 2012-08-30 16:25:29 -0400 |
commit | fa271a2dd53a45cc1ed431e16a1c94fac17fbb63 (patch) | |
tree | 356d16a0beb33493c054101b2c24293f21b148c7 | |
parent | a9051a94473b63da8f6adb50ed08c6817145f159 (diff) |
astyle fixes
-rw-r--r-- | menus.c | 10 | ||||
-rw-r--r-- | string_utils.c | 12 |
2 files changed, 11 insertions, 11 deletions
@@ -3414,20 +3414,20 @@ static int Submenu_Implement_Changes(void) static void Nonstd_menu_network(void) { - nicinfo info; + nicinfo info; if (nicutils_infofordefaultroute(&info)) { gchar *response = g_strdup_printf ("MAC address: %s", info.mac); LCD_write(0,0,response); g_free (response); response = g_strdup_printf ("IP address: %s", info.ip); - LCD_write(1,0,response); - g_free (response); + LCD_write(1,0,response); + g_free (response); LCD_write(3,0,"Press CHANGE to continue."); - } else { + } else { LCD_display_extended_message("No network found.", TRUE, FALSE); - } + } globals.MenuStatus.Nonstd_Display=YES; } diff --git a/string_utils.c b/string_utils.c index a5f6e6f..651a3c7 100644 --- a/string_utils.c +++ b/string_utils.c @@ -63,10 +63,10 @@ void String_Parameter_To_Text(float Float_To_Convert, int significant_digits, gchar *out_val; out_val = g_strdup_printf ("%d", (int) Float_To_Convert); strcat(LCD_string,out_val); - g_free (out_val); + g_free (out_val); } else { GString *out_gstr = g_string_new (""); - + Float_To_Text(remote_digits_after_decimal,Float_To_Convert,&floating_val); /* -- COPY FIRST ONE OR TWO CHARACTERS -- */ @@ -77,11 +77,11 @@ void String_Parameter_To_Text(float Float_To_Convert, int significant_digits, } else if (show_plus_sign==YES) { /* if it's positive and plus sign required ... */ decimal_location=1; /* decimal at position one (e.g.: 2.23e-9) */ - out_gstr = g_string_append_c (out_gstr, '+'); /* copy minus sign */ - out_gstr = g_string_append_c (out_gstr, floating_val[0]); /* copy first digit */ + out_gstr = g_string_append_c (out_gstr, '+'); /* copy minus sign */ + out_gstr = g_string_append_c (out_gstr, floating_val[0]); /* copy first digit */ } else { /* if it's positive and plus sign not required ... */ decimal_location=1; /* decimal at position one (e.g.: 2.23e-9) */ - out_gstr = g_string_append_c (out_gstr, floating_val[0]); /* copy first digit */ + out_gstr = g_string_append_c (out_gstr, floating_val[0]); /* copy first digit */ } int digits_so_far = 1; @@ -119,7 +119,7 @@ void String_Parameter_To_Text(float Float_To_Convert, int significant_digits, /* move the digits that will come before the decimal */ for (i=decimal_location; i<decimal_location+shift_decimal_by; ++i) { - out_gstr = g_string_append_c (out_gstr, floating_val[1+i]); + out_gstr = g_string_append_c (out_gstr, floating_val[1+i]); ++digits_so_far; } |