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

[Kim F . Storm]

Index: emacs/src/fns.c
diff -c emacs/src/fns.c:1.373 emacs/src/fns.c:1.374
*** emacs/src/fns.c:1.373       Wed Oct 13 18:40:03 2004
--- emacs/src/fns.c     Tue Oct 26 22:38:50 2004
***************
*** 1012,1018 ****
             0, 1);
  
    ret = make_multibyte_string (buf, SCHARS (string), nbytes);
!   SAFE_FREE (nbytes);
  
    return ret;
  }
--- 1012,1018 ----
             0, 1);
  
    ret = make_multibyte_string (buf, SCHARS (string), nbytes);
!   SAFE_FREE ();
  
    return ret;
  }
***************
*** 1046,1052 ****
    str_to_multibyte (buf, nbytes, SBYTES (string));
  
    ret = make_multibyte_string (buf, SCHARS (string), nbytes);
!   SAFE_FREE (nbytes);
  
    return ret;
  }
--- 1046,1052 ----
    str_to_multibyte (buf, nbytes, SBYTES (string));
  
    ret = make_multibyte_string (buf, SCHARS (string), nbytes);
!   SAFE_FREE ();
  
    return ret;
  }
***************
*** 1073,1079 ****
             1, 0);
  
    ret = make_unibyte_string (buf, nchars);
!   SAFE_FREE (nchars);
  
    return ret;
  }
--- 1073,1079 ----
             1, 0);
  
    ret = make_unibyte_string (buf, nchars);
!   SAFE_FREE ();
  
    return ret;
  }
***************
*** 3030,3036 ****
      args[i] = separator;
  
    ret = Fconcat (nargs, args);
!   SAFE_FREE_LISP (nargs);
  
    return ret;
  }
--- 3030,3036 ----
      args[i] = separator;
  
    ret = Fconcat (nargs, args);
!   SAFE_FREE ();
  
    return ret;
  }
***************
*** 3056,3062 ****
    mapcar1 (leni, args, function, sequence);
  
    ret = Flist (leni, args);
!   SAFE_FREE_LISP (leni);
  
    return ret;
  }
--- 3056,3062 ----
    mapcar1 (leni, args, function, sequence);
  
    ret = Flist (leni, args);
!   SAFE_FREE ();
  
    return ret;
  }
***************
*** 3763,3769 ****
    if (encoded_length < 0)
      {
        /* The encoding wasn't possible. */
!       SAFE_FREE (allength);
        error ("Multibyte character in data for base64 encoding");
      }
  
--- 3763,3769 ----
    if (encoded_length < 0)
      {
        /* The encoding wasn't possible. */
!       SAFE_FREE ();
        error ("Multibyte character in data for base64 encoding");
      }
  
***************
*** 3771,3777 ****
       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
--- 3771,3777 ----
       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
***************
*** 3820,3831 ****
    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;
  }
--- 3820,3831 ----
    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;
  }
***************
*** 3962,3968 ****
    if (decoded_length < 0)
      {
        /* The decoding wasn't possible. */
!       SAFE_FREE (allength);
        error ("Invalid base64 data");
      }
  
--- 3962,3968 ----
    if (decoded_length < 0)
      {
        /* The decoding wasn't possible. */
!       SAFE_FREE ();
        error ("Invalid base64 data");
      }
  
***************
*** 3970,3976 ****
       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,
--- 3970,3976 ----
       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,
***************
*** 4014,4020 ****
    else
      decoded_string = Qnil;
  
!   SAFE_FREE (length);
    if (!STRINGP (decoded_string))
      error ("Invalid base64 data");
  
--- 4014,4020 ----
    else
      decoded_string = Qnil;
  
!   SAFE_FREE ();
    if (!STRINGP (decoded_string))
      error ("Invalid base64 data");