svn update: 56184 (latest:56184)

diff --git a/configure.ac b/configure.ac
index d259500..ebdfd32 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -99,7 +99,6 @@ EFL_ENABLE_BIN([edje-cc])
 EFL_ENABLE_BIN([edje-decc])
 EFL_ENABLE_BIN([edje-recc])
 EFL_ENABLE_BIN([edje-player])
-EFL_ENABLE_BIN([edje-convert])
 EFL_ENABLE_BIN([edje-inspector])
 EFL_ENABLE_BIN([edje-external-inspector])
 
@@ -304,11 +303,6 @@ if test "x$have_edje_player" = "xyes"; then
    PKG_CHECK_MODULES([EDJE_PLAYER], [ecore-evas >= 1.0.0 ecore >= 1.0.0 evas >= 1.0.0 eina >= 1.0.0])
 fi
 
-if test "x$have_edje_convert" = "xyes"; then
-   PKG_CHECK_MODULES([EDJE_CONVERT], [eet >= 1.0.0 eina >= 1.0.0])
-   EDJE_CONVERT_LIBS="${EDJE_CONVERT_LIBS} ${LUA_LIBS} ${lua_libs}"
-fi
-
 if test "x$have_edje_inspector" = "xyes"; then
    PKG_CHECK_MODULES([EDJE_INSPECTOR], [ecore-evas >= 1.0.0 ecore >= 1.0.0 evas >= 1.0.0 eina >= 1.0.0])
 fi
@@ -416,7 +410,6 @@ echo "  Build edje_cc................: $have_edje_cc"
 echo "  Build edje_decc..............: $have_edje_decc"
 echo "  Build edje_recc..............: $have_edje_recc"
 echo "  Build edje_player............: $have_edje_player"
-echo "  Build edje_convert...........: $have_edje_convert"
 echo "  Build edje_inspector.........: $have_edje_inspector"
 echo "  Build edje_external_inspector: $have_edje_external_inspector"
 echo

diff --git a/src/bin/Makefile.am b/src/bin/Makefile.am
index e3214f6..b8f0fc9 100644 (file)
--- a/src/bin/Makefile.am
+++ b/src/bin/Makefile.am
@@ -3,9 +3,9 @@ MAINTAINERCLEANFILES = Makefile.in
 
 bin_SCRIPTS = @EDJE_RECC_PRG@
 
-bin_PROGRAMS = @EDJE_CC_PRG@ @EDJE_DECC_PRG@ @EDJE_PLAYER_PRG@ @EDJE_CONVERT_PRG@ @EDJE_INSPECTOR_PRG@ @EDJE_EXTERNAL_INSPECTOR_PRG@
+bin_PROGRAMS = @EDJE_CC_PRG@ @EDJE_DECC_PRG@ @EDJE_PLAYER_PRG@ @EDJE_INSPECTOR_PRG@ @EDJE_EXTERNAL_INSPECTOR_PRG@
 
-EXTRA_PROGRAMS = edje_cc edje_decc edje_player edje_convert edje_inspector edje_external_inspector
+EXTRA_PROGRAMS = edje_cc edje_decc edje_player edje_inspector edje_external_inspector
 
 edje_cc_SOURCES = \
 edje_cc.c \
@@ -48,14 +48,6 @@ edje_player_CPPFLAGS = \
 edje_player_LDADD = $(top_builddir)/src/lib/libedje.la @EDJE_PLAYER_LIBS@ @EVIL_LIBS@
 edje_player_LDFLAGS = @lt_enable_auto_import@
 
-edje_convert_SOURCES = edje_convert.c edje_convert_main.c edje_data_convert.c
-edje_convert_CPPFLAGS = \
--I$(top_srcdir)/src/bin \
--I$(top_srcdir)/src/lib \
-@EDJE_CFLAGS@ @EDJE_CONVERT_CFLAGS@
-edje_convert_LDADD = $(top_builddir)/src/lib/libedje.la @EDJE_CONVERT_LIBS@
-edje_convert_LDFLAGS = @lt_enable_auto_import@
-
 edje_inspector_SOURCES = edje_inspector.c
 edje_inspector_CPPFLAGS = \
 -I$(top_srcdir)/src/bin \
@@ -73,5 +65,5 @@ edje_external_inspector_LDADD = $(top_builddir)/src/lib/libedje.la @EDJE_EXTERNA
 edje_external_inspector_LDFLAGS = @lt_enable_auto_import@
 
 
-EXTRA_DIST = @EDJE_RECC_PRG@ edje_prefix.h edje_cc.h edje_convert.h
+EXTRA_DIST = @EDJE_RECC_PRG@ edje_prefix.h edje_cc.h edje_convert.h edje_convert.c edje_convert_main.c edje_data_convert.c
 EXTRA_SCRIPTS = edje_recc

diff --git a/src/bin/edje_cc_handlers.c b/src/bin/edje_cc_handlers.c
index ad1fe91..4817548 100644 (file)
--- a/src/bin/edje_cc_handlers.c
+++ b/src/bin/edje_cc_handlers.c
@@ -4729,14 +4729,14 @@ st_collections_group_parts_part_description_fill_smooth(void)
 static void
 st_collections_group_parts_part_description_fill_spread(void)
 {
+#if 0
    Edje_Part_Collection *pc;
    Edje_Part *ep;
    Edje_Part_Description_Image *ed;
+#endif
 
    check_arg_count(1);
 
-   pc = eina_list_data_get(eina_list_last(edje_collections));
-
    /* XXX this will need to include IMAGES when spread support is added to evas images */
    {
       ERR("%s: Error. parse error %s:%i. "
@@ -4745,6 +4745,9 @@ st_collections_group_parts_part_description_fill_spread(void)
       exit(-1);
    }
 
+#if 0
+   pc = eina_list_data_get(eina_list_last(edje_collections));
+
    ep = pc->parts[pc->parts_count - 1];
 
    if (ep->type != EDJE_PART_TYPE_IMAGE)
@@ -4759,6 +4762,7 @@ st_collections_group_parts_part_description_fill_spread(void)
    if (ep->other.desc_count) ed = (Edje_Part_Description_Image*)  ep->other.desc[ep->other.desc_count - 1];
 
    ed->image.fill.spread = parse_int_range(0, 0, 1);
+#endif
 }
 
 /**

diff --git a/src/bin/edje_cc_parse.c b/src/bin/edje_cc_parse.c
index 1f28859..98b922e 100644 (file)
--- a/src/bin/edje_cc_parse.c
+++ b/src/bin/edje_cc_parse.c
@@ -1232,12 +1232,12 @@ _is_numi(char c)
 int
 _is_op1i(char c)
 {
-   switch(c)
+   switch (c)
      {
      case '*':;
      case '%':;
      case '/': return 1;
-     default: return 0;
+     default: break;
      }
    return 0;
 }
@@ -1245,11 +1245,11 @@ _is_op1i(char c)
 int
 _is_op2i(char c)
 {
-   switch(c)
+   switch (c)
      {
      case '+':;
      case '-': return 1;
-     default: return 0;
+     default: break;
      }
    return 0;
 }
@@ -1283,8 +1283,8 @@ _calci(char op, int a, int b)
      default:
        ERR("%s: Error. %s:%i unexpected character '%c'\n",
            progname, file_in, line - 1, op);
-       return a;
      }
+   return a;
 }
 
 /* float set of functoins */
@@ -1322,7 +1322,6 @@ _deltaf(char *s, double *val)
        s++;
        s = _alphaf(s, val);
        s++;
-       return s;
      }
    return s;
 }
@@ -1440,8 +1439,7 @@ _is_numf(char c)
        || ('.' == c)
        || ('+' == c))
      return 1;
-   else
-     return 0;
+   return 0;
 }
 
 static int
@@ -1452,7 +1450,7 @@ _is_op1f(char c)
      case '*':;
      case '%':;
      case '/': return 1;
-     default: return 0;
+     default: break;
      }
    return 0;
 }
@@ -1464,7 +1462,7 @@ _is_op2f(char c)
      {
      case '+':;
      case '-': return 1;
-     default: return 0;
+     default: break;
      }
    return 0;
 }
@@ -1498,8 +1496,8 @@ _calcf(char op, double a, double b)
      default:
        ERR("%s: Error. %s:%i unexpected character '%c'\n",
            progname, file_in, line - 1, op);
-       return a;
      }
+   return a;
 }
 
 static int

diff --git a/src/bin/edje_decc.c b/src/bin/edje_decc.c
index 31036ed..5735afc 100644 (file)
--- a/src/bin/edje_decc.c
+++ b/src/bin/edje_decc.c
@@ -319,7 +319,10 @@ output(void)
                       exit (-1);
                    }
                  if (!(f = fopen(out, "wb")))
-                    ERR("Could not open file: %s", out);
+                    {
+                       ERR("Could not open file: %s", out);
+                      exit (-1);
+                    }
                  if (fwrite(font, fontsize, 1, f) != 1)
                    ERR("Could not write font: %s", strerror(errno));
                  if (f) fclose(f);

diff --git a/src/lib/edje_calc.c b/src/lib/edje_calc.c
index c1aa0d0..712ba3a 100644 (file)
--- a/src/lib/edje_calc.c
+++ b/src/lib/edje_calc.c
@@ -281,7 +281,7 @@ _edje_part_recalc_1(Edje *ed, Edje_Real_Part *ep)
 }
 
 int
-_edje_part_dragable_calc(Edje *ed, Edje_Real_Part *ep, FLOAT_T *x, FLOAT_T *y)
+_edje_part_dragable_calc(Edje *ed __UNUSED__, Edje_Real_Part *ep, FLOAT_T *x, FLOAT_T *y)
 {
    if (ep->drag)
      {
@@ -320,7 +320,6 @@ _edje_part_dragable_calc(Edje *ed, Edje_Real_Part *ep, FLOAT_T *x, FLOAT_T *y)
    if (x) *x = ZERO;
    if (y) *y = ZERO;
    return 0;
-   ed = NULL;
 }
 
 void
@@ -1420,8 +1419,9 @@ _edje_part_recalc_single(Edje *ed,
         break;
       case EDJE_PART_TYPE_GRADIENT:
         /* FIXME: THIS ONE SHOULD NEVER BE TRIGGERED. */
-        abort();
         break;
+      default:
+        break;
      }
 }
 

diff --git a/src/lib/edje_callbacks.c b/src/lib/edje_callbacks.c
index 04d70cc..e0b0eae 100644 (file)
--- a/src/lib/edje_callbacks.c
+++ b/src/lib/edje_callbacks.c
@@ -1,7 +1,7 @@
 #include "edje_private.h"
 
 static void
-_edje_hold_signal_cb(void *data, Evas *e, Evas_Object *obj, void *event_info)
+_edje_hold_signal_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj, void *event_info)
 {
    Evas_Event_Hold *ev;
    Edje *ed;
@@ -15,12 +15,10 @@ _edje_hold_signal_cb(void *data, Evas *e, Evas_Object *obj, void *event_info)
      _edje_emit(ed, "hold,on", rp->part->name);
    else
      _edje_emit(ed, "hold,off", rp->part->name);
-   return;
-   e = NULL;
 }
 
 static void
-_edje_focus_in_signal_cb(void *data, Evas *e, Evas_Object *obj, void *event_info __UNUSED__)
+_edje_focus_in_signal_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj, void *event_info __UNUSED__)
 {
    Edje *ed;
    Edje_Real_Part *rp;
@@ -31,12 +29,10 @@ _edje_focus_in_signal_cb(void *data, Evas *e, Evas_Object *obj, void *event_info
      return;
 
    _edje_emit(ed, "focus,part,in", rp->part->name);
-   return;
-   e = NULL;
 }
 
 static void
-_edje_focus_out_signal_cb(void *data, Evas *e, Evas_Object *obj, void *event_info __UNUSED__)
+_edje_focus_out_signal_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj, void *event_info __UNUSED__)
 {
    Edje *ed;
    Edje_Real_Part *rp;
@@ -47,12 +43,10 @@ _edje_focus_out_signal_cb(void *data, Evas *e, Evas_Object *obj, void *event_inf
      return;
 
    _edje_emit(ed, "focus,part,out", rp->part->name);
-   return;
-   e = NULL;
 }
 
 static void
-_edje_mouse_in_signal_cb(void *data, Evas *e, Evas_Object *obj, void *event_info)
+_edje_mouse_in_signal_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj, void *event_info)
 {
    Evas_Event_Mouse_In *ev;
    Edje *ed;
@@ -65,12 +59,10 @@ _edje_mouse_in_signal_cb(void *data, Evas *e, Evas_Object *obj, void *event_info
        ((ev->event_flags) &&
        (rp->part->ignore_flags & ev->event_flags))) return;
    _edje_emit(ed, "mouse,in", rp->part->name);
-   return;
-   e = NULL;
 }
 
 static void
-_edje_mouse_out_signal_cb(void *data, Evas *e, Evas_Object *obj, void *event_info)
+_edje_mouse_out_signal_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj, void *event_info)
 {
    Evas_Event_Mouse_Out *ev;
    Edje *ed;
@@ -83,12 +75,10 @@ _edje_mouse_out_signal_cb(void *data, Evas *e, Evas_Object *obj, void *event_inf
        ((ev->event_flags) &&
        (rp->part->ignore_flags & ev->event_flags))) return;
    _edje_emit(ed, "mouse,out", rp->part->name);
-   return;
-   e = NULL;
 }
 
 static void
-_edje_mouse_down_signal_cb(void *data, Evas *e, Evas_Object *obj, void *event_info)
+_edje_mouse_down_signal_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj, void *event_info)
 {
    Evas_Event_Mouse_Down *ev;
    Edje *ed;
@@ -200,12 +190,10 @@ _edje_mouse_down_signal_cb(void *data, Evas *e, Evas_Object *obj, void *event_in
 //   _edje_recalc_do(ed);
    _edje_thaw(ed);
    _edje_unref(ed);
-   return;
-   e = NULL;
 }
 
 static void
-_edje_mouse_up_signal_cb(void *data, Evas *e, Evas_Object *obj, void *event_info)
+_edje_mouse_up_signal_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj, void *event_info)
 {
    Evas_Event_Mouse_Up *ev;
    Edje *ed;
@@ -268,12 +256,10 @@ _edje_mouse_up_signal_cb(void *data, Evas *e, Evas_Object *obj, void *event_info
 //   _edje_recalc_do(ed);
    _edje_thaw(ed);
    _edje_unref(ed);
-   return;
-   e = NULL;
 }
 
 static void
-_edje_mouse_move_signal_cb(void *data, Evas *e, Evas_Object *obj, void *event_info)
+_edje_mouse_move_signal_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj, void *event_info)
 {
    Evas_Event_Mouse_Move *ev;
    Edje *ed;
@@ -356,12 +342,10 @@ _edje_mouse_move_signal_cb(void *data, Evas *e, Evas_Object *obj, void *event_in
      }
    _edje_unref(ed);
    _edje_thaw(ed);
-   return;
-   e = NULL;
 }
 
 static void
-_edje_mouse_wheel_signal_cb(void *data, Evas *e, Evas_Object *obj, void *event_info)
+_edje_mouse_wheel_signal_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj, void *event_info)
 {
    Evas_Event_Mouse_Wheel *ev;
    Edje *ed;
@@ -377,8 +361,6 @@ _edje_mouse_wheel_signal_cb(void *data, Evas *e, Evas_Object *obj, void *event_i
 
    snprintf(buf, sizeof(buf), "mouse,wheel,%i,%i", ev->direction, (ev->z < 0) ? (-1) : (1));
    _edje_emit(ed, buf, rp->part->name);
-   return;
-   e = NULL;
 }
 
 Eina_Bool

diff --git a/src/lib/edje_edit.c b/src/lib/edje_edit.c
index 182b78b..5c08002 100644 (file)
--- a/src/lib/edje_edit.c
+++ b/src/lib/edje_edit.c
@@ -258,7 +258,7 @@ _edje_edit_smart_file_set(Evas_Object *obj, const char *file, const char *group)
         ps->code = eet_read(ef, keys[i], &size);
         eina_hash_add(eed->program_scripts, &ps->id, ps);
      }
-
+   if (keys) free(keys);
    return EINA_TRUE;
 }
 
@@ -371,20 +371,16 @@ _edje_real_part_free(Edje_Real_Part *rp)
    if (rp->custom)
      {
        _edje_collection_free_part_description_clean(rp->part->type, rp->custom->description, 0);
-       free(rp->custom);
+        if (rp->custom) free(rp->custom->set);
+        eina_mempool_free(_edje_real_part_state_mp, rp->custom);
        rp->custom = NULL;
      }
 
    free(rp->drag);
 
-   if (rp->param2)
-     free(rp->param2->set);
+   if (rp->param2) free(rp->param2->set);
    eina_mempool_free(_edje_real_part_state_mp, rp->param2);
 
-   if (rp->custom)
-     free(rp->custom->set);
-   eina_mempool_free(_edje_real_part_state_mp, rp->custom);
-
    _edje_unref(rp->edje);
    eina_mempool_free(_edje_real_part_mp, rp);
 }
@@ -1155,10 +1151,15 @@ edje_edit_group_del(Evas_Object *obj, const char *group_name)
    snprintf(buf, sizeof(buf), "edje/scripts/embryo/source/%d/*", e->id);
    keys = eet_list(eetf, buf, &count);
    if (keys)
-     do {
-          count--;
-          eet_delete(eetf, keys[count]);
-     } while(count);
+     {
+        do
+          {
+             count--;
+             eet_delete(eetf, keys[count]);
+          }
+        while(count);
+        free(keys);
+     }
    eet_close(eetf);
 
    /* Free Group */
@@ -7693,17 +7694,17 @@ edje_edit_save_all(Evas_Object *obj)
 EAPI void
 edje_edit_print_internal_status(Evas_Object *obj)
 {
+/*   
    Edje_Program *epr;
    unsigned int i;
    int j;
-
+*/
    eina_error_set(0);
 
    GET_ED_OR_RETURN();
 
    _edje_generate_source(obj);
-   return;
-
+/*
    INF("****** CHECKIN' INTERNAL STRUCTS STATUS *********");
 
    INF("path: '%s', group: '%s', parent: '%s'",
@@ -7739,4 +7740,5 @@ edje_edit_print_internal_status(Evas_Object *obj)
      }
 
    INF("******************  END  ************************");
+ */
 }

diff --git a/src/lib/edje_embryo.c b/src/lib/edje_embryo.c
index e95359f..1bfbbce 100644 (file)
--- a/src/lib/edje_embryo.c
+++ b/src/lib/edje_embryo.c
@@ -811,6 +811,7 @@ _edje_embryo_fn_get_part_id(Embryo_Program *ep, Embryo_Cell *params)
    CHKPARAM(1);
    ed = embryo_program_data_get(ep);
    GETSTR(p, params[1]);
+   if (!p) return -1;
    col = ed->collection;
    if (!col) return -1;
    for (part = col->parts; *part; part++)
@@ -1350,6 +1351,7 @@ _edje_embryo_fn_send_message(Embryo_Program *ep, Embryo_Cell *params)
 
                  l = embryo_data_string_length_get(ep, cptr);
                  s = alloca(l + 1);
+                  s[0] = 0;
                  embryo_data_string_get(ep, cptr, s);
                  emsg = alloca(sizeof(Edje_Message_String));
                  emsg->str = s;
@@ -1363,7 +1365,8 @@ _edje_embryo_fn_send_message(Embryo_Program *ep, Embryo_Cell *params)
 
             emsg = alloca(sizeof(Edje_Message_Int));
             ptr = embryo_data_address_get(ep, params[3]);
-            emsg->val = (int)*ptr;
+             if (ptr) emsg->val = (int)*ptr;
+             else emsg->val = 0;
             _edje_message_send(ed, EDJE_QUEUE_APP, type, id, emsg);
          }
        break;
@@ -1374,8 +1377,13 @@ _edje_embryo_fn_send_message(Embryo_Program *ep, Embryo_Cell *params)
 
             emsg = alloca(sizeof(Edje_Message_Float));
             ptr = embryo_data_address_get(ep, params[3]);
-            f = EMBRYO_CELL_TO_FLOAT(*ptr);
-            emsg->val = (double)f;
+            if (ptr)
+                {
+                   f = EMBRYO_CELL_TO_FLOAT(*ptr);
+                   emsg->val = (double)f;
+                }
+             else
+                emsg->val = 0.0;
             _edje_message_send(ed, EDJE_QUEUE_APP, type, id, emsg);
          }
        break;
@@ -1398,6 +1406,7 @@ _edje_embryo_fn_send_message(Embryo_Program *ep, Embryo_Cell *params)
 
                       l = embryo_data_string_length_get(ep, cptr);
                       s = alloca(l + 1);
+                       s[0] = 0;
                       embryo_data_string_get(ep, cptr, s);
                       emsg->str[i - 3] = s;
                    }
@@ -1415,7 +1424,8 @@ _edje_embryo_fn_send_message(Embryo_Program *ep, Embryo_Cell *params)
             for (i = 3; i < n; i++)
               {
                  ptr = embryo_data_address_get(ep, params[i]);
-                 emsg->val[i - 3] = (int)*ptr;
+                 if (ptr) emsg->val[i - 3] = (int)*ptr;
+                  else emsg->val[i - 3] = 0;
               }
             _edje_message_send(ed, EDJE_QUEUE_APP, type, id, emsg);
          }
@@ -1432,8 +1442,13 @@ _edje_embryo_fn_send_message(Embryo_Program *ep, Embryo_Cell *params)
                  float f;
 
                  ptr = embryo_data_address_get(ep, params[i]);
-                 f = EMBRYO_CELL_TO_FLOAT(*ptr);
-                 emsg->val[i - 3] = (double)f;
+                 if (ptr)
+                     {
+                        f = EMBRYO_CELL_TO_FLOAT(*ptr);
+                        emsg->val[i - 3] = (double)f;
+                     }
+                  else
+                     emsg->val[i - 3] = 0.0;
               }
             _edje_message_send(ed, EDJE_QUEUE_APP, type, id, emsg);
          }
@@ -1451,11 +1466,13 @@ _edje_embryo_fn_send_message(Embryo_Program *ep, Embryo_Cell *params)
 
                  l = embryo_data_string_length_get(ep, cptr);
                  s = alloca(l + 1);
+                  s[0] = 0;
                  embryo_data_string_get(ep, cptr, s);
                  emsg = alloca(sizeof(Edje_Message_String_Int));
                  emsg->str = s;
                  ptr = embryo_data_address_get(ep, params[4]);
-                 emsg->val = (int)*ptr;
+                 if (ptr) emsg->val = (int)*ptr;
+                  else emsg->val = 0;
                  _edje_message_send(ed, EDJE_QUEUE_APP, type, id, emsg);
               }
          }
@@ -1474,12 +1491,18 @@ _edje_embryo_fn_send_message(Embryo_Program *ep, Embryo_Cell *params)
 
                  l = embryo_data_string_length_get(ep, cptr);
                  s = alloca(l + 1);
+                  s[0] = 0;
                  embryo_data_string_get(ep, cptr, s);
                  emsg = alloca(sizeof(Edje_Message_String_Float));
                  emsg->str = s;
                  ptr = embryo_data_address_get(ep, params[4]);
-                 f = EMBRYO_CELL_TO_FLOAT(*ptr);
-                 emsg->val = (double)f;
+                  if (ptr)
+                     {
+                        f = EMBRYO_CELL_TO_FLOAT(*ptr);
+                        emsg->val = (double)f;
+                     }
+                  else
+                     emsg->val = 0.0;
                  _edje_message_send(ed, EDJE_QUEUE_APP, type, id, emsg);
               }
          }
@@ -1497,6 +1520,7 @@ _edje_embryo_fn_send_message(Embryo_Program *ep, Embryo_Cell *params)
 
                  l = embryo_data_string_length_get(ep, cptr);
                  s = alloca(l + 1);
+                  s[0] = 0;
                  embryo_data_string_get(ep, cptr, s);
                  n = (params[0] / sizeof(Embryo_Cell)) + 1;
                  emsg = alloca(sizeof(Edje_Message_String_Int_Set) + ((n - 4 - 1) * sizeof(int)));
@@ -1505,7 +1529,8 @@ _edje_embryo_fn_send_message(Embryo_Program *ep, Embryo_Cell *params)
                  for (i = 4; i < n; i++)
                    {
                       ptr = embryo_data_address_get(ep, params[i]);
-                      emsg->val[i - 4] = (int)*ptr;
+                       if (ptr) emsg->val[i - 4] = (int)*ptr;
+                       else emsg->val[i - 4] = 0;
                    }
                  _edje_message_send(ed, EDJE_QUEUE_APP, type, id, emsg);
               }
@@ -1524,6 +1549,7 @@ _edje_embryo_fn_send_message(Embryo_Program *ep, Embryo_Cell *params)
 
                  l = embryo_data_string_length_get(ep, cptr);
                  s = alloca(l + 1);
+                  s[0] = 0;
                  embryo_data_string_get(ep, cptr, s);
                  n = (params[0] / sizeof(Embryo_Cell)) + 1;
                  emsg = alloca(sizeof(Edje_Message_String_Float_Set) + ((n - 4 - 1) * sizeof(double)));
@@ -1534,8 +1560,13 @@ _edje_embryo_fn_send_message(Embryo_Program *ep, Embryo_Cell *params)
                       float f;
 
                       ptr = embryo_data_address_get(ep, params[i]);
-                      f = EMBRYO_CELL_TO_FLOAT(*ptr);
-                      emsg->val[i - 4] = (double)f;
+                       if (ptr)
+                         {
+                            f = EMBRYO_CELL_TO_FLOAT(*ptr);
+                            emsg->val[i - 4] = (double)f;
+                         }
+                       else
+                          emsg->val[i - 4] = 0.0;
                    }
                  _edje_message_send(ed, EDJE_QUEUE_APP, type, id, emsg);
               }

diff --git a/src/lib/edje_text.c b/src/lib/edje_text.c
index 67a5c5c..25882e5 100644 (file)
--- a/src/lib/edje_text.c
+++ b/src/lib/edje_text.c
@@ -283,7 +283,7 @@ _edje_text_font_get(const char *base, const char *new, char **free_later)
 
    font_len = strlen(new);
    aux = strchr(base_style, ',');
-   style_len = (aux) ? (aux - base_style) : strlen(base_style);
+   style_len = (aux) ? (size_t)(aux - base_style) : strlen(base_style);
 
    *free_later = malloc(font_len + style_len + 1);
    memcpy(*free_later, new, font_len);

diff --git a/src/lib/edje_util.c b/src/lib/edje_util.c
index 04dc508..0317f24 100644 (file)
--- a/src/lib/edje_util.c
+++ b/src/lib/edje_util.c
@@ -4988,15 +4988,13 @@ _edje_block_violate(Edje *ed)
 }
 
 void
-_edje_object_part_swallow_free_cb(void *data, Evas *e, Evas_Object *obj, void *event_info)
+_edje_object_part_swallow_free_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj, void *event_info __UNUSED__)
 {
    Evas_Object *edje_obj;
 
    edje_obj = data;
    edje_object_part_unswallow(edje_obj, obj);
    return;
-   e = NULL;
-   event_info = NULL;
 }
 
 static void