comparison src/alloc.c @ 4976:16112448d484

Rename xfree(FOO, TYPE) -> xfree(FOO) -------------------- ChangeLog entries follow: -------------------- src/ChangeLog addition: 2010-02-04 Ben Wing <ben@xemacs.org> * alloc.c (release_breathing_space): * alloc.c (resize_string): * alloc.c (sweep_lcrecords_1): * alloc.c (SWEEP_FIXED_TYPE_BLOCK_1): * alloc.c (ADDITIONAL_FREE_compiled_function): * alloc.c (compact_string_chars): * alloc.c (ADDITIONAL_FREE_string): * alloc.c (sweep_strings): * alloca.c (xemacs_c_alloca): * alsaplay.c (alsa_play_sound_file): * buffer.c (init_initial_directory): * buffer.h: * buffer.h (BUFFER_FREE): * console-stream.c (stream_delete_console): * console-tty.c (free_tty_console_struct): * data.c (Fnumber_to_string): * device-gtk.c (gtk_init_device): * device-gtk.c (free_gtk_device_struct): * device-gtk.c (gtk_delete_device): * device-msw.c (mswindows_delete_device): * device-msw.c (msprinter_delete_device): * device-tty.c (free_tty_device_struct): * device-tty.c (tty_delete_device): * device-x.c (x_init_device): * device-x.c (free_x_device_struct): * device-x.c (x_delete_device): * dialog-msw.c (handle_directory_dialog_box): * dialog-x.c (dbox_descriptor_to_widget_value): * dired-msw.c (Fmswindows_insert_directory): * dired.c (free_user_cache): * dired.c (user_name_completion_unwind): * doc.c (unparesseuxify_doc_string): * doc.c (Fsubstitute_command_keys): * doprnt.c (emacs_doprnt_1): * dumper.c (pdump_load_finish): * dumper.c (pdump_file_free): * dumper.c (pdump_file_unmap): * dynarr.c: * dynarr.c (Dynarr_free): * editfns.c (uncache_home_directory): * editfns.c (Fset_time_zone_rule): * elhash.c: * elhash.c (pdump_reorganize_hash_table): * elhash.c (maphash_unwind): * emacs.c (make_arg_list_1): * emacs.c (free_argc_argv): * emacs.c (sort_args): * emacs.c (Frunning_temacs_p): * emodules.c (attempt_module_delete): * eval.c (free_pointer): * event-Xt.c (unselect_filedesc): * event-Xt.c (emacs_Xt_select_process): * event-gtk.c (unselect_filedesc): * event-gtk.c (dragndrop_data_received): * event-msw.c (winsock_closer): * event-msw.c (mswindows_dde_callback): * event-msw.c (mswindows_wnd_proc): * event-stream.c (finalize_command_builder): * event-stream.c (free_command_builder): * extents.c (free_gap_array): * extents.c (free_extent_list): * extents.c (free_soe): * extents.c (extent_fragment_delete): * extents.c (extent_priority_sort_function): * file-coding.c (make_coding_system_1): * file-coding.c (coding_finalizer): * file-coding.c (set_coding_stream_coding_system): * file-coding.c (chain_finalize_coding_stream_1): * file-coding.c (chain_finalize): * file-coding.c (free_detection_state): * file-coding.c (coding_category_symbol_to_id): * fileio.c: * fileio.c (Ffile_name_directory): * fileio.c (if): * fileio.c (Ffile_symlink_p): * filelock.c (FREE_LOCK_INFO): * filelock.c (current_lock_owner): * font-mgr.c (Ffc_name_unparse): * font-mgr.c (Ffc_pattern_duplicate): * frame-gtk.c (gtk_delete_frame): * frame-msw.c (mswindows_delete_frame): * frame-msw.c (msprinter_delete_frame): * frame-x.c (x_cde_destroy_callback): * frame-x.c (Fcde_start_drag_internal): * frame-x.c (x_cde_transfer_callback): * frame-x.c (x_delete_frame): * frame.c (update_frame_title): * frame.c (Fset_frame_pointer): * gc.c (register_for_finalization): * gccache-gtk.c (free_gc_cache): * gccache-gtk.c (gc_cache_lookup): * gccache-x.c (free_gc_cache): * gccache-x.c (gc_cache_lookup): * glyphs-eimage.c: * glyphs-eimage.c (jpeg_instantiate_unwind): * glyphs-eimage.c (gif_instantiate_unwind): * glyphs-eimage.c (png_instantiate_unwind): * glyphs-eimage.c (png_instantiate): * glyphs-eimage.c (tiff_instantiate_unwind): * glyphs-gtk.c (convert_EImage_to_GDKImage): * glyphs-gtk.c (gtk_finalize_image_instance): * glyphs-gtk.c (gtk_init_image_instance_from_eimage): * glyphs-gtk.c (gtk_xpm_instantiate): * glyphs-msw.c (convert_EImage_to_DIBitmap): * glyphs-msw.c (mswindows_init_image_instance_from_eimage): * glyphs-msw.c (mswindows_initialize_image_instance_mask): * glyphs-msw.c (xpm_to_eimage): * glyphs-msw.c (mswindows_xpm_instantiate): * glyphs-msw.c (xbm_create_bitmap_from_data): * glyphs-msw.c (mswindows_finalize_image_instance): * glyphs-x.c (convert_EImage_to_XImage): * glyphs-x.c (x_finalize_image_instance): * glyphs-x.c (x_init_image_instance_from_eimage): * glyphs-x.c (x_xpm_instantiate): * gui-x.c (free_popup_widget_value_tree): * hash.c (free_hash_table): * hash.c (grow_hash_table): * hash.c (pregrow_hash_table_if_necessary): * imgproc.c (build_EImage_quantable): * insdel.c (uninit_buffer_text): * intl-win32.c (convert_multibyte_to_internal_malloc): * intl.c: * intl.c (Fset_current_locale): * keymap.c: * keymap.c (where_is_recursive_mapper): * keymap.c (where_is_internal): * lisp.h: * lisp.h (xfree): * lstream.c (Lstream_close): * lstream.c (resizing_buffer_closer): * mule-coding.c: * mule-coding.c (iso2022_finalize_detection_state): * nt.c: * nt.c (mswindows_get_long_filename): * nt.c (nt_get_resource): * nt.c (init_mswindows_environment): * nt.c (get_cached_volume_information): * nt.c (mswindows_opendir): * nt.c (mswindows_closedir): * nt.c (mswindows_readdir): * nt.c (mswindows_stat): * nt.c (mswindows_getdcwd): * nt.c (Fmswindows_long_file_name): * ntplay.c (nt_play_sound_file): * ntplay.c (play_sound_data_1): * number-gmp.c (gmp_free): * number-gmp.c (init_number_gmp): * number-mp.c (bignum_to_string): * number-mp.c (BIGNUM_TO_TYPE): * number.c (bignum_print): * number.c (bignum_convfree): * number.c (ratio_print): * number.c (bigfloat_print): * number.c (bigfloat_finalize): * objects-gtk.c (gtk_finalize_color_instance): * objects-gtk.c (gtk_finalize_font_instance): * objects-msw.c (mswindows_finalize_color_instance): * objects-msw.c (mswindows_finalize_font_instance): * objects-tty.c (tty_finalize_color_instance): * objects-tty.c (tty_finalize_font_instance): * objects-tty.c (tty_font_list): * objects-x.c (x_finalize_color_instance): * objects-x.c (x_finalize_font_instance): * process.c: * process.c (finalize_process): * realpath.c: * redisplay.c (add_propagation_runes): * regex.c: * regex.c (xfree): * regex.c (REGEX_FREE_STACK): * regex.c (FREE_STACK_RETURN): * regex.c (regex_compile): * regex.c (regexec): * regex.c (regfree): * scrollbar-gtk.c (gtk_free_scrollbar_instance): * scrollbar-gtk.c (gtk_release_scrollbar_instance): * scrollbar-msw.c (mswindows_free_scrollbar_instance): * scrollbar-msw.c (unshow_that_mofo): * scrollbar-x.c (x_free_scrollbar_instance): * scrollbar-x.c (x_release_scrollbar_instance): * select-gtk.c (emacs_gtk_selection_handle): * select-msw.c (mswindows_own_selection): * select-x.c: * select-x.c (x_handle_selection_request): * select-x.c (unexpect_property_change): * select-x.c (x_handle_property_notify): * select-x.c (receive_incremental_selection): * select-x.c (x_get_window_property_as_lisp_data): * select-x.c (Fx_get_cutbuffer_internal): * specifier.c (finalize_specifier): * syntax.c (uninit_buffer_syntax_cache): * sysdep.c (qxe_allocating_getcwd): * sysdep.c (qxe_lstat): * sysdep.c (copy_in_passwd): * sysdep.c (qxe_ctime): * sysdep.c (closedir): * sysdep.c (DIRSIZ): * termcap.c (tgetent): * termcap.c (tprint): * tests.c (Ftest_data_format_conversion): * text.c (new_dfc_convert_copy_data): * text.h (eifree): * text.h (eito_alloca): * text.h (eito_external): * toolbar-msw.c (mswindows_output_toolbar): * ui-gtk.c (CONVERT_RETVAL): * ui-gtk.c (__allocate_object_storage): * unicode.c (free_from_unicode_table): * unicode.c (free_to_unicode_table): * unicode.c (free_charset_unicode_tables): * win32.c (mswindows_read_link_1): Rename: xfree(VAL, TYPE)->xfree(VAL) Command used: gr 'xfree *\((.*),.*\);' 'xfree (\1);' *.[ch] Followed by grepping for 'xfree.*,' and fixing anything left. Rationale: Having to specify the TYPE argument is annoying and error-prone. It was originally put in to work around warnings due to strict aliasing but years and years ago I rewrote it in a way that doesn't use the TYPE argument at all and no one has complained since then. (And anyway, XEmacs is far from ever being in compliance with strict aliasing and would require far-reaching changes to get that way.)
author Ben Wing <ben@xemacs.org>
date Thu, 04 Feb 2010 07:28:14 -0600
parents cbe181529c34
children 2ade80e8c640
comparison
equal deleted inserted replaced
4972:c448f4c38d65 4976:16112448d484
227 { 227 {
228 if (breathing_space) 228 if (breathing_space)
229 { 229 {
230 void *tmp = breathing_space; 230 void *tmp = breathing_space;
231 breathing_space = 0; 231 breathing_space = 0;
232 xfree (tmp, void *); 232 xfree (tmp);
233 } 233 }
234 } 234 }
235 #endif /* not NEW_GC */ 235 #endif /* not NEW_GC */
236 236
237 static void 237 static void
2646 memcpy (new_data, old_data, pos); 2646 memcpy (new_data, old_data, pos);
2647 memcpy (new_data + pos + delta, old_data + pos, 2647 memcpy (new_data + pos + delta, old_data + pos,
2648 XSTRING_LENGTH (s) + 1 - pos); 2648 XSTRING_LENGTH (s) + 1 - pos);
2649 } 2649 }
2650 XSET_STRING_DATA (s, new_data); 2650 XSET_STRING_DATA (s, new_data);
2651 xfree (old_data, Ibyte *); 2651 xfree (old_data);
2652 } 2652 }
2653 } 2653 }
2654 else /* old string is small */ 2654 else /* old string is small */
2655 { 2655 {
2656 if (oldfullsize == newfullsize) 2656 if (oldfullsize == newfullsize)
3558 { 3558 {
3559 struct old_lcrecord_header *next = header->next; 3559 struct old_lcrecord_header *next = header->next;
3560 *prev = next; 3560 *prev = next;
3561 tick_lcrecord_stats (h, 1); 3561 tick_lcrecord_stats (h, 1);
3562 /* used to call finalizer right here. */ 3562 /* used to call finalizer right here. */
3563 xfree (header, struct old_lcrecord_header *); 3563 xfree (header);
3564 header = next; 3564 header = next;
3565 } 3565 }
3566 } 3566 }
3567 *used = num_used; 3567 *used = num_used;
3568 /* *total = total_size; */ 3568 /* *total = total_size; */
3682 current_##typename##_block_index \ 3682 current_##typename##_block_index \
3683 = countof (current_##typename##_block->block); \ 3683 = countof (current_##typename##_block->block); \
3684 SFTB_current = SFTB_current->prev; \ 3684 SFTB_current = SFTB_current->prev; \
3685 { \ 3685 { \
3686 *SFTB_prev = SFTB_current; \ 3686 *SFTB_prev = SFTB_current; \
3687 xfree (SFTB_victim_block, struct typename##_block *); \ 3687 xfree (SFTB_victim_block); \
3688 /* Restore free list to what it was before victim was swept */ \ 3688 /* Restore free list to what it was before victim was swept */ \
3689 typename##_free_list = SFTB_old_free_list; \ 3689 typename##_free_list = SFTB_old_free_list; \
3690 num_free -= SFTB_limit; \ 3690 num_free -= SFTB_limit; \
3691 } \ 3691 } \
3692 } \ 3692 } \
3788 static void 3788 static void
3789 sweep_compiled_functions (void) 3789 sweep_compiled_functions (void)
3790 { 3790 {
3791 #define UNMARK_compiled_function(ptr) UNMARK_RECORD_HEADER (&((ptr)->lheader)) 3791 #define UNMARK_compiled_function(ptr) UNMARK_RECORD_HEADER (&((ptr)->lheader))
3792 #define ADDITIONAL_FREE_compiled_function(ptr) \ 3792 #define ADDITIONAL_FREE_compiled_function(ptr) \
3793 if (ptr->args_in_array) xfree (ptr->args, Lisp_Object *) 3793 if (ptr->args_in_array) xfree (ptr->args)
3794 3794
3795 SWEEP_FIXED_TYPE_BLOCK (compiled_function, Lisp_Compiled_Function); 3795 SWEEP_FIXED_TYPE_BLOCK (compiled_function, Lisp_Compiled_Function);
3796 } 3796 }
3797 3797
3798 static void 3798 static void
4221 struct string_chars_block *victim; 4221 struct string_chars_block *victim;
4222 4222
4223 for (victim = to_sb->next; victim; ) 4223 for (victim = to_sb->next; victim; )
4224 { 4224 {
4225 struct string_chars_block *next = victim->next; 4225 struct string_chars_block *next = victim->next;
4226 xfree (victim, struct string_chars_block *); 4226 xfree (victim);
4227 victim = next; 4227 victim = next;
4228 } 4228 }
4229 4229
4230 current_string_chars_block = to_sb; 4230 current_string_chars_block = to_sb;
4231 current_string_chars_block->pos = to_pos; 4231 current_string_chars_block->pos = to_pos;
4281 debug_string_purity_print (wrap_string (p)); \ 4281 debug_string_purity_print (wrap_string (p)); \
4282 } while (0) 4282 } while (0)
4283 #define ADDITIONAL_FREE_string(ptr) do { \ 4283 #define ADDITIONAL_FREE_string(ptr) do { \
4284 Bytecount size = ptr->size_; \ 4284 Bytecount size = ptr->size_; \
4285 if (BIG_STRING_SIZE_P (size)) \ 4285 if (BIG_STRING_SIZE_P (size)) \
4286 xfree (ptr->data_, Ibyte *); \ 4286 xfree (ptr->data_); \
4287 } while (0) 4287 } while (0)
4288 4288
4289 SWEEP_FIXED_TYPE_BLOCK_1 (string, Lisp_String, u.lheader); 4289 SWEEP_FIXED_TYPE_BLOCK_1 (string, Lisp_String, u.lheader);
4290 4290
4291 gc_count_num_short_string_in_use = num_small_used; 4291 gc_count_num_short_string_in_use = num_small_used;