/[emacs]/emacs/src/fns.c
ViewVC logotype

Diff of /emacs/src/fns.c

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

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

Legend:
Removed from v.1.342.2.10  
changed lines
  Added in v.1.342.2.11

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26