texinfo/makeinfo float.c,1.25,1.26 makeinfo.c,1.60,1.61

[karl]

Update of /cvsroot/texinfo/texinfo/makeinfo
In directory sheep:/tmp/cvs-serv24346

Modified Files:
        float.c makeinfo.c 
Log Message:
valgrind fixes from meyering

Index: float.c
===================================================================
RCS file: /cvsroot/texinfo/texinfo/makeinfo/float.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** float.c     28 Feb 2004 12:15:53 -0000      1.25
--- float.c     19 Mar 2004 16:26:45 -0000      1.26
***************
*** 18,22 ****
     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  
!    Written by Alper Ersoy <address@hidden>.  */
  
  #include "system.h"
--- 18,22 ----
     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  
!    Originally written by Alper Ersoy <address@hidden>.  */
  
  #include "system.h"
***************
*** 36,39 ****
--- 36,40 ----
  {
    FLOAT_ELT *new = xmalloc (sizeof (FLOAT_ELT));
+   unsigned long num_len;
  
    new->id = id;
***************
*** 47,52 ****
    new->number = current_chapter_number ();
    /* Append dot if not @unnumbered.  */
!   if (strlen (new->number) > 0)
!     strcat (new->number, ".");
  
    { /* Append the current float number.  */
--- 48,58 ----
    new->number = current_chapter_number ();
    /* Append dot if not @unnumbered.  */
!   num_len = strlen (new->number);
!   if (num_len > 0)
!     {
!       new->number = xrealloc (new->number, num_len + 1 + 1);
!       new->number[num_len] = '.';
!       new->number[num_len+1] = '\0';
!     }
  
    { /* Append the current float number.  */

Index: makeinfo.c
===================================================================
RCS file: /cvsroot/texinfo/texinfo/makeinfo/makeinfo.c,v
retrieving revision 1.60
retrieving revision 1.61
diff -C2 -d -r1.60 -r1.61
*** makeinfo.c  14 Mar 2004 22:47:19 -0000      1.60
--- makeinfo.c  19 Mar 2004 16:26:45 -0000      1.61
***************
*** 2689,2695 ****
                              {
                                adjust_braces_following (temp, (- (t1 - temp)));
!                               strncpy ((char *) &output_paragraph[temp],
!                                        (char *) &output_paragraph[t1],
!                                        (output_paragraph_offset - t1));
                                output_paragraph_offset -= (t1 - temp);
                              }
--- 2689,2695 ----
                              {
                                adjust_braces_following (temp, (- (t1 - temp)));
!                               memmove (&output_paragraph[temp],
!                                        &output_paragraph[t1],
!                                        output_paragraph_offset - t1);
                                output_paragraph_offset -= (t1 - temp);
                              }