Enlightenment CVS committal
Author : cmarcelo
Project : e17
Module : libs/etk
Dir : e17/libs/etk/src/lib
Modified Files:
etk_marshallers.c etk_marshallers.h
Log Message:
Small fixes for Etk.
- Removes unnecessary checks for marshallers.
- Adds a missing INT_POINTER marshaller.
- Fix callbacks types in etk_shadow_test
===================================================================
RCS file: /cvs/e/e17/libs/etk/src/lib/etk_marshallers.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -3 -r1.11 -r1.12
--- etk_marshallers.c 28 Sep 2007 19:56:13 -0000 1.11
+++ etk_marshallers.c 1 Oct 2007 14:48:40 -0000 1.12
@@ -12,14 +12,10 @@
Etk_Callback_VOID callback_VOID;
Etk_Bool result;
- if (!callback || !object)
- return;
-
callback_VOID = (Etk_Callback_VOID)callback;
result = callback_VOID(object, data);
- if (return_value)
- *((Etk_Bool *)return_value) = result;
+ *((Etk_Bool *)return_value) = result;
}
/* etk_marshaller_INT */
@@ -30,16 +26,12 @@
int arg1;
Etk_Bool result;
- if (!callback || !object)
- return;
-
arg1 = va_arg(arguments, int);
callback_INT = (Etk_Callback_INT)callback;
result = callback_INT(object, arg1, data);
- if (return_value)
- *((Etk_Bool *)return_value) = result;
+ *((Etk_Bool *)return_value) = result;
}
/* etk_marshaller_INT_INT */
@@ -51,17 +43,13 @@
int arg2;
Etk_Bool result;
- if (!callback || !object)
- return;
-
arg1 = va_arg(arguments, int);
arg2 = va_arg(arguments, int);
callback_INT_INT = (Etk_Callback_INT_INT)callback;
result = callback_INT_INT(object, arg1, arg2, data);
- if (return_value)
- *((Etk_Bool *)return_value) = result;
+ *((Etk_Bool *)return_value) = result;
}
/* etk_marshaller_DOUBLE */
@@ -72,16 +60,12 @@
double arg1;
Etk_Bool result;
- if (!callback || !object)
- return;
-
arg1 = va_arg(arguments, double);
callback_DOUBLE = (Etk_Callback_DOUBLE)callback;
result = callback_DOUBLE(object, arg1, data);
- if (return_value)
- *((Etk_Bool *)return_value) = result;
+ *((Etk_Bool *)return_value) = result;
}
/* etk_marshaller_OBJECT */
@@ -92,16 +76,12 @@
Etk_Object *arg1;
Etk_Bool result;
- if (!callback || !object)
- return;
-
arg1 = va_arg(arguments, Etk_Object *);
callback_OBJECT = (Etk_Callback_OBJECT)callback;
result = callback_OBJECT(object, arg1, data);
- if (return_value)
- *((Etk_Bool *)return_value) = result;
+ *((Etk_Bool *)return_value) = result;
}
/* etk_marshaller_POINTER */
@@ -112,16 +92,12 @@
void *arg1;
Etk_Bool result;
- if (!callback || !object)
- return;
-
arg1 = va_arg(arguments, void *);
callback_POINTER = (Etk_Callback_POINTER)callback;
result = callback_POINTER(object, arg1, data);
- if (return_value)
- *((Etk_Bool *)return_value) = result;
+ *((Etk_Bool *)return_value) = result;
}
@@ -134,15 +110,29 @@
void *arg2;
Etk_Bool result;
- if (!callback || !object)
- return;
-
arg1 = va_arg(arguments, void *);
arg2 = va_arg(arguments, void *);
callback_POINTER_POINTER = (Etk_Callback_POINTER_POINTER)callback;
result = callback_POINTER_POINTER(object, arg1, arg2, data);
- if (return_value)
- *((Etk_Bool *)return_value) = result;
+ *((Etk_Bool *)return_value) = result;
+}
+
+/* etk_marshaller_INT_POINTER */
+void etk_marshaller_INT_POINTER(Etk_Callback callback, Etk_Object *object,
void *data, void *return_value, va_list arguments)
+{
+ typedef Etk_Bool (*Etk_Callback_INT_POINTER)(Etk_Object *object, int arg1,
void *arg2, void *data);
+ Etk_Callback_INT_POINTER callback_INT_POINTER;
+ int arg1;
+ void *arg2;
+ Etk_Bool result;
+
+ arg1 = va_arg(arguments, int);
+ arg2 = va_arg(arguments, void *);
+
+ callback_INT_POINTER = (Etk_Callback_INT_POINTER)callback;
+ result = callback_INT_POINTER(object, arg1, arg2, data);
+
+ *((Etk_Bool *)return_value) = result;
}
===================================================================
RCS file: /cvs/e/e17/libs/etk/src/lib/etk_marshallers.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -3 -r1.11 -r1.12
--- etk_marshallers.h 28 Sep 2007 19:56:13 -0000 1.11
+++ etk_marshallers.h 1 Oct 2007 14:48:40 -0000 1.12
@@ -17,6 +17,7 @@
void etk_marshaller_OBJECT(Etk_Callback callback, Etk_Object *object, void
*data, void *return_value, va_list arguments);
void etk_marshaller_POINTER(Etk_Callback callback, Etk_Object *object, void
*data, void *return_value, va_list arguments);
void etk_marshaller_POINTER_POINTER(Etk_Callback callback, Etk_Object *object,
void *data, void *return_value, va_list arguments);
+void etk_marshaller_INT_POINTER(Etk_Callback callback, Etk_Object *object,
void *data, void *return_value, va_list arguments);
#ifdef __cplusplus
}
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2005.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
