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

[Andreas Schwab]

Index: emacs/lib-src/movemail.c
diff -c emacs/lib-src/movemail.c:1.81 emacs/lib-src/movemail.c:1.82
*** emacs/lib-src/movemail.c:1.81       Sat Jan 29 16:56:30 2005
--- emacs/lib-src/movemail.c    Fri Feb  4 22:10:50 2005
***************
*** 245,251 ****
  #endif
  
    if (*outname == 0)
!     fatal ("Destination file name is empty", 0);
  
    /* Check access to output file.  */
    if (access (outname, F_OK) == 0 && access (outname, W_OK) != 0)
--- 245,251 ----
  #endif
  
    if (*outname == 0)
!     fatal ("Destination file name is empty", 0, 0);
  
    /* Check access to output file.  */
    if (access (outname, F_OK) == 0 && access (outname, W_OK) != 0)
***************
*** 601,612 ****
  /* Print error message and exit.  */
  
  void
! fatal (s1, s2)
!      char *s1, *s2;
  {
    if (delete_lockname)
      unlink (delete_lockname);
!   error (s1, s2, 0);
    exit (EXIT_FAILURE);
  }
  
--- 601,612 ----
  /* Print error message and exit.  */
  
  void
! fatal (s1, s2, s3)
!      char *s1, *s2, *s3;
  {
    if (delete_lockname)
      unlink (delete_lockname);
!   error (s1, s2, s3);
    exit (EXIT_FAILURE);
  }
  
***************
*** 631,647 ****
  pfatal_with_name (name)
       char *name;
  {
!   char *s = concat ("", strerror (errno), " for %s");
!   fatal (s, name);
  }
  
  void
  pfatal_and_delete (name)
       char *name;
  {
!   char *s = concat ("", strerror (errno), " for %s");
    unlink (name);
!   fatal (s, name);
  }
  
  /* Return a newly-allocated string whose contents concatenate those of s1, 
s2, s3.  */
--- 631,646 ----
  pfatal_with_name (name)
       char *name;
  {
!   fatal ("%s for %s", strerror (errno), name);
  }
  
  void
  pfatal_and_delete (name)
       char *name;
  {
!   char *s = strerror (errno);
    unlink (name);
!   fatal ("%s for %s", s, name);
  }
  
  /* Return a newly-allocated string whose contents concatenate those of s1, 
s2, s3.  */
***************
*** 669,675 ****
  {
    long *result = (long *) malloc (size);
    if (!result)
!     fatal ("virtual memory exhausted", 0);
    return result;
  }
  
--- 668,674 ----
  {
    long *result = (long *) malloc (size);
    if (!result)
!     fatal ("virtual memory exhausted", 0, 0);
    return result;
  }