Fix warnings.

SVN revision: 32820

3 files changed, 8 insertions, 4 deletions

diff --git a/legacy/ecore/src/lib/ecore_imf/ecore_imf.c b/legacy/ecore/src/lib/ecore_imf/ecore_imf.c
index acf7e8d693..593cadc254 100644
--- a/legacy/ecore/src/lib/ecore_imf/ecore_imf.c
+++ b/legacy/ecore/src/lib/ecore_imf/ecore_imf.c
@@ -5,6 +5,9 @@
 #include "config.h"
 
 #include "Ecore_IMF.h"
+#include "ecore_imf_private.h"
+
+#include <Ecore.h>
 
 EAPI int ECORE_IMF_EVENT_PREEDIT_START = 0;
 EAPI int ECORE_IMF_EVENT_PREEDIT_END = 0;
diff --git a/legacy/ecore/src/lib/ecore_imf/ecore_imf_context.c b/legacy/ecore/src/lib/ecore_imf/ecore_imf_context.c
index 875bb2a8ec..cf5bf1a3d7 100644
--- a/legacy/ecore/src/lib/ecore_imf/ecore_imf_context.c
+++ b/legacy/ecore/src/lib/ecore_imf/ecore_imf_context.c
@@ -10,6 +10,8 @@
 #include "Ecore_IMF.h"
 #include "ecore_imf_private.h"
 
+#include <Ecore.h>
+
 /**
  * @defgroup Ecore_IMF_Context_Group Ecore Input Method Context Functions
  *
@@ -598,7 +600,7 @@ EAPI void *ecore_imf_context_data_get(Ecore_IMF_Context *ctx)
      {
         ECORE_MAGIC_FAIL(ctx, ECORE_MAGIC_CONTEXT,
                          "ecore_imf_context_data_get");
-        return;
+        return NULL;
      }
    return ctx->data;
 }
diff --git a/legacy/ecore/src/lib/ecore_imf/ecore_imf_module.c b/legacy/ecore/src/lib/ecore_imf/ecore_imf_module.c
index 7b7bc2e400..d6b0be120f 100644
--- a/legacy/ecore/src/lib/ecore_imf/ecore_imf_module.c
+++ b/legacy/ecore/src/lib/ecore_imf/ecore_imf_module.c
@@ -157,13 +157,12 @@ _ecore_imf_module_load_all(void)
    const Ecore_IMF_Context_Info *info = NULL;
    int (*imf_module_init)(const Ecore_IMF_Context_Info **info);
    Ecore_IMF_Context *(*imf_module_create)(void);
-   Ecore_IMF_Module *module;
 
    avail = ecore_plugin_available_get(ecore_imf_modules_path);
    if (!avail) return;
 
    ecore_list_first_goto(avail);
-   while (filename = ecore_list_next(avail))
+   while ((filename = ecore_list_next(avail)))
      {
         plugin = ecore_plugin_load(ecore_imf_modules_path, filename, NULL);
         if (!plugin)
@@ -187,7 +186,7 @@ _ecore_imf_module_load_all(void)
           {
              fprintf(stderr, "** ecore_imf: Error loading input method plugin %s! "
                              "Plugin with id='%s' already exists!",
-                     info->id);
+                     filename, info->id);
              ecore_plugin_unload(plugin);
              continue;
           }