there is a free() that is added in that patch

Vincent

On Mon, 25 Jul 2011, Enlightenment SVN wrote:

> Log:
> ecore-imf: Fix warnings
>
>  Signed-off-by: Naruto TAKAHASHI <tnar...@gmail.com>
>
> Author:       mike_m
> Date:         2011-07-25 00:16:54 -0700 (Mon, 25 Jul 2011)
> New Revision: 61665
> Trac:         http://trac.enlightenment.org/e/changeset/61665
>
> Modified:
>  trunk/ecore/src/modules/immodules/xim/ecore_imf_xim.c
>
> Modified: trunk/ecore/src/modules/immodules/xim/ecore_imf_xim.c
> ===================================================================
> --- trunk/ecore/src/modules/immodules/xim/ecore_imf_xim.c     2011-07-25 
> 06:36:59 UTC (rev 61664)
> +++ trunk/ecore/src/modules/immodules/xim/ecore_imf_xim.c     2011-07-25 
> 07:16:54 UTC (rev 61665)
> @@ -358,8 +358,10 @@
>    if(state & ECORE_IMF_KEYBOARD_LOCK_CAPS)
>      locks |= LockMask;
>
> +#if 0                           /* FIXME: add mask. */
>    if(state & ECORE_IMF_KEYBOARD_LOCK_SCROLL)
> -     ;  /* XXX */
> +     ;
> +#endif
>
>    return locks;
> }
> @@ -666,14 +668,15 @@
>    if(imf_context_data->ic)
>      XDestroyIC(imf_context_data->ic);
>
> +   free(imf_context_data->preedit_chars);
>    free(imf_context_data->locale);
>    free(imf_context_data);
> }
>
> static int
> -preedit_start_callback(XIC      xic,
> +preedit_start_callback(XIC      xic __UNUSED__,
>                        XPointer client_data,
> -                       XPointer call_data)
> +                       XPointer call_data __UNUSED__)
> {
>    EINA_LOG_DBG("in");
>    Ecore_IMF_Context *ctx = (Ecore_IMF_Context *)client_data;
> @@ -687,9 +690,9 @@
> }
>
> static void
> -preedit_done_callback(XIC      xic,
> +preedit_done_callback(XIC      xic __UNUSED__,
>                       XPointer client_data,
> -                      XPointer call_data)
> +                      XPointer call_data __UNUSED__)
> {
>    EINA_LOG_DBG("in");
>    Ecore_IMF_Context *ctx = (Ecore_IMF_Context *)client_data;
> @@ -708,7 +711,7 @@
>
> /* FIXME */
> static int
> -xim_text_to_utf8(Ecore_IMF_Context *ctx,
> +xim_text_to_utf8(Ecore_IMF_Context *ctx __UNUSED__,
>                  XIMText           *xim_text,
>                  char             **text)
> {
> @@ -750,7 +753,7 @@
> }
>
> static void
> -preedit_draw_callback(XIC                           xic,
> +preedit_draw_callback(XIC                           xic __UNUSED__,
>                       XPointer                      client_data,
>                       XIMPreeditDrawCallbackStruct *call_data)
> {
> @@ -829,7 +832,7 @@
> }
>
> static void
> -preedit_caret_callback(XIC                            xic,
> +preedit_caret_callback(XIC                            xic __UNUSED__,
>                        XPointer                       client_data,
>                        XIMPreeditCaretCallbackStruct *call_data)
> {
> @@ -1053,8 +1056,8 @@
> }
>
> static void
> -xim_info_display_closed(Ecore_X_Display *display,
> -                        int              is_error,
> +xim_info_display_closed(Ecore_X_Display *display __UNUSED__,
> +                        int              is_error __UNUSED__,
>                         XIM_Im_Info     *info)
> {
>    Eina_List *ics, *tmp_list;
> @@ -1085,7 +1088,7 @@
> static void
> xim_instantiate_callback(Display *display,
>                          XPointer client_data,
> -                         XPointer call_data)
> +                         XPointer call_data __UNUSED__)
> {
>    XIM_Im_Info *info = (XIM_Im_Info *)client_data;
>    XIM im = NULL;
> @@ -1146,9 +1149,9 @@
> }
>
> static void
> -xim_destroy_callback(XIM      xim,
> +xim_destroy_callback(XIM      xim __UNUSED__,
>                      XPointer client_data,
> -                     XPointer call_data)
> +                     XPointer call_data __UNUSED__)
> {
>    XIM_Im_Info *info = (XIM_Im_Info *)client_data;
>    info->im = NULL;
>
>
> ------------------------------------------------------------------------------
> Storage Efficiency Calculator
> This modeling tool is based on patent-pending intellectual property that
> has been used successfully in hundreds of IBM storage optimization engage-
> ments, worldwide.  Store less, Store more with what you own, Move data to
> the right place. Try It Now! http://www.accelacomm.com/jaw/sfnl/114/51427378/
> _______________________________________________
> enlightenment-svn mailing list
> enlightenment-...@lists.sourceforge.net
> https://lists.sourceforge.net/lists/listinfo/enlightenment-svn
>
>

------------------------------------------------------------------------------
Storage Efficiency Calculator
This modeling tool is based on patent-pending intellectual property that
has been used successfully in hundreds of IBM storage optimization engage-
ments, worldwide.  Store less, Store more with what you own, Move data to 
the right place. Try It Now! http://www.accelacomm.com/jaw/sfnl/114/51427378/
_______________________________________________
enlightenment-devel mailing list
enlightenment-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-devel

Reply via email to