From 2e5bec84013e42fa20460d15b1ac65bb2eb2337f Mon Sep 17 00:00:00 2001
From: Ian Jackson <ian@liberator.relativity.greenend.org.uk>
Date: Sat, 19 Feb 2011 12:20:12 +0000
Subject: [PATCH] safety: movpos: rename movposcomb_update_feature to
 movposcomb_feature_update (and change argument order); no functional change

---
 hostside/commands.c | 2 +-
 hostside/movpos.c   | 7 +++----
 hostside/safety.h   | 4 ++--
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/hostside/commands.c b/hostside/commands.c
index fa5a6cb..228f6cd 100644
--- 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 4222103..2d05b3c 100644
--- 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 19c9fd9..83b570c 100644
--- 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. */
-- 
2.30.2