Mercurial > hg > xemacs-beta

comparison src/fns.c @ 5050:6f2158fa75ed

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix quick-build, use asserts() in place of ABORT() -------------------- ChangeLog entries follow: -------------------- ChangeLog addition: 2010-02-20 Ben Wing <ben@xemacs.org> * configure.ac (XE_COMPLEX_ARG): Correct doc of --quick-build: It also doesn't check for Lisp shadows. src/ChangeLog addition: 2010-02-20 Ben Wing <ben@xemacs.org> * EmacsFrame.c: * EmacsFrame.c (EmacsFrameRecomputeCellSize): * alloca.c (i00afunc): * buffer.c: * buffer.c (MARKED_SLOT): * buffer.c (complex_vars_of_buffer): * cm.c: * cm.c (cmcheckmagic): * console.c: * console.c (MARKED_SLOT): * device-x.c: * device-x.c (x_get_visual_depth): * emacs.c (sort_args): * eval.c (throw_or_bomb_out): * event-stream.c: * event-stream.c (Fadd_timeout): * event-stream.c (Fadd_async_timeout): * event-stream.c (Frecent_keys): * events.c: * events.c (Fdeallocate_event): * events.c (event_pixel_translation): * extents.c: * extents.c (process_extents_for_insertion_mapper): * fns.c (Fbase64_encode_region): * fns.c (Fbase64_encode_string): * fns.c (Fbase64_decode_region): * fns.c (Fbase64_decode_string): * font-lock.c: * font-lock.c (find_context): * frame-x.c: * frame-x.c (x_wm_mark_shell_size_user_specified): * frame-x.c (x_wm_mark_shell_position_user_specified): * frame-x.c (x_wm_set_shell_iconic_p): * frame-x.c (x_wm_set_cell_size): * frame-x.c (x_wm_set_variable_size): * frame-x.c (x_wm_store_class_hints): * frame-x.c (x_wm_maybe_store_wm_command): * frame-x.c (x_initialize_frame_size): * frame.c (delete_frame_internal): * frame.c (change_frame_size_1): * free-hook.c (check_free): * free-hook.c (note_block_input): * free-hook.c (log_gcpro): * gccache-gtk.c (gc_cache_lookup): * gccache-x.c: * gccache-x.c (gc_cache_lookup): * glyphs-gtk.c: * glyphs-gtk.c (init_image_instance_from_gdk_pixmap): * glyphs-x.c: * glyphs-x.c (extract_xpm_color_names): * insdel.c: * insdel.c (move_gap): * keymap.c: * keymap.c (keymap_lookup_directly): * keymap.c (keymap_delete_inverse_internal): * keymap.c (accessible_keymaps_mapper_1): * keymap.c (where_is_recursive_mapper): * lisp.h: * lstream.c (make_lisp_buffer_stream_1): * macros.c: * macros.c (pop_kbd_macro_event): * mc-alloc.c (remove_page_from_used_list): * menubar-x.c: * menubar-x.c (set_frame_menubar): * ralloc.c: * ralloc.c (obtain): * ralloc.c (relinquish): * ralloc.c (relocate_blocs): * ralloc.c (resize_bloc): * ralloc.c (r_alloc_free): * ralloc.c (r_re_alloc): * ralloc.c (r_alloc_thaw): * ralloc.c (init_ralloc): * ralloc.c (Free_Addr_Block): * scrollbar-x.c: * scrollbar-x.c (x_update_scrollbar_instance_status): * sunplay.c (init_device): * unexnt.c: * unexnt.c (read_in_bss): * unexnt.c (map_in_heap): * window.c: * window.c (real_window): * window.c (window_display_lines): * window.c (window_display_buffer): * window.c (set_window_display_buffer): * window.c (unshow_buffer): * window.c (Fget_lru_window): if (...) ABORT(); ---> assert(); More specifically: if (x == y) ABORT (); --> assert (x != y); if (x != y) ABORT (); --> assert (x == y); if (x > y) ABORT (); --> assert (x <= y); etc. if (!x) ABORT (); --> assert (x); if (x) ABORT (); --> assert (!x); DeMorgan's Law's applied and manually simplified: if (x && !y) ABORT (); --> assert (!x || y); if (!x || y >= z) ABORT (); --> assert (x && y < z); Checked to make sure that assert() of an expression with side effects ensures that the side effects get executed even when asserts are disabled, and add a comment about this being a requirement of any "disabled assert" expression. * depend: * make-src-depend: * make-src-depend (PrintDeps): Fix broken code in make-src-depend so it does what it was always supposed to do, which was separate out config.h and lisp.h and all the files they include into separate variables in the depend part of Makefile so that quick-build can turn off the lisp.h/config.h/text.h/etc. dependencies of the source files, to speed up recompilation.
author Ben Wing <ben@xemacs.org>
date Sat, 20 Feb 2010 05:05:54 -0600
parents 0cd784a6ec44
children c3d372419e09
comparison
equal deleted inserted replaced
5030:422b4b4fb2a6 5050:6f2158fa75ed
4528 /* We needn't multiply allength with MAX_ICHAR_LEN because all the 4528 /* We needn't multiply allength with MAX_ICHAR_LEN because all the
4529 base64 characters will be single-byte. */ 4529 base64 characters will be single-byte. */
4530 encoded = (Ibyte *) MALLOC_OR_ALLOCA (allength); 4530 encoded = (Ibyte *) MALLOC_OR_ALLOCA (allength);
4531 encoded_length = base64_encode_1 (XLSTREAM (input), encoded, 4531 encoded_length = base64_encode_1 (XLSTREAM (input), encoded,
4532 NILP (no_line_break)); 4532 NILP (no_line_break));
4533 if (encoded_length > allength) 4533 assert (encoded_length <= allength);
4534 ABORT ();
4535 Lstream_delete (XLSTREAM (input)); 4534 Lstream_delete (XLSTREAM (input));
4536 4535
4537 /* Now we have encoded the region, so we insert the new contents 4536 /* Now we have encoded the region, so we insert the new contents
4538 and delete the old. (Insert first in order to preserve markers.) */ 4537 and delete the old. (Insert first in order to preserve markers.) */
4539 buffer_insert_raw_string_1 (buf, begv, encoded, encoded_length, 0); 4538 buffer_insert_raw_string_1 (buf, begv, encoded, encoded_length, 0);
4570 4569
4571 input = make_lisp_string_input_stream (string, 0, -1); 4570 input = make_lisp_string_input_stream (string, 0, -1);
4572 encoded = (Ibyte *) MALLOC_OR_ALLOCA (allength); 4571 encoded = (Ibyte *) MALLOC_OR_ALLOCA (allength);
4573 encoded_length = base64_encode_1 (XLSTREAM (input), encoded, 4572 encoded_length = base64_encode_1 (XLSTREAM (input), encoded,
4574 NILP (no_line_break)); 4573 NILP (no_line_break));
4575 if (encoded_length > allength) 4574 assert (encoded_length <= allength);
4576 ABORT ();
4577 Lstream_delete (XLSTREAM (input)); 4575 Lstream_delete (XLSTREAM (input));
4578 result = make_string (encoded, encoded_length); 4576 result = make_string (encoded, encoded_length);
4579 unbind_to (speccount); 4577 unbind_to (speccount);
4580 return result; 4578 return result;
4581 } 4579 }
4603 4601
4604 input = make_lisp_buffer_input_stream (buf, begv, zv, 0); 4602 input = make_lisp_buffer_input_stream (buf, begv, zv, 0);
4605 /* We need to allocate enough room for decoding the text. */ 4603 /* We need to allocate enough room for decoding the text. */
4606 decoded = (Ibyte *) MALLOC_OR_ALLOCA (length * MAX_ICHAR_LEN); 4604 decoded = (Ibyte *) MALLOC_OR_ALLOCA (length * MAX_ICHAR_LEN);
4607 decoded_length = base64_decode_1 (XLSTREAM (input), decoded, &cc_decoded_length); 4605 decoded_length = base64_decode_1 (XLSTREAM (input), decoded, &cc_decoded_length);
4608 if (decoded_length > length * MAX_ICHAR_LEN) 4606 assert (decoded_length <= length * MAX_ICHAR_LEN);
4609 ABORT ();
4610 Lstream_delete (XLSTREAM (input)); 4607 Lstream_delete (XLSTREAM (input));
4611 4608
4612 /* Now we have decoded the region, so we insert the new contents 4609 /* Now we have decoded the region, so we insert the new contents
4613 and delete the old. (Insert first in order to preserve markers.) */ 4610 and delete the old. (Insert first in order to preserve markers.) */
4614 BUF_SET_PT (buf, begv); 4611 BUF_SET_PT (buf, begv);
4644 decoded = (Ibyte *) MALLOC_OR_ALLOCA (length * MAX_ICHAR_LEN); 4641 decoded = (Ibyte *) MALLOC_OR_ALLOCA (length * MAX_ICHAR_LEN);
4645 4642
4646 input = make_lisp_string_input_stream (string, 0, -1); 4643 input = make_lisp_string_input_stream (string, 0, -1);
4647 decoded_length = base64_decode_1 (XLSTREAM (input), decoded, 4644 decoded_length = base64_decode_1 (XLSTREAM (input), decoded,
4648 &cc_decoded_length); 4645 &cc_decoded_length);
4649 if (decoded_length > length * MAX_ICHAR_LEN) 4646 assert (decoded_length <= length * MAX_ICHAR_LEN);
4650 ABORT ();
4651 Lstream_delete (XLSTREAM (input)); 4647 Lstream_delete (XLSTREAM (input));
4652 4648
4653 result = make_string (decoded, decoded_length); 4649 result = make_string (decoded, decoded_length);
4654 unbind_to (speccount); 4650 unbind_to (speccount);
4655 return result; 4651 return result;