Mercurial > hg > xemacs-beta
annotate src/src-headers @ 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 | 3ecd8885ac67 |
| children | 308d34e9f07d |
| rev | line source |
|---|---|
| 428 | 1 : #-*- Perl -*- |
| 2 # Copyright (C) 1998 Free Software Foundation, Inc. | |
| 3 | |
| 4 # This file is part of XEmacs. | |
| 5 # | |
| 6 # XEmacs is free software; you can redistribute it and/or modify it | |
| 7 # under the terms of the GNU General Public License as published by the | |
| 8 # Free Software Foundation; either version 2, or (at your option) any | |
| 9 # later version. | |
| 10 # | |
| 11 # XEmacs is distributed in the hope that it will be useful, but WITHOUT | |
| 12 # ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | |
| 13 # FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | |
| 14 # for more details. | |
| 15 # | |
| 16 # You should have received a copy of the GNU General Public License | |
| 17 # along with XEmacs; see the file COPYING. If not, write to | |
| 18 # the Free Software Foundation, Inc., 59 Temple Place - Suite 330, | |
| 19 # Boston, MA 02111-1307, USA. | |
| 20 | |
| 21 # Author: Martin Buchholz | |
| 22 eval 'exec perl -w -S $0 ${1+"$@"}' | |
| 23 if 0; | |
| 24 | |
| 25 use strict; | |
| 26 my ($myName, $srcdir); | |
| 27 | |
| 28 ($myName = $0) =~ s@.*/@@; my $usage =" | |
| 29 Usage: $myName | |
| 30 | |
| 31 Generates header file fragments from the Emacs sources | |
| 32 and writes them to stdout.\n"; | |
| 33 | |
| 34 die $usage if @ARGV; | |
| 35 | |
| 36 ($srcdir = $0) =~ s@[^/]+$@@; | |
| 37 chdir $srcdir or die "$srcdir: $!"; | |
| 38 | |
| 39 # Find include dependencies | |
| 40 my (%exists, %uses); | |
| 41 opendir SRCDIR, "." or die "$srcdir: $!"; | |
| 42 for (grep (/\.[ch]$/, readdir (SRCDIR))) { $exists{$_} = 1; } | |
| 43 closedir SRCDIR; | |
| 44 { | |
| 45 my %generated_header; | |
| 46 for (qw (config.h sheap-adjust.h paths.h Emacs.ad.h)) { | |
| 47 $generated_header{$_} = 1; | |
| 48 } | |
| 49 | |
| 50 for my $file (keys %exists) { | |
| 51 open (FILE, $file) or die "$file: $!"; | |
| 52 undef $/; $_ = <FILE>; | |
| 53 RemoveComments ($_); | |
| 54 s/[ \t]+//g; | |
| 55 for (/^\#include([^\n]+)/gmo) { | |
| 56 if (m@^\"([A-Za-z0-9_-]+\.h)\"@) { | |
| 57 $uses{$file}{$1} = 1 if exists $exists{$1}; | |
| 58 } elsif (m@<([A-Za-z0-9_-]+\.h)>@) { | |
| 59 $uses{$file}{$1} = 1 if exists $generated_header{$1}; | |
| 60 } elsif (m@\"../lwlib/([A-Za-z0-9_-]+\.h)\"@) { | |
| 61 $uses{$file}{"\$(LWLIB_SRCDIR)/lwlib.h"} = 1; | |
| 62 } | |
| 63 } | |
| 64 } | |
| 65 | |
| 66 # Make transitive closure of %uses | |
| 67 while (1) { | |
| 68 my $changedP = 0; | |
| 69 for my $x (keys %uses) { | |
| 70 for my $y (keys %{$uses{$x}}) { | |
| 71 for my $z (keys %{$uses{$y}}) { | |
| 72 if (! exists $uses{$x}{$z}) { | |
| 73 $uses{$x}{$z} = 1; | |
| 74 $changedP = 1; | |
| 75 } | |
| 76 } | |
| 77 } | |
| 78 } | |
| 79 last if !$changedP; | |
| 80 } | |
| 81 } # End of finding include dependencies | |
| 82 | |
| 83 my (%used, %maxargs); | |
| 84 my $minargs = '(?:[0-8])'; | |
| 85 my $maxargs = '(?:[0-8]|MANY|UNEVALLED)'; | |
| 86 my $doc = "(?:0|STR)"; | |
| 87 my $fun = '(?:\\bF[a-z0-9_]+X?\\b)'; | |
| 88 my $defun = "^DEFUN\\s*\\(\\s+STR\\s+($fun)\\s+$minargs\\s+($maxargs)\\s+$doc\\s+\\("; | |
| 89 my $var = '(?:\\b(?:Q[KS]?[a-z0-9_]+D?|V(?:[a-z0-9_]+)|Q_TT[A-Z]+)\\b)'; | |
| 90 my $pat = "(?:$var|$fun)"; | |
| 91 my %automagic; | |
| 92 my (%decl_file, %defn_file); | |
| 93 | |
| 94 for my $file (keys %exists) { | |
| 95 open (FILE, $file) or die "$file: $!"; | |
| 96 undef $/; $_ = <FILE>; | |
| 97 RemoveComments($_); | |
| 98 RemoveStrings ($_); | |
| 99 s/,/ /gmo; | |
| 100 s/^\s*EXFUN[^\n]+//gmo; | |
| 101 | |
| 102 # Now search for DECLARE_LRECORD to find types for predicates | |
| 103 for my $sym (/^DECLARE_LRECORD\s*\(\s*([a-z_]+)\s+struct /gmo) { | |
| 104 $automagic{"Q${sym}p"} = 1; | |
| 105 } | |
| 106 | |
| 107 if ($file =~ /\.c$/) { | |
| 108 my @match = (/$defun/gmo); | |
| 109 while (my $fun = shift @match) { | |
| 110 $defn_file{$fun} = $file; | |
| 111 $maxargs{$fun} = shift @match; | |
| 112 } | |
| 113 | |
| 114 # Now do Lisp_Object variables | |
| 115 for my $defs (/^\s*Lisp_Object\s+((?:$var\s*)+)\s*;/gmo) { | |
| 116 for my $var (split (' ',$defs)) { | |
| 117 $defn_file{$var} = $file; | |
| 118 } | |
| 119 } | |
| 120 } | |
| 121 | |
| 122 # Remove declarations of Lisp_Objects | |
| 123 s/^extern\s+Lisp_Object\s+(?:$var\s*)+\s*;//gmo; | |
| 124 | |
| 125 # Remove declarations of functions | |
| 126 s/^Lisp_Object $fun//; | |
| 127 | |
| 128 # Find all uses of symbols | |
| 129 for (/($pat)/gmo) { $used{$_}{$file} = 1; } | |
| 130 } | |
| 131 | |
| 132 my %candidates; | |
| 133 for my $file (keys %exists) { | |
| 134 @{$candidates{$file}} = (); | |
| 135 my $header1 = $file; $header1 =~ s/\.c$/.h/; | |
| 136 my $header2 = $header1; $header2 =~ s/-\w+\././; | |
| 137 push @{$candidates{$file}}, $header1 if exists $exists{$header1}; | |
| 138 push @{$candidates{$file}}, $header2 if exists $exists{$header2} && | |
| 139 $header1 ne $header2; | |
| 140 } | |
| 141 | |
| 142 SYM: for my $sym (keys %used) { | |
| 143 next SYM unless my $defn_file = $defn_file{$sym}; | |
| 144 my @users = keys %{$used{$sym}}; | |
| 145 if (@users == 1) { | |
| 146 die "$sym\n" unless $defn_file eq $users[0]; | |
| 147 next SYM; | |
| 148 } | |
| 149 for my $candidate (@{$candidates{$defn_file}}) { | |
| 150 if (!grep (!exists $uses{$_}{$candidate}, @users)) { | |
| 151 $decl_file{$sym} = $candidate; | |
| 152 next SYM; | |
| 153 } | |
| 154 } | |
| 155 $decl_file{$sym} = 'lisp.h'; | |
| 156 } | |
| 157 | |
| 158 # Print global Lisp_Objects | |
| 159 { | |
| 160 my $line; | |
| 161 sub flushvars { | |
| 162 if (defined $line) { | |
| 163 print "extern Lisp_Object $line;\n"; | |
| 164 undef $line; | |
| 165 } | |
| 166 } | |
| 167 | |
| 168 sub printvar { | |
| 169 my $var = shift; | |
| 170 if (!defined $line) { $line = $var; return; } | |
| 171 if ($var =~ /^Vcharset_/) { | |
| 172 flushvars (); | |
| 173 $line = $var; | |
| 174 flushvars (); | |
| 175 return; | |
| 176 } | |
| 177 if (length "$line, $var" > 59) { | |
| 178 flushvars (); $line = $var; return; | |
| 179 } | |
| 180 $line = "$line, $var"; | |
| 181 } | |
| 182 END { flushvars (); } | |
| 183 } | |
| 184 | |
| 185 delete @decl_file{ keys %automagic, qw(Qzero Qnull_pointer)}; | |
| 186 | |
| 187 # Print Lisp_Object var declarations | |
| 188 for my $file (keys %exists) { | |
| 189 | |
| 190 # Print EXFUNs | |
| 191 if (my @funs = grep ($decl_file{$_} eq $file && exists $maxargs{$_}, | |
| 192 keys %decl_file)) { | |
| 193 print "\n\n$file:\n\n"; | |
| 194 for $fun (sort @funs) { | |
| 195 print "EXFUN ($fun, $maxargs{$fun});\n"; | |
| 196 } | |
| 197 print "\n"; | |
| 198 } | |
| 199 | |
| 200 if (my @vars = grep ($decl_file{$_} eq $file && /^[QV]/, keys %decl_file)) { | |
| 201 print "\n\n$file:\n\n"; | |
| 202 for $var (sort @vars) { | |
| 203 printvar ($var); | |
| 204 } | |
| 205 flushvars (); | |
| 206 print "\n\n"; | |
| 207 } | |
| 208 } | |
| 209 | |
| 210 #for my $var (sort grep (keys %{$used{$_}} > 1 , keys %defn_file)) { | |
| 211 # printvar ($var); | |
| 212 #} | |
| 213 | |
| 214 sub RemoveComments { | |
| 215 $_[0] =~ | |
| 216 s{ ( | |
| 217 [^\"\'/]+ | | |
| 218 (?:\"[^\"\\]*(?:\\.[^\"\\]*)*\" [^\"\'/]*)+ | | |
| 219 (?:\'[^\'\\]*(?:\\.[^\'\\]*)*\' [^\"\'/]*)+ | |
| 220 ) | |
| 221 | / (?: | |
| 222 \*[^*]*\*+(?:[^/*][^*]*\*+)*/ | |
| 223 | | |
| 224 /[^\n]* | |
| 225 ) | |
| 226 }{defined $1 ? $1 : ""}gsxeo; | |
| 227 } | |
| 228 | |
| 229 sub RemoveStrings { | |
| 230 $_[0] =~ | |
| 231 s{ ( | |
| 232 (?:\"[^\"\\]*(?:\\.[^\"\\]*)*\") | | |
| 233 (?:\'[^\'\\]*(?:\\.[^\'\\]*)*\') | |
| 234 ) | |
| 235 }{ STR }gxo; | |
| 236 } |