diff options
| author | Kim F. Storm | 2004-10-26 22:38:50 +0000 |
|---|---|---|
| committer | Kim F. Storm | 2004-10-26 22:38:50 +0000 |
| commit | 233f3db624556da41f0edb0c0a03dc4288eeea98 (patch) | |
| tree | 929dc6d80200504a57102e8e289864cebc083f79 /src/fns.c | |
| parent | e65837df545fcf0791b3c8db27186e605cf89538 (diff) | |
| download | emacs-233f3db624556da41f0edb0c0a03dc4288eeea98.tar.gz emacs-233f3db624556da41f0edb0c0a03dc4288eeea98.zip | |
Fix SAFE_FREE calls. Replace SAFE_FREE_LISP calls.
Diffstat (limited to 'src/fns.c')
| -rw-r--r-- | src/fns.c | 24 |
1 files changed, 12 insertions, 12 deletions
| @@ -1012,7 +1012,7 @@ string_make_multibyte (string) | |||
| 1012 | 0, 1); | 1012 | 0, 1); |
| 1013 | 1013 | ||
| 1014 | ret = make_multibyte_string (buf, SCHARS (string), nbytes); | 1014 | ret = make_multibyte_string (buf, SCHARS (string), nbytes); |
| 1015 | SAFE_FREE (nbytes); | 1015 | SAFE_FREE (); |
| 1016 | 1016 | ||
| 1017 | return ret; | 1017 | return ret; |
| 1018 | } | 1018 | } |
| @@ -1046,7 +1046,7 @@ string_to_multibyte (string) | |||
| 1046 | str_to_multibyte (buf, nbytes, SBYTES (string)); | 1046 | str_to_multibyte (buf, nbytes, SBYTES (string)); |
| 1047 | 1047 | ||
| 1048 | ret = make_multibyte_string (buf, SCHARS (string), nbytes); | 1048 | ret = make_multibyte_string (buf, SCHARS (string), nbytes); |
| 1049 | SAFE_FREE (nbytes); | 1049 | SAFE_FREE (); |
| 1050 | 1050 | ||
| 1051 | return ret; | 1051 | return ret; |
| 1052 | } | 1052 | } |
| @@ -1073,7 +1073,7 @@ string_make_unibyte (string) | |||
| 1073 | 1, 0); | 1073 | 1, 0); |
| 1074 | 1074 | ||
| 1075 | ret = make_unibyte_string (buf, nchars); | 1075 | ret = make_unibyte_string (buf, nchars); |
| 1076 | SAFE_FREE (nchars); | 1076 | SAFE_FREE (); |
| 1077 | 1077 | ||
| 1078 | return ret; | 1078 | return ret; |
| 1079 | } | 1079 | } |
| @@ -3030,7 +3030,7 @@ SEQUENCE may be a list, a vector, a bool-vector, or a string. */) | |||
| 3030 | args[i] = separator; | 3030 | args[i] = separator; |
| 3031 | 3031 | ||
| 3032 | ret = Fconcat (nargs, args); | 3032 | ret = Fconcat (nargs, args); |
| 3033 | SAFE_FREE_LISP (nargs); | 3033 | SAFE_FREE (); |
| 3034 | 3034 | ||
| 3035 | return ret; | 3035 | return ret; |
| 3036 | } | 3036 | } |
| @@ -3056,7 +3056,7 @@ SEQUENCE may be a list, a vector, a bool-vector, or a string. */) | |||
| 3056 | mapcar1 (leni, args, function, sequence); | 3056 | mapcar1 (leni, args, function, sequence); |
| 3057 | 3057 | ||
| 3058 | ret = Flist (leni, args); | 3058 | ret = Flist (leni, args); |
| 3059 | SAFE_FREE_LISP (leni); | 3059 | SAFE_FREE (); |
| 3060 | 3060 | ||
| 3061 | return ret; | 3061 | return ret; |
| 3062 | } | 3062 | } |
| @@ -3763,7 +3763,7 @@ into shorter lines. */) | |||
| 3763 | if (encoded_length < 0) | 3763 | if (encoded_length < 0) |
| 3764 | { | 3764 | { |
| 3765 | /* The encoding wasn't possible. */ | 3765 | /* The encoding wasn't possible. */ |
| 3766 | SAFE_FREE (allength); | 3766 | SAFE_FREE (); |
| 3767 | error ("Multibyte character in data for base64 encoding"); | 3767 | error ("Multibyte character in data for base64 encoding"); |
| 3768 | } | 3768 | } |
| 3769 | 3769 | ||
| @@ -3771,7 +3771,7 @@ into shorter lines. */) | |||
| 3771 | and delete the old. (Insert first in order to preserve markers.) */ | 3771 | and delete the old. (Insert first in order to preserve markers.) */ |
| 3772 | SET_PT_BOTH (XFASTINT (beg), ibeg); | 3772 | SET_PT_BOTH (XFASTINT (beg), ibeg); |
| 3773 | insert (encoded, encoded_length); | 3773 | insert (encoded, encoded_length); |
| 3774 | SAFE_FREE (allength); | 3774 | SAFE_FREE (); |
| 3775 | del_range_byte (ibeg + encoded_length, iend + encoded_length, 1); | 3775 | del_range_byte (ibeg + encoded_length, iend + encoded_length, 1); |
| 3776 | 3776 | ||
| 3777 | /* If point was outside of the region, restore it exactly; else just | 3777 | /* If point was outside of the region, restore it exactly; else just |
| @@ -3820,12 +3820,12 @@ into shorter lines. */) | |||
| 3820 | if (encoded_length < 0) | 3820 | if (encoded_length < 0) |
| 3821 | { | 3821 | { |
| 3822 | /* The encoding wasn't possible. */ | 3822 | /* The encoding wasn't possible. */ |
| 3823 | SAFE_FREE (allength); | 3823 | SAFE_FREE (); |
| 3824 | error ("Multibyte character in data for base64 encoding"); | 3824 | error ("Multibyte character in data for base64 encoding"); |
| 3825 | } | 3825 | } |
| 3826 | 3826 | ||
| 3827 | encoded_string = make_unibyte_string (encoded, encoded_length); | 3827 | encoded_string = make_unibyte_string (encoded, encoded_length); |
| 3828 | SAFE_FREE (allength); | 3828 | SAFE_FREE (); |
| 3829 | 3829 | ||
| 3830 | return encoded_string; | 3830 | return encoded_string; |
| 3831 | } | 3831 | } |
| @@ -3962,7 +3962,7 @@ If the region can't be decoded, signal an error and don't modify the buffer. */ | |||
| 3962 | if (decoded_length < 0) | 3962 | if (decoded_length < 0) |
| 3963 | { | 3963 | { |
| 3964 | /* The decoding wasn't possible. */ | 3964 | /* The decoding wasn't possible. */ |
| 3965 | SAFE_FREE (allength); | 3965 | SAFE_FREE (); |
| 3966 | error ("Invalid base64 data"); | 3966 | error ("Invalid base64 data"); |
| 3967 | } | 3967 | } |
| 3968 | 3968 | ||
| @@ -3970,7 +3970,7 @@ If the region can't be decoded, signal an error and don't modify the buffer. */ | |||
| 3970 | and delete the old. (Insert first in order to preserve markers.) */ | 3970 | and delete the old. (Insert first in order to preserve markers.) */ |
| 3971 | TEMP_SET_PT_BOTH (XFASTINT (beg), ibeg); | 3971 | TEMP_SET_PT_BOTH (XFASTINT (beg), ibeg); |
| 3972 | insert_1_both (decoded, inserted_chars, decoded_length, 0, 1, 0); | 3972 | insert_1_both (decoded, inserted_chars, decoded_length, 0, 1, 0); |
| 3973 | SAFE_FREE (allength); | 3973 | SAFE_FREE (); |
| 3974 | 3974 | ||
| 3975 | /* Delete the original text. */ | 3975 | /* Delete the original text. */ |
| 3976 | del_range_both (PT, PT_BYTE, XFASTINT (end) + inserted_chars, | 3976 | del_range_both (PT, PT_BYTE, XFASTINT (end) + inserted_chars, |
| @@ -4014,7 +4014,7 @@ DEFUN ("base64-decode-string", Fbase64_decode_string, Sbase64_decode_string, | |||
| 4014 | else | 4014 | else |
| 4015 | decoded_string = Qnil; | 4015 | decoded_string = Qnil; |
| 4016 | 4016 | ||
| 4017 | SAFE_FREE (length); | 4017 | SAFE_FREE (); |
| 4018 | if (!STRINGP (decoded_string)) | 4018 | if (!STRINGP (decoded_string)) |
| 4019 | error ("Invalid base64 data"); | 4019 | error ("Invalid base64 data"); |
| 4020 | 4020 | ||