mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-04-27 16:51:06 -07:00
Code Issues Projects Releases Wiki Activity

(xfree): Macro deleted.

Browse source 
Callers changed to use `free' directly.
This commit is contained in:
Richard M. Stallman 1996-01-25 22:00:11 +00:00
parent 0158abbc71
commit 002bbc0ed3
1 changed files with 18 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

38
src/xselect.c
View file

@ -1,5 +1,5 @@
/* X Selection processing for Emacs.
Copyright (C) 1993, 1994, 1995 Free Software Foundation.
Copyright (C) 1993, 1994, 1995, 1996 Free Software Foundation.
This file is part of GNU Emacs.
@ -28,8 +28,6 @@ Boston, MA 02111-1307, USA. */
#include "frame.h" /* Need this to get the X window of selected_frame */
#include "blockinput.h"
#define xfree free
#define CUT_BUFFER_SUPPORT
Lisp_Object QPRIMARY, QSECONDARY, QSTRING, QINTEGER, QCLIPBOARD, QTIMESTAMP,
@ -721,10 +719,10 @@ x_handle_selection_request (event)
/* Indicate we have successfully processed this event. */
x_selection_current_request = 0;
/* Use xfree, not XFree, because lisp_data_to_selection_data
/* Use free, not XFree, because lisp_data_to_selection_data
calls xmalloc itself. */
if (!nofree)
xfree (data);
free (data);
}
unbind_to (count, Qnil);
@ -921,7 +919,7 @@ unexpect_property_change (location)
prev->next = rest->next;
else
property_change_wait_list = rest->next;
xfree (rest);
free (rest);
return;
}
prev = rest;
@ -1010,7 +1008,7 @@ x_handle_property_notify (event)
prev->next = rest->next;
else
property_change_wait_list = rest->next;
xfree (rest);
free (rest);
return;
}
prev = rest;
@ -1155,7 +1153,7 @@ x_get_foreign_selection (selection_symbol, target_type)
/* Subroutines of x_get_window_property_as_lisp_data */
/* Use xfree, not XFree, to free the data obtained with this function. */
/* Use free, not XFree, to free the data obtained with this function. */
static void
x_get_window_property (display, window, property, data_ret, bytes_ret,
@ -1238,7 +1236,7 @@ x_get_window_property (display, window, property, data_ret, bytes_ret,
*bytes_ret = offset;
}
/* Use xfree, not XFree, to free the data obtained with this function. */
/* Use free, not XFree, to free the data obtained with this function. */
static void
receive_incremental_selection (display, window, property, target_type,
@ -1300,9 +1298,9 @@ receive_incremental_selection (display, window, property, target_type,
if (! waiting_for_other_props_on_window (display, window))
XSelectInput (display, window, STANDARD_EVENT_SET);
unexpect_property_change (wait_object);
/* Use xfree, not XFree, because x_get_window_property
/* Use free, not XFree, because x_get_window_property
calls xmalloc itself. */
if (tmp_data) xfree (tmp_data);
if (tmp_data) free (tmp_data);
break;
}
@ -1327,9 +1325,9 @@ receive_incremental_selection (display, window, property, target_type,
}
bcopy (tmp_data, (*data_ret) + offset, tmp_size_bytes);
offset += tmp_size_bytes;
/* Use xfree, not XFree, because x_get_window_property
/* Use free, not XFree, because x_get_window_property
calls xmalloc itself. */
xfree (tmp_data);
free (tmp_data);
}
}
@ -1385,9 +1383,9 @@ x_get_window_property_as_lisp_data (display, window, property, target_type,
unsigned int min_size_bytes = * ((unsigned int *) data);
BLOCK_INPUT;
/* Use xfree, not XFree, because x_get_window_property
/* Use free, not XFree, because x_get_window_property
calls xmalloc itself. */
xfree ((char *) data);
free ((char *) data);
UNBLOCK_INPUT;
receive_incremental_selection (display, window, property, target_type,
min_size_bytes, &data, &bytes,
@ -1405,9 +1403,9 @@ x_get_window_property_as_lisp_data (display, window, property, target_type,
val = selection_data_to_lisp_data (display, data, bytes,
actual_type, actual_format);
/* Use xfree, not XFree, because x_get_window_property
/* Use free, not XFree, because x_get_window_property
calls xmalloc itself. */
xfree ((char *) data);
free ((char *) data);
return val;
}
@ -1509,7 +1507,7 @@ selection_data_to_lisp_data (display, data, size, type, format)
}
/* Use xfree, not XFree, to free the data obtained with this function. */
/* Use free, not XFree, to free the data obtained with this function. */
static void
lisp_data_to_selection_data (display, obj,
@ -1996,9 +1994,9 @@ DEFUN ("x-get-cut-buffer-internal", Fx_get_cut_buffer_internal,
Fcons (make_number (format), Qnil))));
ret = (bytes ? make_string ((char *) data, bytes) : Qnil);
/* Use xfree, not XFree, because x_get_window_property
/* Use free, not XFree, because x_get_window_property
calls xmalloc itself. */
xfree (data);
free (data);
return ret;
}