From f36b3ee0206ab1f00cba59789b64fb34b6e92b3a Mon Sep 17 00:00:00 2001
From: pdw <>
Date: Wed, 20 Jan 2010 22:39:29 +0000
Subject: [PATCH] * Fix frozen order drives line totals crazy. * Fix for crash
 on arm.

---
 ChangeLog | 4 ++++
 cfgfile.c | 6 +++---
 ui.c      | 1 +
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 8ab8d3a..7cd0b76 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -11,6 +11,10 @@ Unattributed items are by Paul Warren and Chris Lightfoot.
     A. Costa <agcosta@gis.net> (via Debian)
 * Fix for armeb specific bug
     Lennert Buytenhek <buytenh+debian@wantstofly.org> (via Debian)
+* Fix frozen order drives line totals crazy.
+    Max Alekseyev <relf@os2.ru> (via Debian)
+* Fix for crash on arm.
+    Joey Hess <joeyh@debian.org> (via Debian)
 
 0.17 12/02/06
 * Display top scale in bytes when measuring in bytes
diff --git a/cfgfile.c b/cfgfile.c
index 442316c..0a77965 100644
--- a/cfgfile.c
+++ b/cfgfile.c
@@ -45,9 +45,9 @@ stringmap config;
 extern options_t options ;
 
 int is_cfgdirective_valid(const char *s) {
-    char **t;
-    for (t = config_directives; *t != NULL; ++t)
-        if (strcmp(s, *t) == 0) return 1;
+    int t;
+    for (t = 0; config_directives[t] != NULL; t++)
+       if (strcmp(s, config_directives[t]) == 0) return 1;
     return 0;
 }
 
diff --git a/ui.c b/ui.c
index bb1aa76..04c336f 100644
--- a/ui.c
+++ b/ui.c
@@ -446,6 +446,7 @@ void screen_hash_clear() {
     hash_node_type* n = NULL;
     while(hash_next_item(screen_hash, &n) == HASH_STATUS_OK) {
         host_pair_line* hpl = (host_pair_line*)n->rec;
+        hpl->total_recv = hpl->total_sent = 0;
         memset(hpl->recv, 0, sizeof(hpl->recv));
         memset(hpl->sent, 0, sizeof(hpl->sent));
     }