On Tue, May 19, 2009 at 10:09 AM, Viktor Kojouharov
<[email protected]> wrote:
> On Tue, 2009-05-19 at 05:26 -0700, Enlightenment SVN wrote:
>
>
> perhaps Eina_Bool success would make more sense. 'result' doesn't tell
> what the variable actually represents.
For sure! I'm terrible at choosing names. But a good documentation
would fix that anyway.
Well, it's fixed in svn.
>> Log:
>
>> Using Eina_Bool.
>>
>> Changed int -> Eina_Bool where it makes sense.
>>
>>
>> Author: antognolli
>> Date: 2009-05-19 05:26:31 -0700 (Tue, 19 May 2009)
>> New Revision: 40739
>>
>> Modified:
>> trunk/PROTO/ethumb/src/bin/ethumb.c trunk/PROTO/ethumb/src/lib/Ethumb.c
>> trunk/PROTO/ethumb/src/lib/Ethumb.h
>> trunk/PROTO/ethumb/src/lib/Ethumb_Plugin.h
>>
>> Modified: trunk/PROTO/ethumb/src/bin/ethumb.c
>> ===================================================================
>> --- trunk/PROTO/ethumb/src/bin/ethumb.c 2009-05-19 11:58:29 UTC (rev
>> 40738)
>> +++ trunk/PROTO/ethumb/src/bin/ethumb.c 2009-05-19 12:26:31 UTC (rev
>> 40739)
>> @@ -129,7 +129,7 @@
>> };
>>
>> static void
>> -_finished_thumb(Ethumb *e, int result, void *data)
>> +_finished_thumb(Ethumb *e, Eina_Bool result, void *data)
>> {
>> ecore_main_loop_quit();
>> }
>>
>> Modified: trunk/PROTO/ethumb/src/lib/Ethumb.c
>> ===================================================================
>> --- trunk/PROTO/ethumb/src/lib/Ethumb.c 2009-05-19 11:58:29 UTC (rev
>> 40738)
>> +++ trunk/PROTO/ethumb/src/lib/Ethumb.c 2009-05-19 12:26:31 UTC (rev
>> 40739)
>> @@ -375,7 +375,7 @@
>> if (y) *y = e->crop_y;
>> }
>>
>> -EAPI int
>> +EAPI Eina_Bool
>> ethumb_frame_set(Ethumb *e, const char *theme_file, const char *group,
>> const char *swallow)
>> {
>> EINA_SAFETY_ON_NULL_RETURN_VAL(e, 0);
>> @@ -393,7 +393,7 @@
>> if (!theme_file)
>> {
>> e->frame = NULL;
>> - return 1;
>> + return EINA_TRUE;
>> }
>>
>> if (!frame)
>> @@ -402,7 +402,7 @@
>> if (!frame)
>> {
>> ERR("could not allocate Ethumb_Frame structure.\n");
>> - return 0;
>> + return EINA_FALSE;
>> }
>>
>> frame->edje = edje_object_add(e->sub_e);
>> @@ -411,7 +411,7 @@
>> ERR("could not create edje frame object.\n");
>> _ethumb_frame_free(frame);
>> e->frame = NULL;
>> - return 0;
>> + return EINA_FALSE;
>> }
>> }
>>
>> @@ -420,7 +420,7 @@
>> ERR("could not load frame theme.\n");
>> _ethumb_frame_free(frame);
>> e->frame = NULL;
>> - return 0;
>> + return EINA_FALSE;
>> }
>>
>> edje_object_part_swallow(frame->edje, swallow, e->img);
>> @@ -429,7 +429,7 @@
>> ERR("could not swallow image to edje frame.\n");
>> _ethumb_frame_free(frame);
>> e->frame = NULL;
>> - return 0;
>> + return EINA_FALSE;
>> }
>>
>> eina_stringshare_replace(&frame->file, theme_file);
>> @@ -438,7 +438,7 @@
>>
>> e->frame = frame;
>>
>> - return 1;
>> + return EINA_TRUE;
>> }
>>
>> EAPI void
>> @@ -524,7 +524,7 @@
>> return e->document.page;
>> }
>>
>> -EAPI int
>> +EAPI Eina_Bool
>> ethumb_file_set(Ethumb *e, const char *path, const char *key)
>> {
>> EINA_SAFETY_ON_NULL_RETURN_VAL(e, NULL);
>> @@ -532,7 +532,7 @@
>> if (path && access(path, R_OK))
>> {
>> ERR("couldn't access file \"%s\"\n", path);
>> - return 0;
>> + return EINA_FALSE;
>> }
>>
>> eina_stringshare_replace(&e->src_path, path);
>> @@ -540,7 +540,7 @@
>> eina_stringshare_replace(&e->thumb_path, NULL);
>> eina_stringshare_replace(&e->thumb_key, NULL);
>>
>> - return 1;
>> + return EINA_TRUE;
>> }
>>
>> EAPI void
>> @@ -789,7 +789,7 @@
>> }
>> }
>>
>> -static int
>> +static Eina_Bool
>> _ethumb_plugin_generate(Ethumb *e)
>> {
>> const char *ext;
>> @@ -799,14 +799,14 @@
>> if (!ext)
>> {
>> ERR("could not get extension for file \"%s\"\n", e->src_path);
>> - return 0;
>> + return EINA_FALSE;
>> }
>>
>> plugin = eina_hash_find(_plugins_ext, ext + 1);
>> if (!plugin)
>> {
>> DBG("no plugin for extension: \"%s\"\n", ext + 1);
>> - return 0;
>> + return EINA_FALSE;
>> }
>>
>> if (e->frame)
>> @@ -816,10 +816,10 @@
>>
>> plugin->generate_thumb(e);
>>
>> - return 1;
>> + return EINA_TRUE;
>> }
>>
>> -int
>> +Eina_Bool
>> ethumb_plugin_image_resize(Ethumb *e, int w, int h)
>> {
>> Evas_Object *img;
>> @@ -846,13 +846,13 @@
>> e->rw = w;
>> e->rh = h;
>>
>> - return 1;
>> + return EINA_TRUE;
>> }
>>
>> -int
>> +Eina_Bool
>> ethumb_image_save(Ethumb *e)
>> {
>> - int r;
>> + Eina_Bool r;
>> char *dname;
>>
>> evas_damage_rectangle_add(e->sub_e, 0, 0, e->rw, e->rh);
>> @@ -864,7 +864,7 @@
>> if (!e->thumb_path)
>> {
>> ERR("could not create file path...\n");
>> - return 0;
>> + return EINA_FALSE;
>> }
>>
>> dname = ecore_file_dir_get(e->thumb_path);
>> @@ -873,7 +873,7 @@
>> if (!r)
>> {
>> ERR("could not create directory '%s'\n", dname);
>> - return 0;
>> + return EINA_FALSE;
>> }
>>
>> r = evas_object_image_save(e->o, e->thumb_path, e->thumb_key,
>> @@ -882,10 +882,10 @@
>> if (!r)
>> {
>> ERR("could not save image.\n");
>> - return 0;
>> + return EINA_FALSE;
>> }
>>
>> - return 1;
>> + return EINA_TRUE;
>> }
>>
>> static int
>> @@ -973,7 +973,7 @@
>> e->finished_idler = ecore_idler_add(_ethumb_finished_idler_cb, e);
>> }
>>
>> -EAPI int
>> +EAPI Eina_Bool
>> ethumb_generate(Ethumb *e, ethumb_generate_callback_t finished_cb, void
>> *data)
>> {
>> int r;
>> @@ -985,34 +985,36 @@
>> if (e->finished_idler)
>> {
>> ERR("thumbnail generation already in progress.\n");
>> - return 0;
>> + return EINA_FALSE;
>> }
>> e->finished_cb = finished_cb;
>> e->cb_data = data;
>>
>> r = _ethumb_plugin_generate(e);
>> if (r)
>> - return 1;
>> + return EINA_TRUE;
>>
>> if (!_ethumb_image_load(e))
>> {
>> ERR("could not load input image.\n");
>> ethumb_finished_callback_call(e, 0);
>> - return 1;
>> + return EINA_TRUE;
>> }
>>
>> r = ethumb_image_save(e);
>>
>> ethumb_finished_callback_call(e, r);
>>
>> - return 1;
>> + return EINA_TRUE;
>> }
>>
>> -EAPI int
>> +EAPI Eina_Bool
>> ethumb_exists(Ethumb *e)
>> {
>> struct stat thumb, src;
>> - int r_thumb, r_src, r = 0;
>> + int r_thumb, r_src;
>> + Eina_Bool r = EINA_FALSE;
>> +
>> EINA_SAFETY_ON_NULL_RETURN_VAL(e, 0);
>> EINA_SAFETY_ON_NULL_RETURN_VAL(e->src_path, 0);
>>
>> @@ -1029,7 +1031,7 @@
>> if (r_thumb && errno != ENOENT)
>> ERR("could not access file \"%s\": %s\n", e->thumb_path,
>> strerror(errno));
>> else if (!r_thumb && thumb.st_mtime > src.st_mtime)
>> - r = 1;
>> + r = EINA_TRUE;
>>
>> return r;
>> }
>>
>> Modified: trunk/PROTO/ethumb/src/lib/Ethumb.h
>> ===================================================================
>> --- trunk/PROTO/ethumb/src/lib/Ethumb.h 2009-05-19 11:58:29 UTC (rev
>> 40738)
>> +++ trunk/PROTO/ethumb/src/lib/Ethumb.h 2009-05-19 12:26:31 UTC (rev
>> 40739)
>> @@ -34,6 +34,7 @@
>> #include <Ecore.h>
>> #include <Ecore_Evas.h>
>> #include <Evas.h>
>> +#include <Eina.h>
>>
>> #ifdef __cplusplus
>> extern "C" {
>> @@ -66,7 +67,7 @@
>>
>> typedef struct _Ethumb_Frame Ethumb_Frame;
>> typedef struct _Ethumb Ethumb;
>> -typedef void (*ethumb_generate_callback_t)(Ethumb *e, int result, void
>> *data);
>> +typedef void (*ethumb_generate_callback_t)(Ethumb *e, Eina_Bool result,
>> void *data);
>>
>> EAPI int ethumb_init(void);
>> EAPI int ethumb_shutdown(void);
>> @@ -88,7 +89,7 @@
>> EAPI void ethumb_thumb_crop_align_set(Ethumb *e, float x, float y)
>> EINA_ARG_NONNULL(1);
>> EAPI void ethumb_thumb_crop_align_get(const Ethumb *e, float *x, float *y)
>> EINA_ARG_NONNULL(1);
>>
>> -EAPI int ethumb_frame_set(Ethumb *e, const char *theme_file, const char
>> *group, const char *swallow) EINA_ARG_NONNULL(1);
>> +EAPI Eina_Bool ethumb_frame_set(Ethumb *e, const char *theme_file, const
>> char *group, const char *swallow) EINA_ARG_NONNULL(1);
>> EAPI void ethumb_frame_get(const Ethumb *e, const char **theme_file, const
>> char **group, const char **swallow) EINA_ARG_NONNULL(1);
>>
>> EAPI void ethumb_thumb_dir_path_set(Ethumb *e, const char *path)
>> EINA_ARG_NONNULL(1);
>> @@ -103,13 +104,13 @@
>> EAPI void ethumb_document_page_set(Ethumb *e, int page) EINA_ARG_NONNULL(1);
>> EAPI int ethumb_document_page_get(const Ethumb *e) EINA_WARN_UNUSED_RESULT
>> EINA_ARG_NONNULL(1) EINA_PURE;
>>
>> -EAPI int ethumb_file_set(Ethumb *e, const char *path, const char *key)
>> EINA_ARG_NONNULL(1, 2);
>> +EAPI Eina_Bool ethumb_file_set(Ethumb *e, const char *path, const char
>> *key) EINA_ARG_NONNULL(1, 2);
>> EAPI void ethumb_file_get(const Ethumb *e, const char **path, const char
>> **key) EINA_ARG_NONNULL(1);
>> EAPI void ethumb_file_free(Ethumb *e) EINA_ARG_NONNULL(1);
>> EAPI void ethumb_thumb_path_set(Ethumb *e, const char *path, const char
>> *key) EINA_ARG_NONNULL(1);
>> EAPI void ethumb_thumb_path_get(Ethumb *e, const char **path, const char
>> **key) EINA_ARG_NONNULL(1);
>> -EAPI int ethumb_generate(Ethumb *e, ethumb_generate_callback_t finished_cb,
>> void *data) EINA_ARG_NONNULL(1, 2);
>> -EAPI int ethumb_exists(Ethumb *e) EINA_WARN_UNUSED_RESULT
>> EINA_ARG_NONNULL(1) EINA_PURE;
>> +EAPI Eina_Bool ethumb_generate(Ethumb *e, ethumb_generate_callback_t
>> finished_cb, void *data) EINA_ARG_NONNULL(1, 2);
>> +EAPI Eina_Bool ethumb_exists(Ethumb *e) EINA_WARN_UNUSED_RESULT
>> EINA_ARG_NONNULL(1) EINA_PURE;
>>
>> #ifdef __cplusplus
>> }
>>
>> Modified: trunk/PROTO/ethumb/src/lib/Ethumb_Plugin.h
>> ===================================================================
>> --- trunk/PROTO/ethumb/src/lib/Ethumb_Plugin.h 2009-05-19 11:58:29
>> UTC (rev 40738)
>> +++ trunk/PROTO/ethumb/src/lib/Ethumb_Plugin.h 2009-05-19 12:26:31
>> UTC (rev 40739)
>> @@ -15,8 +15,8 @@
>>
>> void ethumb_calculate_aspect(Ethumb *e, int iw, int ih, int *w, int *h);
>> void ethumb_calculate_fill(Ethumb *e, int iw, int ih, int *fx, int *fy, int
>> *fw, int *fh);
>> -int ethumb_plugin_image_resize(Ethumb *e, int w, int h);
>> -int ethumb_image_save(Ethumb *e);
>> +Eina_Bool ethumb_plugin_image_resize(Ethumb *e, int w, int h);
>> +Eina_Bool ethumb_image_save(Ethumb *e);
>> void ethumb_finished_callback_call(Ethumb *e, int result);
>> Evas * ethumb_evas_get(const Ethumb *e);
>>
>>
>>
>> ------------------------------------------------------------------------------
>> Crystal Reports - New Free Runtime and 30 Day Trial
>> Check out the new simplified licensing option that enables
>> unlimited royalty-free distribution of the report engine
>> for externally facing server and web deployment.
>> http://p.sf.net/sfu/businessobjects
>> _______________________________________________
>> enlightenment-svn mailing list
>> [email protected]
>> https://lists.sourceforge.net/lists/listinfo/enlightenment-svn
>
>
--
Rafael Antognolli
ProFUSION embedded systems
http://profusion.mobi
------------------------------------------------------------------------------
Crystal Reports - New Free Runtime and 30 Day Trial
Check out the new simplified licensing option that enables
unlimited royalty-free distribution of the report engine
for externally facing server and web deployment.
http://p.sf.net/sfu/businessobjects
_______________________________________________
enlightenment-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
