[EGIT] [core/efl] master 02/02: Evas GL: string_query returns a const char *

[Jean-Philippe ANDRÉ]

jpeg pushed a commit to branch master.

http://git.enlightenment.org/core/efl.git/commit/?id=5a9d8d6f032b816cd435aacef49af8b86375400b

commit 5a9d8d6f032b816cd435aacef49af8b86375400b
Author: Jean-Philippe Andre <jp.an...@samsung.com>
Date:   Fri Oct 24 20:52:09 2014 +0900

    Evas GL: string_query returns a const char *
    
    Why cast to/from void* in the first place?
---
 src/lib/evas/canvas/evas_gl.c                           | 2 +-
 src/lib/evas/include/evas_private.h                     | 2 +-
 src/modules/evas/engines/gl_generic/evas_engine.c       | 4 ++--
 src/modules/evas/engines/software_generic/evas_engine.c | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/lib/evas/canvas/evas_gl.c b/src/lib/evas/canvas/evas_gl.c
index 98b95e0..3373bb4 100644
--- a/src/lib/evas/canvas/evas_gl.c
+++ b/src/lib/evas/canvas/evas_gl.c
@@ -517,7 +517,7 @@ evas_gl_string_query(Evas_GL *evas_gl, int name)
    return "";
    MAGIC_CHECK_END();
 
-   return (const char 
*)evas_gl->evas->engine.func->gl_string_query(evas_gl->evas->engine.data.output,
 name);
+   return 
evas_gl->evas->engine.func->gl_string_query(evas_gl->evas->engine.data.output, 
name);
 }
 
 EAPI Evas_GL_Func
diff --git a/src/lib/evas/include/evas_private.h 
b/src/lib/evas/include/evas_private.h
index 6f715b4..eff901b 100644
--- a/src/lib/evas/include/evas_private.h
+++ b/src/lib/evas/include/evas_private.h
@@ -1250,7 +1250,7 @@ struct _Evas_Func
    void *(*gl_context_create)            (void *data, void *share_context, int 
version);
    int  (*gl_context_destroy)            (void *data, void *context);
    int  (*gl_make_current)               (void *data, void *surface, void 
*context);
-   void *(*gl_string_query)              (void *data, int name);
+   const char *(*gl_string_query)        (void *data, int name);
    void *(*gl_proc_address_get)          (void *data, const char *name);
    int  (*gl_native_surface_get)         (void *data, void *surface, void 
*native_surface);
    void *(*gl_api_get)                   (void *data, int version);
diff --git a/src/modules/evas/engines/gl_generic/evas_engine.c 
b/src/modules/evas/engines/gl_generic/evas_engine.c
index b2a1ea1..9cfddd1 100644
--- a/src/modules/evas/engines/gl_generic/evas_engine.c
+++ b/src/modules/evas/engines/gl_generic/evas_engine.c
@@ -1199,11 +1199,11 @@ eng_gl_rotation_angle_get(void *data)
    return evgl_engine->funcs->rotation_angle_get(data);
 }
 
-static void *
+static const char *
 eng_gl_string_query(void *data, int name)
 {
    EVGLINIT(data, NULL);
-   return (void *)evgl_string_query(name);
+   return evgl_string_query(name);
 }
 
 // Need to deprecate this function..
diff --git a/src/modules/evas/engines/software_generic/evas_engine.c 
b/src/modules/evas/engines/software_generic/evas_engine.c
index f6b3420..48e063d 100644
--- a/src/modules/evas/engines/software_generic/evas_engine.c
+++ b/src/modules/evas/engines/software_generic/evas_engine.c
@@ -2559,7 +2559,7 @@ eng_gl_make_current(void *data EINA_UNUSED, void 
*surface, void *context)
 }
 
 // FIXME!!! Implement later
-static void *
+static const char *
 eng_gl_string_query(void *data EINA_UNUSED, int name EINA_UNUSED)
 {
    return NULL;

--