From 2dba2e72b76ba2933d6ca7d3e79ad669c430e3a5 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Wed, 8 Jan 2014 17:39:12 +1100 Subject: Code Cleanup: de-duplicate text pasting which only used the first line --- source/blender/makesrna/intern/rna_wm.c | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) (limited to 'source/blender/makesrna/intern/rna_wm.c') diff --git a/source/blender/makesrna/intern/rna_wm.c b/source/blender/makesrna/intern/rna_wm.c index 15cb06b313e..0eda2662e43 100644 --- a/source/blender/makesrna/intern/rna_wm.c +++ b/source/blender/makesrna/intern/rna_wm.c @@ -831,10 +831,11 @@ static int rna_KeyMapItem_userdefined_get(PointerRNA *ptr) static void rna_wmClipboard_get(PointerRNA *UNUSED(ptr), char *value) { char *pbuf; + int pbuf_len; - pbuf = WM_clipboard_text_get(FALSE); + pbuf = WM_clipboard_text_get(false, &pbuf_len); if (pbuf) { - strcpy(value, pbuf); + memcpy(value, pbuf, pbuf_len + 1); MEM_freeN(pbuf); } else { @@ -845,19 +846,14 @@ static void rna_wmClipboard_get(PointerRNA *UNUSED(ptr), char *value) static int rna_wmClipboard_length(PointerRNA *UNUSED(ptr)) { char *pbuf; - int length; + int pbuf_len; - pbuf = WM_clipboard_text_get(FALSE); + pbuf = WM_clipboard_text_get(false, &pbuf_len); if (pbuf) { - length = strlen(pbuf); MEM_freeN(pbuf); } - else { - length = 0; - } - - return length; + return pbuf_len; } static void rna_wmClipboard_set(PointerRNA *UNUSED(ptr), const char *value) -- cgit v1.2.3