fix waggling and some of the messages

diff --git a/hostside/movpos.c b/hostside/movpos.c
index 706f21ef8be6c6e73d9b2d092f7a7d7c9e49dcba..ead666d464f5cb40f59b353cc7d1cbdc80ef6109 100644 (file)
--- a/hostside/movpos.c
+++ b/hostside/movpos.c
@@ -392,7 +392,7 @@ static ErrorCode fsq_confirm(Method *mm, Change *chg, Segment *move,
 
   /* state CA */
   ec= fsq_enqueue(m, &m->f.confirmed, r);
-  oprintf(DUPO("movpos/fsq") "%s  pt_enqueue=%s\n", m->m.pname, ec2str(ec));
+  oprintf(DUPO("movpos/fsq") "%s  fsq_enqueue=%s\n", m->m.pname, ec2str(ec));
   assert(allow_failure || !ec);
 
   if (existing) {                                  /* CA */
@@ -446,7 +446,7 @@ static void fsq_check_action(FsqMethod *m) {
     assert(mo->posn < mo->i->posns);
     m->f.ready= 0;
     m->f.move(m, mo->i, mo->posn);
-    oprintf(UPO, "movpos %s feat %s%d %s\n", r->h.move->i->pname,
+    oprintf(UPO, "movpos %s feat %s %d %s\n", r->h.move->i->pname,
            mo->i->pname, mo->posn, m->m.pname);
     m->f.cslot++;
 
@@ -650,7 +650,7 @@ void on_pic_waggled(const PicInsnInfo *pii, const PicInsn *pi, int objnum) {
   }
 }
 
-static FsqMethod relays_method= {
+static FsqMethod waggle= {
   { "relay", mfk_relay,
     waggle_allocate, fsq_reserve, fsq_confirm,
     fsq_destroy, fsq_all_abandon },
@@ -685,7 +685,7 @@ static Method nomove_method= {
 static Method *methods[]= {
   &nomove_method,
   (Method*)&points_method,
-  (Method*)&relays_method,
+  (Method*)&waggle,
   0
 };