[Emacs-diffs] Changes to emacs/src/fns.c [emacs-unicode-2]

[Miles Bader]

Index: emacs/src/fns.c
diff -c emacs/src/fns.c:1.342.2.10 emacs/src/fns.c:1.342.2.11
*** emacs/src/fns.c:1.342.2.10  Sun Jul 11 22:08:04 2004
--- emacs/src/fns.c     Wed Oct 27 06:03:06 2004
***************
*** 936,942 ****
             0, 1);
  
    ret = make_multibyte_string (buf, SCHARS (string), nbytes);
!   SAFE_FREE (nbytes);
  
    return ret;
  }
--- 936,942 ----
             0, 1);
  
    ret = make_multibyte_string (buf, SCHARS (string), nbytes);
!   SAFE_FREE ();
  
    return ret;
  }
***************
*** 969,975 ****
    str_to_multibyte (buf, nbytes, SBYTES (string));
  
    ret = make_multibyte_string (buf, SCHARS (string), nbytes);
!   SAFE_FREE (nbytes);
  
    return ret;
  }
--- 969,975 ----
    str_to_multibyte (buf, nbytes, SBYTES (string));
  
    ret = make_multibyte_string (buf, SCHARS (string), nbytes);
!   SAFE_FREE ();
  
    return ret;
  }
***************
*** 996,1002 ****
             1, 0);
  
    ret = make_unibyte_string (buf, nchars);
!   SAFE_FREE (nchars);
  
    return ret;
  }
--- 996,1002 ----
             1, 0);
  
    ret = make_unibyte_string (buf, nchars);
!   SAFE_FREE ();
  
    return ret;
  }
***************
*** 2489,2495 ****
      args[i] = separator;
  
    ret = Fconcat (nargs, args);
!   SAFE_FREE_LISP (nargs);
  
    return ret;
  }
--- 2489,2495 ----
      args[i] = separator;
  
    ret = Fconcat (nargs, args);
!   SAFE_FREE ();
  
    return ret;
  }
***************
*** 2517,2523 ****
    mapcar1 (leni, args, function, sequence);
  
    ret = Flist (leni, args);
!   SAFE_FREE_LISP (leni);
  
    return ret;
  }
--- 2517,2523 ----
    mapcar1 (leni, args, function, sequence);
  
    ret = Flist (leni, args);
!   SAFE_FREE ();
  
    return ret;
  }
***************
*** 3226,3232 ****
    if (encoded_length < 0)
      {
        /* The encoding wasn't possible. */
!       SAFE_FREE (allength);
        error ("Multibyte character in data for base64 encoding");
      }
  
--- 3226,3232 ----
    if (encoded_length < 0)
      {
        /* The encoding wasn't possible. */
!       SAFE_FREE ();
        error ("Multibyte character in data for base64 encoding");
      }
  
***************
*** 3234,3240 ****
       and delete the old.  (Insert first in order to preserve markers.)  */
    SET_PT_BOTH (XFASTINT (beg), ibeg);
    insert (encoded, encoded_length);
!   SAFE_FREE (allength);
    del_range_byte (ibeg + encoded_length, iend + encoded_length, 1);
  
    /* If point was outside of the region, restore it exactly; else just
--- 3234,3240 ----
       and delete the old.  (Insert first in order to preserve markers.)  */
    SET_PT_BOTH (XFASTINT (beg), ibeg);
    insert (encoded, encoded_length);
!   SAFE_FREE ();
    del_range_byte (ibeg + encoded_length, iend + encoded_length, 1);
  
    /* If point was outside of the region, restore it exactly; else just
***************
*** 3283,3294 ****
    if (encoded_length < 0)
      {
        /* The encoding wasn't possible. */
!       SAFE_FREE (allength);
        error ("Multibyte character in data for base64 encoding");
      }
  
    encoded_string = make_unibyte_string (encoded, encoded_length);
!   SAFE_FREE (allength);
  
    return encoded_string;
  }
--- 3283,3294 ----
    if (encoded_length < 0)
      {
        /* The encoding wasn't possible. */
!       SAFE_FREE ();
        error ("Multibyte character in data for base64 encoding");
      }
  
    encoded_string = make_unibyte_string (encoded, encoded_length);
!   SAFE_FREE ();
  
    return encoded_string;
  }
***************
*** 3431,3437 ****
    if (decoded_length < 0)
      {
        /* The decoding wasn't possible. */
!       SAFE_FREE (allength);
        error ("Invalid base64 data");
      }
  
--- 3431,3437 ----
    if (decoded_length < 0)
      {
        /* The decoding wasn't possible. */
!       SAFE_FREE ();
        error ("Invalid base64 data");
      }
  
***************
*** 3439,3445 ****
       and delete the old.  (Insert first in order to preserve markers.)  */
    TEMP_SET_PT_BOTH (XFASTINT (beg), ibeg);
    insert_1_both (decoded, inserted_chars, decoded_length, 0, 1, 0);
!   SAFE_FREE (allength);
  
    /* Delete the original text.  */
    del_range_both (PT, PT_BYTE, XFASTINT (end) + inserted_chars,
--- 3439,3445 ----
       and delete the old.  (Insert first in order to preserve markers.)  */
    TEMP_SET_PT_BOTH (XFASTINT (beg), ibeg);
    insert_1_both (decoded, inserted_chars, decoded_length, 0, 1, 0);
!   SAFE_FREE ();
  
    /* Delete the original text.  */
    del_range_both (PT, PT_BYTE, XFASTINT (end) + inserted_chars,
***************
*** 3483,3489 ****
    else
      decoded_string = Qnil;
  
!   SAFE_FREE (length);
    if (!STRINGP (decoded_string))
      error ("Invalid base64 data");
  
--- 3483,3489 ----
    else
      decoded_string = Qnil;
  
!   SAFE_FREE ();
    if (!STRINGP (decoded_string))
      error ("Invalid base64 data");