Trivial fixups

include/f/coal.h

@@ -121,7 +121,7 @@
 #       define u2_cr_mean                      u2_mean
 #       define u2_cr_mug(a)                    u2_mug(a)
 #       define u2_cr_mug_string(a)             u2_mug_string(a)
-#       define u2_cr_mug_words(a)              u2_mug_words(a)
+#       define u2_cr_mug_words(a, b)           u2_mug_words(a, b)
 #       define u2_cr_mug_cell(a, b)            u2_mug_cell(a, b)
 #       define u2_cr_mug_trel(a, b, c)         u2_mug_cell(a, b, c)
 #       define u2_cr_mug_qual(a, b, c, d)      u2_mug_qual(a, b, c, d)

include/v/vere.h

@@ -455,7 +455,7 @@
       } u2_host;                            //  host == computer == process
 
 #     define u2L  u2_Host.lup_u             //  global event loop
-#     define u2R  &u2_Raft
+#     define u2R  (&(u2_Raft))
 
     /* u2_funk: standard system function.
     */

v/loop.c

@@ -26,14 +26,6 @@
 
 #define AMES
 
-#if defined(U2_OS_linux)
-#include <stdio_ext.h>
-#define fpurge(fd) __fpurge(fd)
-#define DEVRANDOM "/dev/urandom"
-#else
-#define DEVRANDOM "/dev/random"
-#endif
-
 static jmp_buf Signal_buf;
 #ifndef SIGSTKSZ
 # define SIGSTKSZ 16384
@@ -455,10 +447,9 @@ _lo_mung(u2_reck* rec_u, c3_w sec_w, u2_noun gat, u2_noun sam)
 static void
 _lo_save(u2_reck* rec_u, u2_noun ovo)
 {
-  rec_u->roe = u2nc(ron, rec_u->roe);
+  rec_u->roe = u2nc(ovo, rec_u->roe);
 }
 
-
 /* _lo_pike(): poke with floating core.
 */
 static u2_noun

v/raft.c

@@ -11,6 +11,14 @@
 #include "all.h"
 #include "v/vere.h"
 
+#if defined(U2_OS_linux)
+#include <stdio_ext.h>
+#define fpurge(fd) __fpurge(fd)
+#define DEVRANDOM "/dev/urandom"
+#else
+#define DEVRANDOM "/dev/random"
+#endif
+
 
 /* _raft_election_rand(): pseudorandom component of election timeout.
 */
@@ -189,9 +197,9 @@ _raft_pack(u2_raft* raf_u, c3_w* bob_w, c3_w len_w)
     c3_assert(0);
   }
 #if 1
-  uL(fprintf(uH, "raft_pack: write %d, %d: lar ent %d, len %d, mug %x\n",
-                 lug_u->len_w,
-                 tar_w,
+  uL(fprintf(uH, "raft_pack: write %ull, %ull: lar ent %d, len %d, mug %x\n",
+                 lug_u->len_d,
+                 tar_d,
                  lar_u.ent_w,
                  lar_u.len_w,
                  lar_u.mug_w));