--- root-tail/root-tail.c	2004/04/10 13:26:24	1.57
+++ root-tail/root-tail.c	2004/04/10 13:45:15	1.58
@@ -655,12 +655,12 @@
 char *
 concat_line (char *p1, const char *p2)
 {
-  assert(p2);
-
   int l1 = p1 ? strlen (p1) : 0;
   int l2 = strlen (p2);
   char *r;
 
+  assert (p2);
+
   if (p1)
     r = xrealloc(p1, l1 + l2 + 1);
   else
@@ -925,6 +925,8 @@
       int wrapped = 0;
       char *break_p = NULL;
       int width_at_break_p = 0;
+      int prefix_len;
+
       spaces = 0;
 
       if (opt_justify)
@@ -992,8 +994,6 @@
       if (!wrapped)
         break;
 
-      int prefix_len;
-
       /* choose where to break the line */
       if (opt_wordwrap && break_p && break_p != beg)
         {