discomfitor pushed a commit to branch master.

http://git.enlightenment.org/core/efl.git/commit/?id=0f46b8d7ec388a17206d6f9434b033603ab04190

commit 0f46b8d7ec388a17206d6f9434b033603ab04190
Author: discomfitor <michael.blumenkra...@gmail.com>
Date:   Thu Dec 12 09:31:08 2013 -0500

    fix ecore-x shadow warning
---
 src/lib/ecore_x/xlib/ecore_x_selection.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/lib/ecore_x/xlib/ecore_x_selection.c 
b/src/lib/ecore_x/xlib/ecore_x_selection.c
index 13a24fc..6e38fcf 100644
--- a/src/lib/ecore_x/xlib/ecore_x_selection.c
+++ b/src/lib/ecore_x/xlib/ecore_x_selection.c
@@ -599,11 +599,11 @@ ecore_x_selection_converter_text(char *target,
                                    &text_prop) == Success)
      {
         int bufsize = strlen((char *)text_prop.value);
-        char *s = malloc(bufsize + 1);
-        if (!s) return EINA_FALSE;
-        *data_ret = s;
-        memcpy(s, text_prop.value, bufsize);
-        s[bufsize] = 0;
+        char *str = malloc(bufsize + 1);
+        if (!str) return EINA_FALSE;
+        *data_ret = str;
+        memcpy(str, text_prop.value, bufsize);
+        str[bufsize] = 0;
         *size_ret = bufsize;
         XFree(text_prop.value);
         return EINA_TRUE;

-- 


Reply via email to