Change in deprecated functions lua_objlen by lua_objraw and luaL_register by luaL_setfunc ============================================================= diff -pruN edje-1.1.0_orig/src/lib/edje_lua.c edje-1.1.0/src/lib/edje_lua.c --- edje-1.1.0_orig/src/lib/edje_lua.c 2012-03-15 09:32:13.733738184 +0100 +++ edje-1.1.0/src/lib/edje_lua.c 2012-03-15 09:43:54.322779447 +0100 @@ -246,7 +246,7 @@ _edje_lua_get_ref(lua_State *L, Edje_Lua static void _edje_lua_free_ref(lua_State *L, Edje_Lua_Ref *ref) { - //printf ("_edje_lua_free_ref %d %d %d\n", L, lua_objlen(L, LUA_REGISTRYINDEX), _edje_lua_reg_count(L)); + //printf ("_edje_lua_free_ref %d %d %d\n", L, lua_rawlen(L, LUA_REGISTRYINDEX), _edje_lua_reg_count(L)); luaL_unref(L, LUA_REGISTRYINDEX, ref->id); free(ref); lua_gc(L, LUA_GCCOLLECT, 0); @@ -4586,7 +4586,7 @@ _edje_lua_group_fn_message_send(lua_Stat { if (lua_type(L, 4) != LUA_TTABLE) break; - size = lua_objlen(L, 4); + size = lua_rawlen(L, 4); Edje_Message_String_Set *msg_string_set = malloc(sizeof(Edje_Message_String_Set) + (size - 1) * sizeof(char *)); @@ -4604,7 +4604,7 @@ _edje_lua_group_fn_message_send(lua_Stat { if (lua_type(L, 4) != LUA_TTABLE) break; - size = lua_objlen(L, 4); + size = lua_rawlen(L, 4); Edje_Message_Int_Set *msg_int_set = malloc(sizeof(Edje_Message_Int_Set) + (size - 1) * sizeof(int)); msg_int_set->count = size; @@ -4621,7 +4621,7 @@ _edje_lua_group_fn_message_send(lua_Stat { if (lua_type(L, 4) != LUA_TTABLE) break; - size = lua_objlen(L, 4); + size = lua_rawlen(L, 4); Edje_Message_Float_Set *msg_float_set = malloc(sizeof(Edje_Message_Float_Set) + (size - 1) * sizeof(double)); @@ -4657,7 +4657,7 @@ _edje_lua_group_fn_message_send(lua_Stat { if (lua_type(L, 5) != LUA_TTABLE) break; - size = lua_objlen(L, 5); + size = lua_rawlen(L, 5); Edje_Message_String_Int_Set *msg_string_int_set = malloc(sizeof(Edje_Message_String_Int_Set) + (size - 1) * sizeof(int)); @@ -4676,7 +4676,7 @@ _edje_lua_group_fn_message_send(lua_Stat { if (lua_type(L, 5) != LUA_TTABLE) break; - size = lua_objlen(L, 5); + size = lua_rawlen(L, 5); Edje_Message_String_Float_Set *msg_string_float_set = malloc(sizeof(Edje_Message_String_Float_Set) + (size - 1) * sizeof(double)); diff -pruN edje-1.1.0_orig/src/lib/edje_lua2.c edje-1.1.0/src/lib/edje_lua2.c --- edje-1.1.0_orig/src/lib/edje_lua2.c 2012-03-15 09:32:13.725737165 +0100 +++ edje-1.1.0/src/lib/edje_lua2.c 2012-03-15 09:43:54.351783133 +0100 @@ -969,7 +969,7 @@ _elua_messagesend(lua_State *L) // Stac int i, n; const char *str; luaL_checktype(L, 3, LUA_TTABLE); // Stack usage [-0, +0, v] - n = lua_objlen(L, 3); // Stack usage [-0, +0, -] + n = lua_rawlen(L, 3); // Stack usage [-0, +0, -] emsg = alloca(sizeof(Edje_Message_String_Set) + ((n - 1) * sizeof(char *))); emsg->count = n; for (i = 1; i <= n; i ++) @@ -987,7 +987,7 @@ _elua_messagesend(lua_State *L) // Stac Edje_Message_Int_Set *emsg; int i, n; luaL_checktype(L, 3, LUA_TTABLE); // Stack usage [-0, +0, v] - n = lua_objlen(L, 3); // Stack usage [-0, +0, -] + n = lua_rawlen(L, 3); // Stack usage [-0, +0, -] emsg = alloca(sizeof(Edje_Message_Int_Set) + ((n - 1) * sizeof(int))); emsg->count = n; for (i = 1; i <= n; i ++) @@ -1004,7 +1004,7 @@ _elua_messagesend(lua_State *L) // Stac Edje_Message_Float_Set *emsg; int i, n; luaL_checktype(L, 3, LUA_TTABLE); // Stack usage [-0, +0, v] - n = lua_objlen(L, 3); // Stack usage [-0, +0, -] + n = lua_rawlen(L, 3); // Stack usage [-0, +0, -] emsg = alloca(sizeof(Edje_Message_Float_Set) + ((n - 1) * sizeof(double))); emsg->count = n; for (i = 1; i <= n; i ++) @@ -1041,7 +1041,7 @@ _elua_messagesend(lua_State *L) // Stac const char *str = luaL_checkstring(L, 3); // Stack usage [-0, +0, v] if (!str) return 0; luaL_checktype(L, 4, LUA_TTABLE); // Stack usage [-0, +0, v] - n = lua_objlen(L, 4); // Stack usage [-0, +0, -] + n = lua_rawlen(L, 4); // Stack usage [-0, +0, -] emsg = alloca(sizeof(Edje_Message_String_Int_Set) + ((n - 1) * sizeof(int))); emsg->str = (char *)str; emsg->count = n; @@ -1061,7 +1061,7 @@ _elua_messagesend(lua_State *L) // Stac const char *str = luaL_checkstring(L, 3); // Stack usage [-0, +0, v] if (!str) return 0; luaL_checktype(L, 4, LUA_TTABLE); // Stack usage [-0, +0, v] - n = lua_objlen(L, 4); + n = lua_rawlen(L, 4); emsg = alloca(sizeof(Edje_Message_String_Float_Set) + ((n - 1) * sizeof(double))); emsg->str = (char *)str; emsg->count = n; @@ -3728,9 +3728,9 @@ _elua_text_text(lua_State *L) static void _elua_add_functions(lua_State *L, const char *api, const luaL_Reg *funcs, const char *meta, const char *parent, const char *base) // Stack usage [-3, +5, m] if inheriting [-6, +11, em] { - luaL_register(L, api, funcs); // Stack usage [-0, +1, m] + luaL_setfuncs(L, api, funcs); // Stack usage [-0, +1, m] luaL_newmetatable(L, meta); // Stack usage [-0, +1, m] - luaL_register(L, 0, _elua_edje_gc_funcs); // Stack usage [-1, +1, m] + luaL_setfuncs(L, 0, _elua_edje_gc_funcs); // Stack usage [-1, +1, m] lua_pushliteral(L, "__index"); // Stack usage [-0, +1, m] lua_pushvalue(L, -3); // Stack usage [-0, +1, -] lua_rawset(L, -3); // Stack usage [-2, +0, m] @@ -3798,9 +3798,9 @@ _elua_init(void) lua_call(L, 1, 0); // Stack usage [-2, +0, e] } - luaL_register(L, _elua_edje_api, _elua_edje_funcs); // Stack usage [-0, +1, m] + luaL_setfuncs(L, _elua_edje_api, _elua_edje_funcs); // Stack usage [-0, +1, m] luaL_newmetatable(L, _elua_edje_meta); // Stack usage [-0, +1, m] - luaL_register(L, 0, _elua_edje_gc_funcs); // Stack usage [-1, +1, m] + luaL_setfuncs(L, 0, _elua_edje_gc_funcs); // Stack usage [-1, +1, m] _elua_add_functions(L, _elua_evas_api, _elua_evas_funcs, _elua_evas_meta, NULL, NULL); // Stack usage [-3, +5, m] @@ -3850,9 +3850,9 @@ _edje_lua2_script_init(Edje *ed) lua_call(L, 1, 0); // Stack usage [-2, +0, m] } - luaL_register(L, _elua_edje_api, _elua_edje_funcs); // Stack usage [-0, +1, m] + luaL_setfuncs(L, _elua_edje_api, _elua_edje_funcs); // Stack usage [-0, +1, m] luaL_newmetatable(L, _elua_edje_meta); // Stack usage [-0, +1, m] - luaL_register(L, 0, _elua_edje_gc_funcs); // Stack usage [-1, +1, m] + luaL_setfuncs(L, 0, _elua_edje_gc_funcs); // Stack usage [-1, +1, m] lua_pop(L, 2); // Stack usage [-n, +0, -]