procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Simplify XDND code

Browse source 
* src/xfns.c (Fx_begin_drag): Use SAFE_ALLOCA_STRING and encode
strings in the right coding system.
This commit is contained in:
Po Lu 2022-05-10 10:38:08 +08:00
parent 054062060e
commit 20b27d475f
1 changed files with 4 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/xfns.c
View file

@ -6822,14 +6822,12 @@ mouse buttons are released on top of FRAME. */)
{
struct frame *f = decode_window_system_frame (frame);
int ntargets = 0, nnames = 0;
ptrdiff_t len;
char *target_names[2048];
Atom *target_atoms;
Lisp_Object lval, original, tem, t1, t2;
Atom xaction;
Atom action_list[2048];
char *name_list[2048];
char *scratch;
USE_SAFE_ALLOCA;
@ -6843,10 +6841,8 @@ mouse buttons are released on top of FRAME. */)
if (ntargets < 2048)
{
scratch = SSDATA (XCAR (targets));
len = strlen (scratch);
target_names[ntargets] = SAFE_ALLOCA (len + 1);
strncpy (target_names[ntargets], scratch, len + 1);
SAFE_ALLOCA_STRING (target_names[ntargets],
XCAR (targets));
ntargets++;
}
else
@ -6896,10 +6892,8 @@ mouse buttons are released on top of FRAME. */)
else
signal_error ("Invalid drag-and-drop action", tem);
scratch = SSDATA (ENCODE_UTF_8 (t2));
len = strlen (scratch);
name_list[nnames] = SAFE_ALLOCA (len + 1);
strncpy (name_list[nnames], scratch, len + 1);
SAFE_ALLOCA_STRING (name_list[nnames],
ENCODE_SYSTEM (t2));
nnames++;
}