diff options
| author | Jim Meyering <jim@meyering.net> | 2008-06-02 06:09:17 +0000 |
|---|---|---|
| committer | Jim Meyering <jim@meyering.net> | 2008-06-02 06:09:17 +0000 |
| commit | 70fdbb46cd40f9376333e10c9284873d3a3a787f (patch) | |
| tree | d087a93bc6d9be911fce5e28e1112f6c5dfddb09 /src/frame.c | |
| parent | 5c19cd0bbb8f3b8142c0b8f90eebdd84b7a3eb29 (diff) | |
| download | emacs-70fdbb46cd40f9376333e10c9284873d3a3a787f.tar.gz | |
Make "xfree (NULL)" a no-op; remove useless if-before-xfree.
* src/alloc.c (xfree): Return right away for a NULL arg.
* src/lread.c (nosuffix): Remove now-useless if-before-xfree tests.
* src/gtkutil.c (xg_gtk_scroll_destroy): Likewise.
* src/mac.c (create_apple_event_from_event_ref): Likewise.
(create_apple_event_from_drag_ref, cfstring_create_normalized): Likewise.
* src/doprnt.c (doprnt1): Likewise.
* src/frame.c (frame): Likewise.
* src/keyboard.c (wipe_kboard): Likewise.
* src/macterm.c (x_free_frame_resources, xlfdpat_destroy, XFreePixmap):
(init_font_name_table, mac_unload_font, x_delete_display): Likewise.
* src/term.c (tty_default_color_capabilities, maybe_fatal)
(delete_tty): Likewise.
* src/w16select.c (string): Likewise.
* src/w32.c (w32_get_resource, SET_ENV_BUF_SIZE): Likewise.
* src/w32bdf.c (w32_free_bdf_font): Likewise.
* src/w32fns.c (w32_unload_font): Likewise.
* src/w32font.c (w32font_close): Likewise.
* src/window.c (size_window): Likewise.
* src/xselect.c (receive_incremental_selection): Likewise.
* src/xterm.c (x_free_frame_resources, x_delete_display): Likewise.
* src/mactoolbox.c (create_apple_event_from_drag_ref): Likewise.
* src/w32.c (stat): Likewise.
Diffstat (limited to 'src/frame.c')
| -rw-r--r-- | src/frame.c | 21 |
1 files changed, 7 insertions, 14 deletions
diff --git a/src/frame.c b/src/frame.c index 20812878c10..84a4e54d314 100644 --- a/src/frame.c +++ b/src/frame.c @@ -1477,20 +1477,13 @@ But FORCE inhibits this too. */) Vframe_list = Fdelq (frame, Vframe_list); FRAME_SET_VISIBLE (f, 0); - if (f->namebuf) - xfree (f->namebuf); - if (f->decode_mode_spec_buffer) - xfree (f->decode_mode_spec_buffer); - if (FRAME_INSERT_COST (f)) - xfree (FRAME_INSERT_COST (f)); - if (FRAME_DELETEN_COST (f)) - xfree (FRAME_DELETEN_COST (f)); - if (FRAME_INSERTN_COST (f)) - xfree (FRAME_INSERTN_COST (f)); - if (FRAME_DELETE_COST (f)) - xfree (FRAME_DELETE_COST (f)); - if (FRAME_MESSAGE_BUF (f)) - xfree (FRAME_MESSAGE_BUF (f)); + xfree (f->namebuf); + xfree (f->decode_mode_spec_buffer); + xfree (FRAME_INSERT_COST (f)); + xfree (FRAME_DELETEN_COST (f)); + xfree (FRAME_INSERTN_COST (f)); + xfree (FRAME_DELETE_COST (f)); + xfree (FRAME_MESSAGE_BUF (f)); /* Since some events are handled at the interrupt level, we may get an event for f at any time; if we zero out the frame's terminal |