diff options
Diffstat (limited to 'src/fns.c')
| -rw-r--r-- | src/fns.c | 24 |
1 files changed, 12 insertions, 12 deletions
| @@ -936,7 +936,7 @@ string_make_multibyte (string) | |||
| 936 | 0, 1); | 936 | 0, 1); |
| 937 | 937 | ||
| 938 | ret = make_multibyte_string (buf, SCHARS (string), nbytes); | 938 | ret = make_multibyte_string (buf, SCHARS (string), nbytes); |
| 939 | SAFE_FREE (nbytes); | 939 | SAFE_FREE (); |
| 940 | 940 | ||
| 941 | return ret; | 941 | return ret; |
| 942 | } | 942 | } |
| @@ -969,7 +969,7 @@ string_to_multibyte (string) | |||
| 969 | str_to_multibyte (buf, nbytes, SBYTES (string)); | 969 | str_to_multibyte (buf, nbytes, SBYTES (string)); |
| 970 | 970 | ||
| 971 | ret = make_multibyte_string (buf, SCHARS (string), nbytes); | 971 | ret = make_multibyte_string (buf, SCHARS (string), nbytes); |
| 972 | SAFE_FREE (nbytes); | 972 | SAFE_FREE (); |
| 973 | 973 | ||
| 974 | return ret; | 974 | return ret; |
| 975 | } | 975 | } |
| @@ -996,7 +996,7 @@ string_make_unibyte (string) | |||
| 996 | 1, 0); | 996 | 1, 0); |
| 997 | 997 | ||
| 998 | ret = make_unibyte_string (buf, nchars); | 998 | ret = make_unibyte_string (buf, nchars); |
| 999 | SAFE_FREE (nchars); | 999 | SAFE_FREE (); |
| 1000 | 1000 | ||
| 1001 | return ret; | 1001 | return ret; |
| 1002 | } | 1002 | } |
| @@ -2489,7 +2489,7 @@ SEQUENCE may be a list, a vector, a bool-vector, or a string. */) | |||
| 2489 | args[i] = separator; | 2489 | args[i] = separator; |
| 2490 | 2490 | ||
| 2491 | ret = Fconcat (nargs, args); | 2491 | ret = Fconcat (nargs, args); |
| 2492 | SAFE_FREE_LISP (nargs); | 2492 | SAFE_FREE (); |
| 2493 | 2493 | ||
| 2494 | return ret; | 2494 | return ret; |
| 2495 | } | 2495 | } |
| @@ -2517,7 +2517,7 @@ SEQUENCE may be a list, a vector, a bool-vector, or a string. */) | |||
| 2517 | mapcar1 (leni, args, function, sequence); | 2517 | mapcar1 (leni, args, function, sequence); |
| 2518 | 2518 | ||
| 2519 | ret = Flist (leni, args); | 2519 | ret = Flist (leni, args); |
| 2520 | SAFE_FREE_LISP (leni); | 2520 | SAFE_FREE (); |
| 2521 | 2521 | ||
| 2522 | return ret; | 2522 | return ret; |
| 2523 | } | 2523 | } |
| @@ -3226,7 +3226,7 @@ into shorter lines. */) | |||
| 3226 | if (encoded_length < 0) | 3226 | if (encoded_length < 0) |
| 3227 | { | 3227 | { |
| 3228 | /* The encoding wasn't possible. */ | 3228 | /* The encoding wasn't possible. */ |
| 3229 | SAFE_FREE (allength); | 3229 | SAFE_FREE (); |
| 3230 | error ("Multibyte character in data for base64 encoding"); | 3230 | error ("Multibyte character in data for base64 encoding"); |
| 3231 | } | 3231 | } |
| 3232 | 3232 | ||
| @@ -3234,7 +3234,7 @@ into shorter lines. */) | |||
| 3234 | and delete the old. (Insert first in order to preserve markers.) */ | 3234 | and delete the old. (Insert first in order to preserve markers.) */ |
| 3235 | SET_PT_BOTH (XFASTINT (beg), ibeg); | 3235 | SET_PT_BOTH (XFASTINT (beg), ibeg); |
| 3236 | insert (encoded, encoded_length); | 3236 | insert (encoded, encoded_length); |
| 3237 | SAFE_FREE (allength); | 3237 | SAFE_FREE (); |
| 3238 | del_range_byte (ibeg + encoded_length, iend + encoded_length, 1); | 3238 | del_range_byte (ibeg + encoded_length, iend + encoded_length, 1); |
| 3239 | 3239 | ||
| 3240 | /* If point was outside of the region, restore it exactly; else just | 3240 | /* If point was outside of the region, restore it exactly; else just |
| @@ -3283,12 +3283,12 @@ into shorter lines. */) | |||
| 3283 | if (encoded_length < 0) | 3283 | if (encoded_length < 0) |
| 3284 | { | 3284 | { |
| 3285 | /* The encoding wasn't possible. */ | 3285 | /* The encoding wasn't possible. */ |
| 3286 | SAFE_FREE (allength); | 3286 | SAFE_FREE (); |
| 3287 | error ("Multibyte character in data for base64 encoding"); | 3287 | error ("Multibyte character in data for base64 encoding"); |
| 3288 | } | 3288 | } |
| 3289 | 3289 | ||
| 3290 | encoded_string = make_unibyte_string (encoded, encoded_length); | 3290 | encoded_string = make_unibyte_string (encoded, encoded_length); |
| 3291 | SAFE_FREE (allength); | 3291 | SAFE_FREE (); |
| 3292 | 3292 | ||
| 3293 | return encoded_string; | 3293 | return encoded_string; |
| 3294 | } | 3294 | } |
| @@ -3431,7 +3431,7 @@ If the region can't be decoded, signal an error and don't modify the buffer. */ | |||
| 3431 | if (decoded_length < 0) | 3431 | if (decoded_length < 0) |
| 3432 | { | 3432 | { |
| 3433 | /* The decoding wasn't possible. */ | 3433 | /* The decoding wasn't possible. */ |
| 3434 | SAFE_FREE (allength); | 3434 | SAFE_FREE (); |
| 3435 | error ("Invalid base64 data"); | 3435 | error ("Invalid base64 data"); |
| 3436 | } | 3436 | } |
| 3437 | 3437 | ||
| @@ -3439,7 +3439,7 @@ If the region can't be decoded, signal an error and don't modify the buffer. */ | |||
| 3439 | and delete the old. (Insert first in order to preserve markers.) */ | 3439 | and delete the old. (Insert first in order to preserve markers.) */ |
| 3440 | TEMP_SET_PT_BOTH (XFASTINT (beg), ibeg); | 3440 | TEMP_SET_PT_BOTH (XFASTINT (beg), ibeg); |
| 3441 | insert_1_both (decoded, inserted_chars, decoded_length, 0, 1, 0); | 3441 | insert_1_both (decoded, inserted_chars, decoded_length, 0, 1, 0); |
| 3442 | SAFE_FREE (allength); | 3442 | SAFE_FREE (); |
| 3443 | 3443 | ||
| 3444 | /* Delete the original text. */ | 3444 | /* Delete the original text. */ |
| 3445 | del_range_both (PT, PT_BYTE, XFASTINT (end) + inserted_chars, | 3445 | del_range_both (PT, PT_BYTE, XFASTINT (end) + inserted_chars, |
| @@ -3483,7 +3483,7 @@ DEFUN ("base64-decode-string", Fbase64_decode_string, Sbase64_decode_string, | |||
| 3483 | else | 3483 | else |
| 3484 | decoded_string = Qnil; | 3484 | decoded_string = Qnil; |
| 3485 | 3485 | ||
| 3486 | SAFE_FREE (length); | 3486 | SAFE_FREE (); |
| 3487 | if (!STRINGP (decoded_string)) | 3487 | if (!STRINGP (decoded_string)) |
| 3488 | error ("Invalid base64 data"); | 3488 | error ("Invalid base64 data"); |
| 3489 | 3489 | ||