From: Enlightenment S. <no-...@en...> - 2011-11-04 23:19:21
|
Log: fix a few warnings i get on 64bit than didnt pop up on 32, revert edje module load api break -back to eina_bool return. add some @sinces even if there are no docs. Author: raster Date: 2011-11-04 16:19:14 -0700 (Fri, 04 Nov 2011) New Revision: 64751 Trac: http://trac.enlightenment.org/e/changeset/64751 Modified: trunk/edje/src/bin/edje_multisense_convert.c trunk/edje/src/lib/Edje.h trunk/edje/src/lib/edje_module.c trunk/edje/src/lib/edje_multisense.c trunk/edje/src/lib/edje_private.h trunk/edje/src/modules/eet_snd_reader/eet_snd_reader.c Modified: trunk/edje/src/bin/edje_multisense_convert.c =================================================================== --- trunk/edje/src/bin/edje_multisense_convert.c 2011-11-04 22:42:41 UTC (rev 64750) +++ trunk/edje/src/bin/edje_multisense_convert.c 2011-11-04 23:19:14 UTC (rev 64751) @@ -156,7 +156,7 @@ if (ok) { init_status = FLAC__stream_encoder_init_file(encoder, snd_path, NULL, - (void *)(total_samples)); + (void *)(long)(total_samples)); if (init_status != FLAC__STREAM_ENCODER_INIT_STATUS_OK) { ERR("ERROR: unable to initialize FLAC encoder: %s\n", Modified: trunk/edje/src/lib/Edje.h =================================================================== --- trunk/edje/src/lib/Edje.h 2011-11-04 22:42:41 UTC (rev 64750) +++ trunk/edje/src/lib/Edje.h 2011-11-04 23:19:14 UTC (rev 64751) @@ -615,8 +615,8 @@ EDJE_ACTION_TYPE_FOCUS_OBJECT = 10, EDJE_ACTION_TYPE_PARAM_COPY = 11, EDJE_ACTION_TYPE_PARAM_SET = 12, - EDJE_ACTION_TYPE_SOUND_SAMPLE = 13, - EDJE_ACTION_TYPE_SOUND_TONE = 14, + EDJE_ACTION_TYPE_SOUND_SAMPLE = 13, /**< @since 1.1 */ + EDJE_ACTION_TYPE_SOUND_TONE = 14, /**< @since 1.1 */ EDJE_ACTION_TYPE_LAST = 15 } Edje_Action_Type; @@ -3801,7 +3801,7 @@ */ EAPI const Edje_External_Type *edje_external_type_get (const char *type_name); - EAPI Eina_Module *edje_module_load (const char *module); + EAPI Eina_Bool edje_module_load (const char *module); EAPI const Eina_List *edje_available_modules_get (void); /* perspective info for maps inside edje objects */ Modified: trunk/edje/src/lib/edje_module.c =================================================================== --- trunk/edje/src/lib/edje_module.c 2011-11-04 22:42:41 UTC (rev 64750) +++ trunk/edje/src/lib/edje_module.c 2011-11-04 23:19:14 UTC (rev 64751) @@ -14,9 +14,16 @@ # define EDJE_MODULE_NAME "module.so" #endif -EAPI Eina_Module * +EAPI Eina_Bool edje_module_load(const char *module) { + if (_edje_module_handle_load(module)) return EINA_TRUE; + return EINA_FALSE; +} + +Eina_Module * +_edje_module_handle_load(const char *module) +{ const char *path; Eina_List *l; Eina_Module *em = NULL; Modified: trunk/edje/src/lib/edje_multisense.c =================================================================== --- trunk/edje/src/lib/edje_multisense.c 2011-11-04 22:42:41 UTC (rev 64750) +++ trunk/edje/src/lib/edje_multisense.c 2011-11-04 23:19:14 UTC (rev 64751) @@ -88,7 +88,7 @@ else strcpy(ms_factory, "multisense_factory"); - m = edje_module_load(ms_factory); + m = _edje_module_handle_load(ms_factory); if (!m) goto err; #ifdef HAVE_LIBREMIX @@ -197,7 +197,7 @@ edje_remix_tone_create(Multisense_Data *msdata, Edje*ed, Edje_Tone_Action *action) { Edje_Sound_Tone *tone; - RemixSquareTone *square; + RemixSquareTone *square = NULL; unsigned int i; if ((!ed) || (!ed->file) || (!ed->file->sound_dir)) Modified: trunk/edje/src/lib/edje_private.h =================================================================== --- trunk/edje/src/lib/edje_private.h 2011-11-04 22:42:41 UTC (rev 64750) +++ trunk/edje/src/lib/edje_private.h 2011-11-04 23:19:14 UTC (rev 64751) @@ -1908,8 +1908,9 @@ void *_edje_external_params_parse(Evas_Object *obj, const Eina_List *params); void _edje_external_parsed_params_free(Evas_Object *obj, void *params); -EAPI void _edje_module_init(); -EAPI void _edje_module_shutdown(); +Eina_Module *_edje_module_handle_load(const char *module); +void _edje_module_init(); +void _edje_module_shutdown(); static inline Eina_Bool edje_program_is_strncmp(const char *str) @@ -1936,6 +1937,7 @@ return EINA_TRUE; } +/* used by edje_cc - private still */ EAPI void _edje_program_insert(Edje_Part_Collection *ed, Edje_Program *p); EAPI void _edje_program_remove(Edje_Part_Collection *ed, Edje_Program *p); Modified: trunk/edje/src/modules/eet_snd_reader/eet_snd_reader.c =================================================================== --- trunk/edje/src/modules/eet_snd_reader/eet_snd_reader.c 2011-11-04 22:42:41 UTC (rev 64750) +++ trunk/edje/src/modules/eet_snd_reader/eet_snd_reader.c 2011-11-04 23:19:14 UTC (rev 64751) @@ -133,7 +133,7 @@ static RemixBase * remix_eet_sndfile_create(RemixEnv *env, RemixBase *sndfile, const char *path, const char *sound_id, const double speed) { - SF_VIRTUAL_IO *eet_vio; + SF_VIRTUAL_IO *eet_vio = NULL; SndInstanceData *si; const void *sound_data; int sound_size; |