safety: movpos: rename movposcomb_update_feature to movposcomb_feature_update (and...

diff --git a/hostside/commands.c b/hostside/commands.c
index fa5a6cbca036d4af2eec96d0bb20f2d9383b8f5f..228f6cd5d35896422ea5173b8fb5cea719176e41 100644 (file)
--- a/hostside/commands.c
+++ b/hostside/commands.c
@@ -293,7 +293,7 @@ static int cmd_movfeat(ParseState *ps, const CmdInfo *ci) {
               movei->pname);
     target= 0;
   }
-  target= movposcomb_update_feature(target,mfi,pos_l);
+  target= movposcomb_feature_update(mfi,target,pos_l);
 
   return cmd_route_movfeat(ps,ci, move,movei,target);
 }

diff --git a/hostside/movpos.c b/hostside/movpos.c
index 4222103c3b3c3b431b3752fbf128b706ff9bedb5..2d05b3c4b5de711d1c72e42d995c0f76c006cc27 100644 (file)
--- a/hostside/movpos.c
+++ b/hostside/movpos.c
@@ -131,9 +131,8 @@ static void ouposn_feat(const Segment *move, const MovFeatInfo *feati,
           feati->pname, posn, m->pname);
 }
 
-MovPosComb movposcomb_update_feature(MovPosComb startpoint,
-                                    const MovFeatInfo *mfi,
-                                    int featpos) {
+MovPosComb movposcomb_feature_update(const MovFeatInfo *mfi,
+                                    MovPosComb startpoint, int featpos) {
   MovPosComb above_weight= mfi->weight * mfi->posns;
   MovPosComb above= startpoint / above_weight;
   MovPosComb below= startpoint % mfi->weight;
@@ -711,7 +710,7 @@ static void method_update_feature(Method *m, MovPosChange *indep,
   assert(featix >= 0 && featix < indep->move->i->n_movfeats);
   ouposn_feat(indep->move, mo->i, mo->posn, m);
   indep->actualpos=
-    movposcomb_update_feature(indep->actualpos, mo->i, mo->posn);
+    movposcomb_feature_update(mo->i, indep->actualpos, mo->posn);
   indep->actualunk &= ~unkfeatbit(featix);
   ouposn_moving(indep);
 }

diff --git a/hostside/safety.h b/hostside/safety.h
index 19c9fd9e395b5befc1d6569e345f77ed1083717a..83b570c0fd6d05e8363881f0c81f8ab7ef84708a 100644 (file)
--- a/hostside/safety.h
+++ b/hostside/safety.h
@@ -241,8 +241,8 @@ MovPosComb movpos_change_intent(MovPosChange *chg);
 
 const char *movpos_pname(const Segment *move, MovPosComb poscomb);
 
-MovPosComb movposcomb_update_feature(MovPosComb startpoint,
-                                    const MovFeatInfo *mfi,
+MovPosComb movposcomb_feature_update(const MovFeatInfo *mfi,
+                                    MovPosComb startpoint,
                                     int featpos);
   /* Returns movposcomb representing a changed combination of positions;
    * pure function. */