]> git.pond.sub.org Git - empserver/commitdiff
Simplify eta_calc(): let caller compute path length
authorMarkus Armbruster <armbru@pond.sub.org>
Mon, 21 Mar 2011 19:42:37 +0000 (20:42 +0100)
committerMarkus Armbruster <armbru@pond.sub.org>
Tue, 12 Apr 2011 19:51:32 +0000 (21:51 +0200)
src/lib/commands/orde.c

index 145a1f3b00aea62e086748e7ee6ca1ed848ccf16..b6f019f09ffc75af73089979c4433f1bd470431b 100644 (file)
@@ -285,13 +285,12 @@ orde(void)
 }
 
 static void
-eta_calc(struct shpstr *sp, char *path, int *len, int *nupdates)
+eta_calc(struct shpstr *sp, int len, int *nupdates)
 {
     double mobcost, mobil;
     int i;
 
-    i = strlen(path);
-    *len = i;
+    i = len;
     *nupdates = 1;
 
     mobcost = shp_mobcost(sp);
@@ -440,7 +439,8 @@ sorde(void)
                    pr(" has arrived");
                else {
                    /* distance to destination */
-                   eta_calc(&ship, c, &len, &updates);
+                   len = strlen(c);
+                   eta_calc(&ship, len, &updates);
                    pr(" %3d %4d", len, updates);
                }
            }