[Emacs-diffs] Changes to emacs/lib-src/etags.c

[Francesco Potortì]

Index: emacs/lib-src/etags.c
diff -c emacs/lib-src/etags.c:3.30 emacs/lib-src/etags.c:3.31
*** emacs/lib-src/etags.c:3.30  Fri Aug 30 12:38:58 2002
--- emacs/lib-src/etags.c       Tue Sep  3 11:21:07 2002
***************
*** 35,41 ****
   *
   */
  
! char pot_etags_version[] = "@(#) pot revision number is 16.54";
  
  #define       TRUE    1
  #define       FALSE   0
--- 35,41 ----
   *
   */
  
! char pot_etags_version[] = "@(#) pot revision number is $Revision: 3.31 $";
  
  #define       TRUE    1
  #define       FALSE   0
***************
*** 1871,1876 ****
--- 1871,1877 ----
  {
    register node *np;
  
+   assert (name == NULL || name[0] != '\0');
    if (CTAGS && name == NULL)
      return;
  
***************
*** 5727,5732 ****
--- 5728,5734 ----
        size -= 1;
  
    /* Allocate space and do the substitutions. */
+   assert (size >= 0);
    result = xnew (size + 1, char);
  
    for (t = result; *out != '\0'; out++)
***************
*** 5741,5747 ****
        *t++ = *out;
    *t = '\0';
  
!   assert (t <= result + size && t - result == (int)strlen (result));
  
    return result;
  }
--- 5743,5750 ----
        *t++ = *out;
    *t = '\0';
  
!   assert (t <= result + size);
!   assert (t - result == (int)strlen (result));
  
    return result;
  }
***************
*** 5828,5835 ****
                if (buffer[charno++] == '\n')
                  lineno++, linecharno = charno;
              name = rp->name;
!             if (name[0] != '\0')
!               /* Make a named tag. */
                name = substitute (buffer, rp->name, &rp->regs);
              if (rp->force_explicit_name)
                /* Force explicit tag name, if a name is there. */
--- 5831,5839 ----
                if (buffer[charno++] == '\n')
                  lineno++, linecharno = charno;
              name = rp->name;
!             if (name[0] == '\0')
!               name = NULL;
!             else /* make a named tag */
                name = substitute (buffer, rp->name, &rp->regs);
              if (rp->force_explicit_name)
                /* Force explicit tag name, if a name is there. */
***************
*** 6151,6158 ****
            default:
              /* Match occurred.  Construct a tag. */
              name = rp->name;
!             if (name[0] != '\0')
!               /* Make a named tag. */
                name = substitute (lbp->buffer, rp->name, &rp->regs);
              if (rp->force_explicit_name)
                /* Force explicit tag name, if a name is there. */
--- 6155,6163 ----
            default:
              /* Match occurred.  Construct a tag. */
              name = rp->name;
!             if (name[0] == '\0')
!               name = NULL;
!             else /* make a named tag */
                name = substitute (lbp->buffer, rp->name, &rp->regs);
              if (rp->force_explicit_name)
                /* Force explicit tag name, if a name is there. */