Enlightenment CVS committal
Author : englebass
Project : e17
Module : libs/edje
Dir : e17/libs/edje/src/lib
Modified Files:
edje_script_only.c
Log Message:
Add return values.
===================================================================
RCS file: /cvs/e/e17/libs/edje/src/lib/edje_script_only.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- edje_script_only.c 7 Jun 2008 10:06:13 -0000 1.3
+++ edje_script_only.c 19 Jun 2008 12:46:04 -0000 1.4
@@ -81,6 +81,7 @@
#define IFNO(func) if (si->fn.func == EMBRYO_FUNCTION_NONE)
#define CLFN(func) IFFN(func) {_call_fn(ed, #func, si->fn.func);}
#define SI Sinfo *si; si = ed->script_only_data; if (!si) return
+#define SI_RETURN(ret) Sinfo *si; si = ed->script_only_data; if (!si) return
(ret)
#define PINT(val) embryo_parameter_cell_push(ed->collection->script,
(Embryo_Cell)(val))
#define PSTR(val) embryo_parameter_string_push(ed->collection->script, val)
#define GTFN(func) si->fn.func =
embryo_program_function_find(ed->collection->script, #func)
@@ -104,7 +105,7 @@
static int
_oid_alloc(Edje *ed)
{
- SI;
+ SI_RETURN(0);
si->oid.id++;
return si->oid.id;
@@ -115,7 +116,7 @@
{
Oid *oi;
char buf[64];
- SI;
+ SI_RETURN(NULL);
oi = calloc(1, sizeof(Oid));
if (!oi) return NULL;
@@ -139,7 +140,7 @@
_oid_find(Edje *ed, int oid)
{
char buf[64];
- SI;
+ SI_RETURN(NULL);
snprintf(buf, sizeof(buf), "%i", oid);
return evas_hash_find(si->oid.hash, buf);
@@ -203,7 +204,7 @@
{
Edje *ed = embryo_program_data_get(ep);
Oid *oid;
- SI;
+ SI_RETURN(-1);
CHKPARAM(1);
if (!(oid = _oid_find(ed, params[1]))) return -1;
@@ -219,7 +220,7 @@
Edje *ed = embryo_program_data_get(ep);
Evas_Object *o;
Oid *oid;
- SI;
+ SI_RETURN(-1);
o = evas_object_rectangle_add(evas_object_evas_get(ed->obj));
if (!o) return 0;
@@ -233,7 +234,7 @@
{
Edje *ed = embryo_program_data_get(ep);
Oid *oid;
- SI;
+ SI_RETURN(-1);
CHKPARAM(1);
if (!(oid = _oid_find(ed, params[1]))) return -1;
@@ -246,7 +247,7 @@
{
Edje *ed = embryo_program_data_get(ep);
Oid *oid;
- SI;
+ SI_RETURN(-1);
CHKPARAM(1);
if (!(oid = _oid_find(ed, params[1]))) return -1;
@@ -259,11 +260,11 @@
{
Edje *ed = embryo_program_data_get(ep);
Oid *oid;
- SI;
+ SI_RETURN(-1);
CHKPARAM(3);
if (!(oid = _oid_find(ed, params[1]))) return -1;
- if ((oid->x == params[2]) && (oid->y == params[3])) return;
+ if ((oid->x == params[2]) && (oid->y == params[3])) return -1;
oid->x = params[2];
oid->y = params[3];
evas_object_move(oid->obj, ed->x + oid->x, ed->y + oid->y);
@@ -275,11 +276,11 @@
{
Edje *ed = embryo_program_data_get(ep);
Oid *oid;
- SI;
+ SI_RETURN(-1);
CHKPARAM(3);
if (!(oid = _oid_find(ed, params[1]))) return -1;
- if ((oid->w == params[2]) && (oid->h == params[3])) return;
+ if ((oid->w == params[2]) && (oid->h == params[3])) return -1;
oid->w = params[2];
oid->h = params[3];
evas_object_resize(oid->obj, oid->w, oid->h);
@@ -291,12 +292,12 @@
{
Edje *ed = embryo_program_data_get(ep);
Oid *oid;
- SI;
+ SI_RETURN(-1);
CHKPARAM(5);
if (!(oid = _oid_find(ed, params[1]))) return -1;
if ((oid->x == params[2]) && (oid->y == params[3]) &&
- (oid->w == params[4]) && (oid->h == params[5])) return;
+ (oid->w == params[4]) && (oid->h == params[5])) return -1;
oid->x = params[2];
oid->y = params[3];
oid->w = params[4];
@@ -311,7 +312,7 @@
{
Edje *ed = embryo_program_data_get(ep);
Oid *oid;
- SI;
+ SI_RETURN(-1);
CHKPARAM(5);
if (!(oid = _oid_find(ed, params[1]))) return -1;
@@ -327,7 +328,7 @@
{
Edje *ed = embryo_program_data_get(ep);
Oid *oid;
- SI;
+ SI_RETURN(-1);
CHKPARAM(5);
if (!(oid = _oid_find(ed, params[1]))) return -1;
@@ -341,7 +342,7 @@
Edje *ed = embryo_program_data_get(ep);
Oid *oid;
int r, g, b, a;
- SI;
+ SI_RETURN(-1);
CHKPARAM(5);
if (!(oid = _oid_find(ed, params[1]))) return -1;
@@ -358,7 +359,7 @@
{
Edje *ed = embryo_program_data_get(ep);
char *sig = NULL, *src = NULL;
- SI;
+ SI_RETURN(-1);
CHKPARAM(2);
GETSTR(sig, params[1]);
@@ -382,7 +383,6 @@
void
_edje_script_only_init(Edje *ed)
{
- Embryo_Function fn;
Sinfo *si;
si = calloc(1, sizeof(Sinfo));
@@ -425,7 +425,6 @@
void
_edje_script_only_shutdown(Edje *ed)
{
- Embryo_Function fn;
SI;
CLFN(obj_shutdown);
-------------------------------------------------------------------------
Check out the new SourceForge.net Marketplace.
It's the best place to buy or sell services for
just about anything Open Source.
http://sourceforge.net/services/buy/index.php
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
