[ViewVC] Diff of: cvs/root-tail/root-tail.c

Comparing root-tail/root-tail.c (file contents):
Revision 1.57 by pcg, Sat Apr 10 13:26:24 2004 UTC vs.
Revision 1.58 by pcg, Sat Apr 10 13:45:15 2004 UTC

  * otherwise allocates a new string and copies p2 to it
  */
 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
     r = xmalloc (l2 + 1);
       int start_w = log->last->wrapped_left ? continuation_width : 0;
       int w = start_w;
       int wrapped = 0;
       char *break_p = NULL;
       int width_at_break_p = 0;
+      int prefix_len;
       spaces = 0;
       if (opt_justify)
         breaks[spaces].index = breaks[spaces].width = 0;
       /* if we're wrapping at spaces, and the line is long enough to
        * wrap, and we've seen a space already, and the space wasn't
        * the first character on the line, then wrap at the space */
       if (!wrapped)
         break;
-      int prefix_len;
       /* choose where to break the line */
       if (opt_wordwrap && break_p && break_p != beg)
         {
           prefix_len = break_p - beg;

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines