Fix a few text mistaked discovered during merge.

This commit is contained in:
mmdolze
2012-08-19 14:13:26 +00:00
parent 8377bdf212
commit 38c7fb27a3
5 changed files with 8 additions and 7 deletions
+1 -1
View File
@@ -65,7 +65,7 @@ iface_process_configfile(void)
iface[iface_count].alias = strdup(config_get_string("Iface", iface_label, 0, iface[iface_count].name));
if (iface[iface_count].alias == NULL)
/*
* make alias the same as the interface name in case #
* make alias the same as the interface name in case
* strdup() failed
*/
iface[iface_count].alias = iface[iface_count].name;
+2 -1
View File
@@ -276,9 +276,10 @@ mem_top_screen(int rep, int display, int *flags_ptr)
/* frame from (2nd line, left) to (last line, right) */
sock_send_string(sock, "widget_add S f frame\n");
/* scroll rate: 1 line every X ticks (= 1/8 sec) */
sock_printf(sock, "widget_set S f 1 2 %i %i %i 5 v %i\n",
lcd_wid, lcd_hgt, lcd_wid,
/* scroll rate: 1 line every X ticks (= 1/8 sec) */
((lcd_hgt >= 4) ? 8 : 12));
/* frame contents */