]> git.pond.sub.org Git - empserver/commitdiff
Simplify eta_calc(): drop pointer parameter, return value instead
authorMarkus Armbruster <armbru@pond.sub.org>
Mon, 21 Mar 2011 19:43:21 +0000 (20:43 +0100)
committerMarkus Armbruster <armbru@pond.sub.org>
Tue, 12 Apr 2011 19:51:32 +0000 (21:51 +0200)
src/lib/commands/orde.c

index b6f019f09ffc75af73089979c4433f1bd470431b..1d1b3313ca45b221999841699d5b3f1283303221 100644 (file)
@@ -284,14 +284,14 @@ orde(void)
     return RET_OK;
 }
 
-static void
-eta_calc(struct shpstr *sp, int len, int *nupdates)
+static int
+eta_calc(struct shpstr *sp, int len)
 {
     double mobcost, mobil;
-    int i;
+    int i, nupdates;
 
     i = len;
-    *nupdates = 1;
+    nupdates = 1;
 
     mobcost = shp_mobcost(sp);
     mobil = sp->shp_mobil;
@@ -301,9 +301,10 @@ eta_calc(struct shpstr *sp, int len, int *nupdates)
            i--;
        } else {
            mobil += (ship_mob_scale * (float)etu_per_update);
-           (*nupdates)++;
+           nupdates++;
        }
     }
+    return nupdates;
 }
 
 static void
@@ -440,7 +441,7 @@ sorde(void)
                else {
                    /* distance to destination */
                    len = strlen(c);
-                   eta_calc(&ship, len, &updates);
+                   updates = eta_calc(&ship, len);
                    pr(" %3d %4d", len, updates);
                }
            }