Menu
▾
▴
Re: [E-devel] E SVN: raster IN trunk/eet/src: bin examples lib tests
|
From: Vincent T. <vt...@un...> - 2010-08-01 08:05:06
|
On Fri, 30 Jul 2010, Enlightenment SVN wrote:
> Log:
> formatting. <- uncrustify
>
>
> Author: raster
> Date: 2010-07-30 18:54:48 -0700 (Fri, 30 Jul 2010)
> New Revision: 50698
>
> Modified:
> trunk/eet/src/bin/eet_main.c trunk/eet/src/examples/eet-data-file_descriptor.c trunk/eet/src/examples/eet-data-nested.c trunk/eet/src/examples/eet-data-simple.c trunk/eet/src/lib/Eet.h trunk/eet/src/lib/Eet_private.h trunk/eet/src/lib/eet_cipher.c trunk/eet/src/lib/eet_connection.c trunk/eet/src/lib/eet_data.c trunk/eet/src/lib/eet_dictionary.c trunk/eet/src/lib/eet_image.c trunk/eet/src/lib/eet_lib.c trunk/eet/src/lib/eet_node.c trunk/eet/src/lib/eet_utils.c trunk/eet/src/tests/eet_data_suite.c trunk/eet/src/tests/eet_suite.c trunk/eet/src/tests/eet_suite.h
>
> Modified: trunk/eet/src/bin/eet_main.c
> ===================================================================
> --- trunk/eet/src/bin/eet_main.c 2010-07-31 01:54:32 UTC (rev 50697)
> +++ trunk/eet/src/bin/eet_main.c 2010-07-31 01:54:48 UTC (rev 50698)
> @@ -4,55 +4,54 @@
>
> #ifdef HAVE_CONFIG_H
> # include <config.h>
> -#endif
> +#endif /* ifdef HAVE_CONFIG_H */
can't you just have +#endif /* HAVE_CONFIG_H */
> #ifndef _MSC_VER
> # include <unistd.h>
> -#endif
> +#endif /* ifndef _MSC_VER */
and #endif /* ! _MSC_VER */
(maybe it's too difficult to have the correct comment, especially if there
is a #else)
?
Vincent
>
> #ifdef HAVE_EVIL
> # include <Evil.h>
> -#endif
> +#endif /* ifdef HAVE_EVIL */
>
> #include <Eet.h>
>
> -
> static int _eet_main_log_dom = -1;
>
> #ifdef EET_DEFAULT_LOG_COLOR
> #undef EET_DEFAULT_LOG_COLOR
> -#endif
> +#endif /* ifdef EET_DEFAULT_LOG_COLOR */
> #define EET_DEFAULT_LOG_COLOR EINA_COLOR_CYAN
> #ifdef ERR
> #undef ERR
> -#endif
> -#define ERR(...) EINA_LOG_DOM_ERR(_eet_main_log_dom, __VA_ARGS__)
> +#endif /* ifdef ERR */
> +#define ERR(...) EINA_LOG_DOM_ERR(_eet_main_log_dom, __VA_ARGS__)
> #ifdef DBG
> #undef DBG
> -#endif
> -#define DBG(...) EINA_LOG_DOM_DBG(_eet_main_log_dom, __VA_ARGS__)
> +#endif /* ifdef DBG */
> +#define DBG(...) EINA_LOG_DOM_DBG(_eet_main_log_dom, __VA_ARGS__)
> #ifdef INF
> #undef INF
> -#endif
> -#define INF(...) EINA_LOG_DOM_INFO(_eet_main_log_dom, __VA_ARGS__)
> +#endif /* ifdef INF */
> +#define INF(...) EINA_LOG_DOM_INFO(_eet_main_log_dom, __VA_ARGS__)
> #ifdef WRN
> #undef WRN
> -#endif
> -#define WRN(...) EINA_LOG_DOM_WARN(_eet_main_log_dom, __VA_ARGS__)
> +#endif /* ifdef WRN */
> +#define WRN(...) EINA_LOG_DOM_WARN(_eet_main_log_dom, __VA_ARGS__)
> #ifdef CRIT
> #undef CRIT
> -#endif
> +#endif /* ifdef CRIT */
> #define CRIT(...) EINA_LOG_DOM_CRIT(_eet_main_log_dom, __VA_ARGS__)
>
> static void
> -do_eet_list(const char *file)
> +do_eet_list(const char * file)
> {
> int i, num;
> - char **list;
> - Eet_File *ef;
> + char ** list;
> + Eet_File * ef;
>
> ef = eet_open(file, EET_FILE_MODE_READ);
> if (!ef)
> @@ -70,18 +69,18 @@
> }
>
> eet_close(ef);
> -}
> +} /* do_eet_list */
>
> static void
> -do_eet_extract(const char *file,
> - const char *key,
> - const char *out,
> - const char *crypto_key)
> +do_eet_extract(const char * file,
> + const char * key,
> + const char * out,
> + const char * crypto_key)
> {
> - Eet_File *ef;
> - void *data;
> + Eet_File * ef;
> + void * data;
> int size = 0;
> - FILE *f;
> + FILE * f;
>
> ef = eet_open(file, EET_FILE_MODE_READ);
> if (!ef)
> @@ -113,22 +112,22 @@
> fclose(f);
> free(data);
> eet_close(ef);
> -}
> +} /* do_eet_extract */
>
> static void
> -do_eet_decode_dump(void *data, const char *str)
> +do_eet_decode_dump(void * data, const char * str)
> {
> fputs(str, (FILE *)data);
> -}
> +} /* do_eet_decode_dump */
>
> static void
> -do_eet_decode(const char *file,
> - const char *key,
> - const char *out,
> - const char *crypto_key)
> +do_eet_decode(const char * file,
> + const char * key,
> + const char * out,
> + const char * crypto_key)
> {
> - Eet_File *ef;
> - FILE *f;
> + Eet_File * ef;
> + FILE * f;
>
> ef = eet_open(file, EET_FILE_MODE_READ);
> if (!ef)
> @@ -152,19 +151,19 @@
>
> fclose(f);
> eet_close(ef);
> -}
> +} /* do_eet_decode */
>
> static void
> -do_eet_insert(const char *file,
> - const char *key,
> - const char *out,
> - int compress,
> - const char *crypto_key)
> +do_eet_insert(const char * file,
> + const char * key,
> + const char * out,
> + int compress,
> + const char * crypto_key)
> {
> - Eet_File *ef;
> - void *data;
> + Eet_File * ef;
> + void * data;
> int size = 0;
> - FILE *f;
> + FILE * f;
>
> ef = eet_open(file, EET_FILE_MODE_READ_WRITE);
> if (!ef)
> @@ -203,20 +202,20 @@
> eet_write_cipher(ef, key, data, size, compress, crypto_key);
> free(data);
> eet_close(ef);
> -}
> +} /* do_eet_insert */
>
> static void
> -do_eet_encode(const char *file,
> - const char *key,
> - const char *out,
> - int compress,
> - const char *crypto_key)
> +do_eet_encode(const char * file,
> + const char * key,
> + const char * out,
> + int compress,
> + const char * crypto_key)
> {
> - Eet_File *ef;
> - char *text;
> + Eet_File * ef;
> + char * text;
> int textlen = 0;
> int size = 0;
> - FILE *f;
> + FILE * f;
>
> ef = eet_open(file, EET_FILE_MODE_READ_WRITE);
> if (!ef)
> @@ -260,12 +259,12 @@
>
> free(text);
> eet_close(ef);
> -}
> +} /* do_eet_encode */
>
> static void
> -do_eet_remove(const char *file, const char *key)
> +do_eet_remove(const char * file, const char * key)
> {
> - Eet_File *ef;
> + Eet_File * ef;
>
> ef = eet_open(file, EET_FILE_MODE_READ_WRITE);
> if (!ef)
> @@ -276,13 +275,13 @@
>
> eet_delete(ef, key);
> eet_close(ef);
> -}
> +} /* do_eet_remove */
>
> static void
> -do_eet_check(const char *file)
> +do_eet_check(const char * file)
> {
> - Eet_File *ef;
> - const void *der;
> + Eet_File * ef;
> + const void * der;
> int der_length;
> int sign_length;
>
> @@ -302,13 +301,13 @@
> fprintf(stdout, "Signature length %i.\n", sign_length);
>
> eet_close(ef);
> -}
> +} /* do_eet_check */
>
> static void
> -do_eet_sign(const char *file, const char *private_key, const char *public_key)
> +do_eet_sign(const char * file, const char * private_key, const char * public_key)
> {
> - Eet_File *ef;
> - Eet_Key *key;
> + Eet_File * ef;
> + Eet_Key * key;
>
> ef = eet_open(file, EET_FILE_MODE_READ_WRITE);
> if (!ef)
> @@ -330,10 +329,10 @@
> eet_identity_set(ef, key);
>
> eet_close(ef);
> -}
> +} /* do_eet_sign */
>
> int
> -main(int argc, char **argv)
> +main(int argc, char ** argv)
> {
> if (!eet_init())
> return -1;
> @@ -397,7 +396,7 @@
> do_eet_encode(argv[2], argv[3], argv[4], atoi(argv[5]), NULL);
> }
> else if ((!strcmp(argv[1], "-r")) && (argc > 3))
> - do_eet_remove(argv[2], argv[3]);
> + do_eet_remove(argv[2], argv[3]);
> else if ((!strcmp(argv[1], "-c")) && (argc > 2))
> do_eet_check(argv[2]);
> else if ((!strcmp(argv[1], "-s")) && (argc > 4))
> @@ -408,4 +407,5 @@
> eina_log_domain_unregister(_eet_main_log_dom);
> eet_shutdown();
> return 0;
> -}
> +} /* main */
> +
>
> Modified: trunk/eet/src/examples/eet-data-file_descriptor.c
> ===================================================================
> --- trunk/eet/src/examples/eet-data-file_descriptor.c 2010-07-31 01:54:32 UTC (rev 50697)
> +++ trunk/eet/src/examples/eet-data-file_descriptor.c 2010-07-31 01:54:48 UTC (rev 50698)
> @@ -9,9 +9,9 @@
> // complex real-world structures based on elmdentica database
> typedef struct
> {
> - const char *screen_name;
> - const char *name;
> - const char *message;
> + const char * screen_name;
> + const char * name;
> + const char * message;
> unsigned int id;
> unsigned int status_id;
> unsigned int date;
> @@ -20,22 +20,22 @@
>
> typedef struct
> {
> - const char *dm_to;
> - const char *message;
> + const char * dm_to;
> + const char * message;
> } My_Post;
>
> typedef struct
> {
> unsigned int id;
> - const char *name;
> - Eina_List *messages;
> - Eina_List *posts;
> + const char * name;
> + Eina_List * messages;
> + Eina_List * posts;
> } My_Account;
>
> typedef struct
> {
> unsigned int version; // it is recommended to use versioned configuration!
> - Eina_List *accounts;
> + Eina_List * accounts;
> } My_Cache;
>
> // string that represents the entry in eet file, you might like to have
> @@ -46,14 +46,14 @@
> // keep the descriptor static global, so it can be
> // shared by different functions (load/save) of this and only this
> // file.
> -static Eet_Data_Descriptor *_my_cache_descriptor;
> -static Eet_Data_Descriptor *_my_account_descriptor;
> -static Eet_Data_Descriptor *_my_message_descriptor;
> -static Eet_Data_Descriptor *_my_post_descriptor;
> +static Eet_Data_Descriptor * _my_cache_descriptor;
> +static Eet_Data_Descriptor * _my_account_descriptor;
> +static Eet_Data_Descriptor * _my_message_descriptor;
> +static Eet_Data_Descriptor * _my_post_descriptor;
>
> // keep file handle alive, so mmap()ed strings are all alive as well
> -static Eet_File *_my_cache_file = NULL;
> -static Eet_Dictionary *_my_cache_dict = NULL;
> +static Eet_File * _my_cache_file = NULL;
> +static Eet_Dictionary * _my_cache_dict = NULL;
>
> static void
> _my_cache_descriptor_init(void)
> @@ -78,8 +78,8 @@
> // Describe the members to be saved:
> // Use a temporary macro so we don't type a lot, also avoid errors:
>
> -#define ADD_BASIC(member, eet_type) \
> - EET_DATA_DESCRIPTOR_ADD_BASIC \
> +#define ADD_BASIC(member, eet_type)\
> + EET_DATA_DESCRIPTOR_ADD_BASIC\
> (_my_message_descriptor, My_Message, # member, member, eet_type)
> ADD_BASIC(screen_name, EET_T_STRING);
> ADD_BASIC(name, EET_T_STRING);
> @@ -90,15 +90,15 @@
> ADD_BASIC(timeline, EET_T_UINT);
> #undef ADD_BASIC
>
> -#define ADD_BASIC(member, eet_type) \
> - EET_DATA_DESCRIPTOR_ADD_BASIC \
> +#define ADD_BASIC(member, eet_type)\
> + EET_DATA_DESCRIPTOR_ADD_BASIC\
> (_my_post_descriptor, My_Post, # member, member, eet_type)
> ADD_BASIC(dm_to, EET_T_STRING);
> ADD_BASIC(message, EET_T_STRING);
> #undef ADD_BASIC
>
> -#define ADD_BASIC(member, eet_type) \
> - EET_DATA_DESCRIPTOR_ADD_BASIC \
> +#define ADD_BASIC(member, eet_type)\
> + EET_DATA_DESCRIPTOR_ADD_BASIC\
> (_my_account_descriptor, My_Account, # member, member, eet_type)
> ADD_BASIC(name, EET_T_STRING);
> ADD_BASIC(id, EET_T_UINT);
> @@ -111,8 +111,8 @@
> (_my_account_descriptor, My_Account, "posts", posts,
> _my_post_descriptor);
>
> -#define ADD_BASIC(member, eet_type) \
> - EET_DATA_DESCRIPTOR_ADD_BASIC \
> +#define ADD_BASIC(member, eet_type)\
> + EET_DATA_DESCRIPTOR_ADD_BASIC\
> (_my_cache_descriptor, My_Cache, # member, member, eet_type)
> ADD_BASIC(version, EET_T_UINT);
> #undef ADD_BASIC
> @@ -120,7 +120,7 @@
> EET_DATA_DESCRIPTOR_ADD_LIST
> (_my_cache_descriptor, My_Cache, "accounts", accounts,
> _my_account_descriptor);
> -}
> +} /* _my_cache_descriptor_init */
>
> static void
> _my_cache_descriptor_shutdown(void)
> @@ -129,12 +129,12 @@
> eet_data_descriptor_free(_my_account_descriptor);
> eet_data_descriptor_free(_my_message_descriptor);
> eet_data_descriptor_free(_my_post_descriptor);
> -}
> +} /* _my_cache_descriptor_shutdown */
>
> // need to check if the pointer came from mmaped area in eet_dictionary
> // or it was allocated with eina_stringshare_add()
> static void
> -_eet_string_free(const char *str)
> +_eet_string_free(const char * str)
> {
> if (!str)
> return;
> @@ -143,12 +143,12 @@
> return;
>
> eina_stringshare_del(str);
> -}
> +} /* _eet_string_free */
>
> static My_Message *
> -_my_message_new(const char *message)
> +_my_message_new(const char * message)
> {
> - My_Message *msg = calloc(1, sizeof(My_Message));
> + My_Message * msg = calloc(1, sizeof(My_Message));
> if (!msg)
> {
> fprintf(stderr, "ERROR: could not calloc My_Message\n");
> @@ -157,21 +157,21 @@
>
> msg->message = eina_stringshare_add(message);
> return msg;
> -}
> +} /* _my_message_new */
>
> static void
> -_my_message_free(My_Message *msg)
> +_my_message_free(My_Message * msg)
> {
> _eet_string_free(msg->screen_name);
> _eet_string_free(msg->name);
> _eet_string_free(msg->message);
> free(msg);
> -}
> +} /* _my_message_free */
>
> static My_Post *
> -_my_post_new(const char *message)
> +_my_post_new(const char * message)
> {
> - My_Post *post = calloc(1, sizeof(My_Post));
> + My_Post * post = calloc(1, sizeof(My_Post));
> if (!post)
> {
> fprintf(stderr, "ERROR: could not calloc My_Post\n");
> @@ -180,20 +180,20 @@
>
> post->message = eina_stringshare_add(message);
> return post;
> -}
> +} /* _my_post_new */
>
> static void
> -_my_post_free(My_Post *post)
> +_my_post_free(My_Post * post)
> {
> _eet_string_free(post->dm_to);
> _eet_string_free(post->message);
> free(post);
> -}
> +} /* _my_post_free */
>
> static My_Account *
> -_my_account_new(const char *name)
> +_my_account_new(const char * name)
> {
> - My_Account *acc = calloc(1, sizeof(My_Account));
> + My_Account * acc = calloc(1, sizeof(My_Account));
> if (!acc)
> {
> fprintf(stderr, "ERROR: could not calloc My_Account\n");
> @@ -202,13 +202,13 @@
>
> acc->name = eina_stringshare_add(name);
> return acc;
> -}
> +} /* _my_account_new */
>
> static void
> -_my_account_free(My_Account *acc)
> +_my_account_free(My_Account * acc)
> {
> - My_Message *m;
> - My_Post *p;
> + My_Message * m;
> + My_Post * p;
>
> _eet_string_free(acc->name);
>
> @@ -219,12 +219,12 @@
> _my_post_free(p);
>
> free(acc);
> -}
> +} /* _my_account_free */
>
> static My_Cache *
> _my_cache_new(void)
> {
> - My_Cache *my_cache = calloc(1, sizeof(My_Cache));
> + My_Cache * my_cache = calloc(1, sizeof(My_Cache));
> if (!my_cache)
> {
> fprintf(stderr, "ERROR: could not calloc My_Cache\n");
> @@ -233,34 +233,34 @@
>
> my_cache->version = 1;
> return my_cache;
> -}
> +} /* _my_cache_new */
>
> static void
> -_my_cache_free(My_Cache *my_cache)
> +_my_cache_free(My_Cache * my_cache)
> {
> - My_Account *acc;
> + My_Account * acc;
> EINA_LIST_FREE(my_cache->accounts, acc)
> _my_account_free(acc);
> free(my_cache);
> -}
> +} /* _my_cache_free */
>
> static My_Account *
> -_my_cache_account_find(My_Cache *my_cache, const char *name)
> +_my_cache_account_find(My_Cache * my_cache, const char * name)
> {
> - My_Account *acc;
> - Eina_List *l;
> + My_Account * acc;
> + Eina_List * l;
> EINA_LIST_FOREACH(my_cache->accounts, l, acc)
> if (strcmp(acc->name, name) == 0)
> return acc;
>
> return NULL;
> -}
> +} /* _my_cache_account_find */
>
> static My_Cache *
> -_my_cache_load(const char *filename)
> +_my_cache_load(const char * filename)
> {
> - My_Cache *my_cache;
> - Eet_File *ef = eet_open(filename, EET_FILE_MODE_READ);
> + My_Cache * my_cache;
> + Eet_File * ef = eet_open(filename, EET_FILE_MODE_READ);
> if (!ef)
> {
> fprintf(stderr, "ERROR: could not open '%s' for read\n", filename);
> @@ -290,13 +290,13 @@
> _my_cache_dict = eet_dictionary_get(ef);
>
> return my_cache;
> -}
> +} /* _my_cache_load */
>
> static Eina_Bool
> -_my_cache_save(const My_Cache *my_cache, const char *filename)
> +_my_cache_save(const My_Cache * my_cache, const char * filename)
> {
> char tmp[PATH_MAX];
> - Eet_File *ef;
> + Eet_File * ef;
> Eina_Bool ret;
> unsigned int i, len;
> struct stat st;
> @@ -343,13 +343,13 @@
> }
>
> return ret;
> -}
> +} /* _my_cache_save */
>
> -int main(int argc, char *argv[])
> +int main(int argc, char * argv[])
> {
> - My_Cache *my_cache;
> - const Eina_List *l_acc;
> - My_Account *acc;
> + My_Cache * my_cache;
> + const Eina_List * l_acc;
> + My_Account * acc;
> int ret = 0;
>
> if (argc < 3)
> @@ -387,7 +387,7 @@
> {
> if (argc == 5)
> {
> - My_Account *acc = _my_cache_account_find(my_cache, argv[4]);
> + My_Account * acc = _my_cache_account_find(my_cache, argv[4]);
> if (!acc)
> {
> acc = _my_account_new(argv[4]);
> @@ -399,7 +399,7 @@
> argv[4]);
> }
> else
> - fprintf(stderr,
> + fprintf(stderr,
> "ERROR: wrong number of parameters (%d).\n",
> argc);
> }
> @@ -407,17 +407,17 @@
> {
> if (argc == 6)
> {
> - My_Account *acc = _my_cache_account_find(my_cache, argv[4]);
> + My_Account * acc = _my_cache_account_find(my_cache, argv[4]);
> if (acc)
> {
> - My_Post *post = _my_post_new(argv[5]);
> + My_Post * post = _my_post_new(argv[5]);
> acc->posts = eina_list_append(acc->posts, post);
> }
> else
> fprintf(stderr, "ERROR: unknown account: '%s'\n", argv[4]);
> }
> else
> - fprintf(stderr,
> + fprintf(stderr,
> "ERROR: wrong number of parameters (%d).\n",
> argc);
> }
> @@ -425,32 +425,32 @@
> {
> if (argc == 6)
> {
> - My_Account *acc = _my_cache_account_find(my_cache, argv[4]);
> + My_Account * acc = _my_cache_account_find(my_cache, argv[4]);
> if (acc)
> {
> - My_Message *msg = _my_message_new(argv[5]);
> + My_Message * msg = _my_message_new(argv[5]);
> acc->messages = eina_list_append(acc->messages, msg);
> }
> else
> fprintf(stderr, "ERROR: unknown account: '%s'\n", argv[4]);
> }
> else
> - fprintf(stderr,
> + fprintf(stderr,
> "ERROR: wrong number of parameters (%d).\n",
> argc);
> }
> else
> - fprintf(stderr, "ERROR: unknown action '%s'\n", argv[2]);
> + fprintf(stderr, "ERROR: unknown action '%s'\n", argv[2]);
> }
>
> - printf("My_Cache:\n"
> + printf("My_Cache:\n"
> "\tversion.: %#x\n"
> "\taccounts: %u\n",
> my_cache->version,
> eina_list_count(my_cache->accounts));
> EINA_LIST_FOREACH(my_cache->accounts, l_acc, acc)
> {
> - const My_Post *post;
> + const My_Post * post;
>
> printf("\t > %-#8x '%.20s' stats: m=%u, p=%u\n",
> acc->id, acc->name ? acc->name : "",
> @@ -459,8 +459,8 @@
>
> if (eina_list_count(acc->messages))
> {
> - const Eina_List *l;
> - const My_Message *msg;
> + const Eina_List * l;
> + const My_Message * msg;
> printf("\t |messages:\n");
>
> EINA_LIST_FOREACH(acc->messages, l, msg)
> @@ -475,11 +475,11 @@
>
> if (eina_list_count(acc->posts))
> {
> - const Eina_List *l;
> - const My_Post *post;
> - printf("\t |posts:\n");
> + const Eina_List * l;
> + const My_Post * post;
> + printf("\t |posts:\n");
>
> - EINA_LIST_FOREACH(acc->posts, l, post)
> + EINA_LIST_FOREACH(acc->posts, l, post)
> {
> if (post->dm_to)
> printf("\t | @%s: '%.20s'\n", post->dm_to, post->message);
> @@ -488,7 +488,7 @@
> }
> }
>
> - printf("\n");
> + printf("\n");
> }
>
> if (!_my_cache_save(my_cache, argv[2]))
> @@ -502,4 +502,5 @@
> eina_shutdown();
>
> return ret;
> -}
> +} /* main */
> +
>
> Modified: trunk/eet/src/examples/eet-data-nested.c
> ===================================================================
> --- trunk/eet/src/examples/eet-data-nested.c 2010-07-31 01:54:32 UTC (rev 50697)
> +++ trunk/eet/src/examples/eet-data-nested.c 2010-07-31 01:54:48 UTC (rev 50698)
> @@ -14,17 +14,17 @@
> typedef struct
> {
> unsigned int version; // it is recommended to use versioned configuration!
> - const char *name;
> - int id;
> - int not_saved_value; // example of not saved data inside!
> - Eina_Bool enabled;
> - Eina_List *subs;
> + const char * name;
> + int id;
> + int not_saved_value; // example of not saved data inside!
> + Eina_Bool enabled;
> + Eina_List * subs;
> } My_Conf_Type;
>
> typedef struct
> {
> - const char *server;
> - int port;
> + const char * server;
> + int port;
> } My_Conf_Subtype;
>
> // string that represents the entry in eet file, you might like to have
> @@ -32,12 +32,11 @@
> // different strings
> static const char MY_CONF_FILE_ENTRY[] = "config";
>
> -
> // keep the descriptor static global, so it can be
> // shared by different functions (load/save) of this and only this
> // file.
> -static Eet_Data_Descriptor *_my_conf_descriptor;
> -static Eet_Data_Descriptor *_my_conf_sub_descriptor;
> +static Eet_Data_Descriptor * _my_conf_descriptor;
> +static Eet_Data_Descriptor * _my_conf_sub_descriptor;
>
> static void
> _my_conf_descriptor_init(void)
> @@ -64,11 +63,11 @@
>
> // Describe the members to be saved:
> // Use a temporary macro so we don't type a lot, also avoid errors:
> -#define MY_CONF_ADD_BASIC(member, eet_type) \
> - EET_DATA_DESCRIPTOR_ADD_BASIC \
> +#define MY_CONF_ADD_BASIC(member, eet_type)\
> + EET_DATA_DESCRIPTOR_ADD_BASIC\
> (_my_conf_descriptor, My_Conf_Type, # member, member, eet_type)
> -#define MY_CONF_SUB_ADD_BASIC(member, eet_type) \
> - EET_DATA_DESCRIPTOR_ADD_BASIC \
> +#define MY_CONF_SUB_ADD_BASIC(member, eet_type)\
> + EET_DATA_DESCRIPTOR_ADD_BASIC\
> (_my_conf_sub_descriptor, My_Conf_Subtype, # member, member, eet_type)
>
> MY_CONF_SUB_ADD_BASIC(server, EET_T_STRING);
> @@ -85,20 +84,20 @@
>
> #undef MY_CONF_ADD_BASIC
> #undef MY_CONF_SUB_ADD_BASIC
> -}
> +} /* _my_conf_descriptor_init */
>
> static void
> _my_conf_descriptor_shutdown(void)
> {
> eet_data_descriptor_free(_my_conf_sub_descriptor);
> eet_data_descriptor_free(_my_conf_descriptor);
> -}
> +} /* _my_conf_descriptor_shutdown */
>
> static My_Conf_Type *
> _my_conf_new(void)
> {
> - My_Conf_Type *my_conf = calloc(1, sizeof(My_Conf_Type));
> - My_Conf_Subtype *sub;
> + My_Conf_Type * my_conf = calloc(1, sizeof(My_Conf_Type));
> + My_Conf_Subtype * sub;
> if (!my_conf)
> {
> fprintf(stderr, "ERROR: could not calloc My_Conf_Type\n");
> @@ -117,12 +116,12 @@
> }
>
> return my_conf;
> -}
> +} /* _my_conf_new */
>
> static void
> -_my_conf_free(My_Conf_Type *my_conf)
> +_my_conf_free(My_Conf_Type * my_conf)
> {
> - My_Conf_Subtype *sub;
> + My_Conf_Subtype * sub;
> EINA_LIST_FREE(my_conf->subs, sub)
> {
> eina_stringshare_del(sub->server);
> @@ -131,13 +130,13 @@
>
> eina_stringshare_del(my_conf->name);
> free(my_conf);
> -}
> +} /* _my_conf_free */
>
> static My_Conf_Type *
> -_my_conf_load(const char *filename)
> +_my_conf_load(const char * filename)
> {
> - My_Conf_Type *my_conf;
> - Eet_File *ef = eet_open(filename, EET_FILE_MODE_READ);
> + My_Conf_Type * my_conf;
> + Eet_File * ef = eet_open(filename, EET_FILE_MODE_READ);
> if (!ef)
> {
> fprintf(stderr, "ERROR: could not open '%s' for read\n", filename);
> @@ -161,13 +160,13 @@
> end:
> eet_close(ef);
> return my_conf;
> -}
> +} /* _my_conf_load */
>
> static Eina_Bool
> -_my_conf_save(const My_Conf_Type *my_conf, const char *filename)
> +_my_conf_save(const My_Conf_Type * my_conf, const char * filename)
> {
> char tmp[PATH_MAX];
> - Eet_File *ef;
> + Eet_File * ef;
> Eina_Bool ret;
> unsigned int i, len;
> struct stat st;
> @@ -205,13 +204,13 @@
> }
>
> return ret;
> -}
> +} /* _my_conf_save */
>
> -int main(int argc, char *argv[])
> +int main(int argc, char * argv[])
> {
> - My_Conf_Type *my_conf;
> - const My_Conf_Subtype *sub;
> - const Eina_List *l;
> + My_Conf_Type * my_conf;
> + const My_Conf_Subtype * sub;
> + const Eina_List * l;
> int ret = 0;
>
> if (argc != 3)
> @@ -236,7 +235,7 @@
> }
> }
>
> - printf("My_Conf_Type:\n"
> + printf("My_Conf_Type:\n"
> "\tversion: %#x\n"
> "\tname...: '%s'\n"
> "\tid.....: %d\n"
> @@ -263,4 +262,5 @@
> eina_shutdown();
>
> return ret;
> -}
> +} /* main */
> +
>
> Modified: trunk/eet/src/examples/eet-data-simple.c
> ===================================================================
> --- trunk/eet/src/examples/eet-data-simple.c 2010-07-31 01:54:32 UTC (rev 50697)
> +++ trunk/eet/src/examples/eet-data-simple.c 2010-07-31 01:54:48 UTC (rev 50698)
> @@ -14,10 +14,10 @@
> typedef struct
> {
> unsigned int version; // it is recommended to use versioned configuration!
> - const char *name;
> - int id;
> - int not_saved_value; // example of not saved data inside!
> - Eina_Bool enabled;
> + const char * name;
> + int id;
> + int not_saved_value; // example of not saved data inside!
> + Eina_Bool enabled;
> } My_Conf_Type;
>
> // string that represents the entry in eet file, you might like to have
> @@ -25,11 +25,10 @@
> // different strings
> static const char MY_CONF_FILE_ENTRY[] = "config";
>
> -
> // keep the descriptor static global, so it can be
> // shared by different functions (load/save) of this and only this
> // file.
> -static Eet_Data_Descriptor *_my_conf_descriptor;
> +static Eet_Data_Descriptor * _my_conf_descriptor;
>
> static void
> _my_conf_descriptor_init(void)
> @@ -53,8 +52,8 @@
>
> // Describe the members to be saved:
> // Use a temporary macro so we don't type a lot, also avoid errors:
> -#define MY_CONF_ADD_BASIC(member, eet_type) \
> - EET_DATA_DESCRIPTOR_ADD_BASIC \
> +#define MY_CONF_ADD_BASIC(member, eet_type)\
> + EET_DATA_DESCRIPTOR_ADD_BASIC\
> (_my_conf_descriptor, My_Conf_Type, # member, member, eet_type)
>
> MY_CONF_ADD_BASIC(version, EET_T_UINT);
> @@ -63,18 +62,18 @@
> MY_CONF_ADD_BASIC(enabled, EET_T_UCHAR);
>
> #undef MY_CONF_ADD_BASIC
> -}
> +} /* _my_conf_descriptor_init */
>
> static void
> _my_conf_descriptor_shutdown(void)
> {
> eet_data_descriptor_free(_my_conf_descriptor);
> -}
> +} /* _my_conf_descriptor_shutdown */
>
> static My_Conf_Type *
> _my_conf_new(void)
> {
> - My_Conf_Type *my_conf = calloc(1, sizeof(My_Conf_Type));
> + My_Conf_Type * my_conf = calloc(1, sizeof(My_Conf_Type));
> if (!my_conf)
> {
> fprintf(stderr, "ERROR: could not calloc My_Conf_Type\n");
> @@ -84,20 +83,20 @@
> my_conf->version = 0x112233;
> my_conf->enabled = EINA_TRUE;
> return my_conf;
> -}
> +} /* _my_conf_new */
>
> static void
> -_my_conf_free(My_Conf_Type *my_conf)
> +_my_conf_free(My_Conf_Type * my_conf)
> {
> eina_stringshare_del(my_conf->name);
> free(my_conf);
> -}
> +} /* _my_conf_free */
>
> static My_Conf_Type *
> -_my_conf_load(const char *filename)
> +_my_conf_load(const char * filename)
> {
> - My_Conf_Type *my_conf;
> - Eet_File *ef = eet_open(filename, EET_FILE_MODE_READ);
> + My_Conf_Type * my_conf;
> + Eet_File * ef = eet_open(filename, EET_FILE_MODE_READ);
> if (!ef)
> {
> fprintf(stderr, "ERROR: could not open '%s' for read\n", filename);
> @@ -121,13 +120,13 @@
> end:
> eet_close(ef);
> return my_conf;
> -}
> +} /* _my_conf_load */
>
> static Eina_Bool
> -_my_conf_save(const My_Conf_Type *my_conf, const char *filename)
> +_my_conf_save(const My_Conf_Type * my_conf, const char * filename)
> {
> char tmp[PATH_MAX];
> - Eet_File *ef;
> + Eet_File * ef;
> Eina_Bool ret;
> unsigned int i, len;
> struct stat st;
> @@ -165,11 +164,11 @@
> }
>
> return ret;
> -}
> +} /* _my_conf_save */
>
> -int main(int argc, char *argv[])
> +int main(int argc, char * argv[])
> {
> - My_Conf_Type *my_conf;
> + My_Conf_Type * my_conf;
> int ret = 0;
>
> if (argc != 3)
> @@ -194,7 +193,7 @@
> }
> }
>
> - printf("My_Conf_Type:\n"
> + printf("My_Conf_Type:\n"
> "\tversion: %#x\n"
> "\tname...: '%s'\n"
> "\tid.....: %d\n"
> @@ -215,4 +214,5 @@
> eina_shutdown();
>
> return ret;
> -}
> +} /* main */
> +
>
> Modified: trunk/eet/src/lib/Eet.h
> ===================================================================
> --- trunk/eet/src/lib/Eet.h 2010-07-31 01:54:32 UTC (rev 50697)
> +++ trunk/eet/src/lib/Eet.h 2010-07-31 01:54:48 UTC (rev 50698)
> @@ -7,33 +7,33 @@
>
> #ifdef EAPI
> # undef EAPI
> -#endif
> +#endif /* ifdef EAPI */
>
> #ifdef _WIN32
> # ifdef EFL_EET_BUILD
> # ifdef DLL_EXPORT
> # define EAPI __declspec(dllexport)
> -# else
> +# else /* ifdef DLL_EXPORT */
> # define EAPI
> # endif /* ! DLL_EXPORT */
> -# else
> +# else /* ifdef EFL_EET_BUILD */
> # define EAPI __declspec(dllimport)
> # endif /* ! EFL_EET_BUILD */
> -#else
> +#else /* ifdef _WIN32 */
> # ifdef __GNUC__
> # if __GNUC__ >= 4
> # define EAPI __attribute__ ((visibility("default")))
> -# else
> +# else /* if __GNUC__ >= 4 */
> # define EAPI
> -# endif
> -# else
> +# endif /* if __GNUC__ >= 4 */
> +# else /* ifdef __GNUC__ */
> # define EAPI
> -# endif
> +# endif /* ifdef __GNUC__ */
> #endif /* ! _WIN32 */
>
> #ifdef __cplusplus
> extern "C" {
> -#endif
> +#endif /* ifdef __cplusplus */
>
> /**
> * @file Eet.h
> @@ -76,7 +76,7 @@
> int revision; /** < svn revision (0 if a proper rlease or the svn revsion number Eet is built from) */
> } Eet_Version;
>
> -EAPI extern Eet_Version *eet_version;
> +EAPI extern Eet_Version * eet_version;
>
> /**
> * @defgroup Eet_Group Top level functions
> @@ -124,7 +124,7 @@
> * @since 1.0.0
> * @ingroup Eet_Group
> */
> -EAPI int eet_init(void);
> +EAPI int eet_init(void);
>
> /**
> * Shut down the EET library.
> @@ -134,7 +134,7 @@
> * @since 1.0.0
> * @ingroup Eet_Group
> */
> -EAPI int eet_shutdown(void);
> +EAPI int eet_shutdown(void);
>
> /**
> * Clear eet cache
> @@ -147,9 +147,8 @@
> * @since 1.0.0
> * @ingroup Eet_Group
> */
> -EAPI void eet_clearcache(void);
> +EAPI void eet_clearcache(void);
>
> -
> /**
> * @defgroup Eet_File_Group Eet File Main Functions
> *
> @@ -179,15 +178,14 @@
> * @see eet_memopen_read()
> * @see eet_close()
> */
> -typedef struct _Eet_File Eet_File;
> +typedef struct _Eet_File Eet_File;
>
> /**
> * @typedef Eet_Dictionary
> * Opaque handle that defines a file-backed (mmaped) dictionary of strings.
> */
> -typedef struct _Eet_Dictionary Eet_Dictionary;
> +typedef struct _Eet_Dictionary Eet_Dictionary;
>
> -
> /**
> * @}
> */
> @@ -262,7 +260,8 @@
> *
> * @since 1.0.0
> */
> -EAPI Eet_File * eet_open(const char *file, Eet_File_Mode mode);
> +EAPI Eet_File * eet_open(const char * file,
> + Eet_File_Mode mode);
>
> /**
> * Open an eet file directly from a memory location. The data are not copied,
> @@ -273,7 +272,8 @@
> * @since 1.1.0
> * @ingroup Eet_File_Group
> */
> -EAPI Eet_File * eet_memopen_read(const void *data, size_t size);
> +EAPI Eet_File * eet_memopen_read(const void * data,
> + size_t size);
>
> /**
> * Get the mode an Eet_File was opened with.
> @@ -283,7 +283,7 @@
> * @since 1.0.0
> * @ingroup Eet_File_Group
> */
> -EAPI Eet_File_Mode eet_mode_get(Eet_File *ef);
> +EAPI Eet_File_Mode eet_mode_get(Eet_File * ef);
>
> /**
> * Close an eet file handle and flush and writes pending.
> @@ -298,7 +298,7 @@
> * @since 1.0.0
> * @ingroup Eet_File_Group
> */
> -EAPI Eet_Error eet_close(Eet_File *ef);
> +EAPI Eet_Error eet_close(Eet_File * ef);
>
> /**
> * Sync content of an eet file handle, flushing pending writes.
> @@ -312,7 +312,7 @@
> * @since 1.2.4
> * @ingroup Eet_File_Group
> */
> -EAPI Eet_Error eet_sync(Eet_File *ef);
> +EAPI Eet_Error eet_sync(Eet_File * ef);
>
> /**
> * Return a handle to the shared string dictionary of the Eet file
> @@ -330,7 +330,7 @@
> * @since 1.0.0
> * @ingroup Eet_File_Group
> */
> -EAPI Eet_Dictionary *eet_dictionary_get(Eet_File *ef);
> +EAPI Eet_Dictionary * eet_dictionary_get(Eet_File * ef);
>
> /**
> * Check if a given string comes from a given dictionary
> @@ -346,8 +346,8 @@
> * @since 1.0.0
> * @ingroup Eet_File_Group
> */
> -EAPI int eet_dictionary_string_check(Eet_Dictionary *ed,
> - const char *string);
> +EAPI int eet_dictionary_string_check(Eet_Dictionary * ed,
> + const char * string);
>
> /**
> * Read a specified entry from an eet file and return data
> @@ -371,7 +371,9 @@
> * @since 1.0.0
> * @ingroup Eet_File_Group
> */
> -EAPI void * eet_read(Eet_File *ef, const char *name, int *size_ret);
> +EAPI void * eet_read(Eet_File * ef,
> + const char * name,
> + int * size_ret);
>
> /**
> * Read a specified entry from an eet file and return data
> @@ -393,9 +395,9 @@
> * @since 1.0.0
> * @ingroup Eet_File_Group
> */
> -EAPI const void * eet_read_direct(Eet_File *ef,
> - const char *name,
> - int *size_ret);
> +EAPI const void * eet_read_direct(Eet_File * ef,
> + const char * name,
> + int * size_ret);
>
> /**
> * Write a specified entry to an eet file handle
> @@ -425,11 +427,11 @@
> * @since 1.0.0
> * @ingroup Eet_File_Group
> */
> -EAPI int eet_write(Eet_File *ef,
> - const char *name,
> - const void *data,
> - int size,
> - int compress);
> +EAPI int eet_write(Eet_File * ef,
> + const char * name,
> + const void * data,
> + int size,
> + int compress);
>
> /**
> * Delete a specified entry from an Eet file being written or re-written
> @@ -449,7 +451,8 @@
> * @since 1.0.0
> * @ingroup Eet_File_Group
> */
> -EAPI int eet_delete(Eet_File *ef, const char *name);
> +EAPI int eet_delete(Eet_File * ef,
> + const char * name);
>
> /**
> * Alias a specific section to another one. Destination may exist or not,
> @@ -465,12 +468,11 @@
> * @since 1.3.3
> * @ingroup Eet_File_Group
> */
> -EAPI Eina_Bool eet_alias(Eet_File *ef,
> - const char *name,
> - const char *destination,
> - int compress);
> +EAPI Eina_Bool eet_alias(Eet_File * ef,
> + const char * name,
> + const char * destination,
> + int compress);
>
> -
> /**
> * List all entries in eet file matching shell glob.
> * @param ef A valid eet file handle.
> @@ -501,7 +503,9 @@
> * @since 1.0.0
> * @ingroup Eet_File_Group
> */
> -EAPI char **eet_list(Eet_File *ef, const char *glob, int *count_ret);
> +EAPI char ** eet_list(Eet_File * ef,
> + const char * glob,
> + int * count_ret);
>
> /**
> * Return the number of entries in the specified eet file.
> @@ -512,7 +516,7 @@
> * @since 1.0.0
> * @ingroup Eet_File_Group
> */
> -EAPI int eet_num_entries(Eet_File *ef);
> +EAPI int eet_num_entries(Eet_File * ef);
>
> /**
> * @defgroup Eet_File_Cipher_Group Eet File Ciphered Main Functions
> @@ -548,10 +552,10 @@
> * @since 1.0.0
> * @ingroup Eet_File_Cipher_Group
> */
> -EAPI void * eet_read_cipher(Eet_File *ef,
> - const char *name,
> - int *size_ret,
> - const char *cipher_key);
> +EAPI void * eet_read_cipher(Eet_File * ef,
> + const char * name,
> + int * size_ret,
> + const char * cipher_key);
>
> /**
> * Write a specified entry to an eet file handle using a cipher.
> @@ -582,14 +586,13 @@
> * @since 1.0.0
> * @ingroup Eet_File_Cipher_Group
> */
> -EAPI int eet_write_cipher(Eet_File *ef,
> - const char *name,
> - const void *data,
> - int size,
> - int compress,
> - const char *cipher_key);
> +EAPI int eet_write_cipher(Eet_File * ef,
> + const char * name,
> + const void * data,
> + int size,
> + int compress,
> + const char * cipher_key);
>
> -
> /**
> * @defgroup Eet_File_Image_Group Image Store and Load
> *
> @@ -633,14 +636,14 @@
> * @since 1.0.0
> * @ingroup Eet_File_Image_Group
> */
> -EAPI int eet_data_image_header_read(Eet_File *ef,
> - const char *name,
> - unsigned int *w,
> - unsigned int *h,
> - int *alpha,
> - int *compress,
> - int *quality,
> - int *lossy);
> +EAPI int eet_data_image_header_read(Eet_File * ef,
> + const char * name,
> + unsigned int * w,
> + unsigned int * h,
> + int * alpha,
> + int * compress,
> + int * quality,
> + int * lossy);
>
> /**
> * Read image data from the named key in the eet file.
> @@ -680,14 +683,14 @@
> * @since 1.0.0
> * @ingroup Eet_File_Image_Group
> */
> -EAPI void *eet_data_image_read(Eet_File *ef,
> - const char *name,
> - unsigned int *w,
> - unsigned int *h,
> - int *alpha,
> - int *compress,
> - int *quality,
> - int *lossy);
> +EAPI void * eet_data_image_read(Eet_File * ef,
> + const char * name,
> + unsigned int * w,
> + unsigned int * h,
> + int * alpha,
> + int * compress,
> + int * quality,
> + int * lossy);
>
> /**
> * Read image data from the named key in the eet file.
> @@ -729,18 +732,18 @@
> * @since 1.0.2
> * @ingroup Eet_File_Image_Group
> */
> -EAPI int eet_data_image_read_to_surface(Eet_File *ef,
> - const char *name,
> - unsigned int src_x,
> - unsigned int src_y,
> - unsigned int *d,
> - unsigned int w,
> - unsigned int h,
> - unsigned int row_stride,
> - int *alpha,
> - int *compress,
> - int *quality,
> - int *lossy);
> +EAPI int eet_data_image_read_to_surface(Eet_File * ef,
> + const char * name,
> + unsigned int src_x,
> + unsigned int src_y,
> + unsigned int * d,
> + unsigned int w,
> + unsigned int h,
> + unsigned int row_stride,
> + int * alpha,
> + int * compress,
> + int * quality,
> + int * lossy);
>
> /**
> * Write image data to the named key in an eet file.
> @@ -777,15 +780,15 @@
> * @since 1.0.0
> * @ingroup Eet_File_Image_Group
> */
> -EAPI int eet_data_image_write(Eet_File *ef,
> - const char *name,
> - const void *data,
> - unsigned int w,
> - unsigned int h,
> - int alpha,
> - int compress,
> - int quality,
> - int lossy);
> +EAPI int eet_data_image_write(Eet_File * ef,
> + const char * name,
> + const void * data,
> + unsigned int w,
> + unsigned int h,
> + int alpha,
> + int compress,
> + int quality,
> + int lossy);
>
> /**
> * Decode Image data header only to get information.
> @@ -823,14 +826,14 @@
> * @since 1.0.0
> * @ingroup Eet_File_Image_Group
> */
> -EAPI int eet_data_image_header_decode(const void *data,
> - int size,
> - unsigned int *w,
> - unsigned int *h,
> - int *alpha,
> - int *compress,
> - int *quality,
> - int *lossy);
> +EAPI int eet_data_image_header_decode(const void * data,
> + int size,
> + unsigned int * w,
> + unsigned int * h,
> + int * alpha,
> + int * compress,
> + int * quality,
> + int * lossy);
>
> /**
> * Decode Image data into pixel data.
> @@ -870,14 +873,14 @@
> * @since 1.0.0
> * @ingroup Eet_File_Image_Group
> */
> -EAPI void *eet_data_image_decode(const void *data,
> - int size,
> - unsigned int *w,
> - unsigned int *h,
> - int *alpha,
> - int *compress,
> - int *quality,
> - int *lossy);
> +EAPI void * eet_data_image_decode(const void * data,
> + int size,
> + unsigned int * w,
> + unsigned int * h,
> + int * alpha,
> + int * compress,
> + int * quality,
> + int * lossy);
>
> /**
> * Decode Image data into pixel data.
> @@ -919,18 +922,18 @@
> * @since 1.0.2
> * @ingroup Eet_File_Image_Group
> */
> -EAPI int eet_data_image_decode_to_surface(const void *data,
> - int size,
> - unsigned int src_x,
> - unsigned int src_y,
> - unsigned int *d,
> - unsigned int w,
> - unsigned int h,
> - unsigned int row_stride,
> - int *alpha,
> - int *compress,
> - int *quality,
> - int *lossy);
> +EAPI int eet_data_image_decode_to_surface(const void * data,
> + int size,
> + unsigned int src_x,
> + unsigned int src_y,
> + unsigned int * d,
> + unsigned int w,
> + unsigned int h,
> + unsigned int row_stride,
> + int * alpha,
> + int * compress,
> + int * quality,
> + int * lossy);
>
> /**
> * Encode image data for storage or transmission.
> @@ -966,14 +969,14 @@
> * @since 1.0.0
> * @ingroup Eet_File_Image_Group
> */
> -EAPI void *eet_data_image_encode(const void *data,
> - int *size_ret,
> - unsigned int w,
> - unsigned int h,
> - int alpha,
> - int compress,
> - int quality,
> - int lossy);
> +EAPI void * eet_data_image_encode(const void * data,
> + int * size_ret,
> + unsigned int w,
> + unsigned int h,
> + int alpha,
> + int compress,
> + int quality,
> + int lossy);
>
> /**
> * @defgroup Eet_File_Image_Cipher_Group Image Store and Load using a Cipher
> @@ -1023,15 +1026,15 @@
> * @since 1.0.0
> * @ingroup Eet_File_Image_Cipher_Group
> */
> -EAPI int eet_data_image_header_read_cipher(Eet_File *ef,
> - const char *name,
> - const char *cipher_key,
> - unsigned int *w,
> - unsigned int *h,
> - int *alpha,
> - int *compress,
> - int *quality,
> - int *lossy);
> +EAPI int eet_data_image_header_read_cipher(Eet_File * ef,
> + const char * name,
> + const char * cipher_key,
> + unsigned int * w,
> + unsigned int * h,
> + int * alpha,
> + int * compress,
> + int * quality,
> + int * lossy);
>
> /**
> * Read image data from the named key in the eet file using a cipher.
> @@ -1072,15 +1075,15 @@
> * @since 1.0.0
> * @ingroup Eet_File_Image_Cipher_Group
> */
> -EAPI void *eet_data_image_read_cipher(Eet_File *ef,
> - const char *name,
> - const char *cipher_key,
> - unsigned int *w,
> - unsigned int *h,
> - int *alpha,
> - int *compress,
> - int *quality,
> - int *lossy);
> +EAPI void * eet_data_image_read_cipher(Eet_File * ef,
> + const char * name,
> + const char * cipher_key,
> + unsigned int * w,
> + unsigned int * h,
> + int * alpha,
> + int * compress,
> + int * quality,
> + int * lossy);
>
> /**
> * Read image data from the named key in the eet file using a cipher.
> @@ -1123,19 +1126,19 @@
> * @since 1.0.2
> * @ingroup Eet_File_Image_Cipher_Group
> */
> -EAPI int eet_data_image_read_to_surface_cipher(Eet_File *ef,
> - const char *name,
> - const char *cipher_key,
> - unsigned int src_x,
> - unsigned int src_y,
> - unsigned int *d,
> - unsigned int w,
> - unsigned int h,
> - unsigned int row_stride,
> - int *alpha,
> - int *compress,
> - int *quality,
> - int *lossy);
> +EAPI int eet_data_image_read_to_surface_cipher(Eet_File * ef,
> + const char * name,
> + const char * cipher_key,
> + unsigned int src_x,
> + unsigned int src_y,
> + unsigned int * d,
> + unsigned int w,
> + unsigned int h,
> + unsigned int row_stride,
> + int * alpha,
> + int * compress,
> + int * quality,
> + int * lossy);
>
> /**
> * Write image data to the named key in an eet file using a cipher.
> @@ -1173,18 +1176,17 @@
> * @since 1.0.0
> * @ingroup Eet_File_Image_Cipher_Group
> */
> -EAPI int eet_data_image_write_cipher(Eet_File *ef,
> - const char *name,
> - const char *cipher_key,
> - const void *data,
> - unsigned int w,
> - unsigned int h,
> - int alpha,
> - int compress,
> - int quality,
> - int lossy);
> +EAPI int eet_data_image_write_cipher(Eet_File * ef,
> + const char * name,
> + const char * cipher_key,
> + const void * data,
> + unsigned int w,
> + unsigned int h,
> + int alpha,
> + int compress,
> + int quality,
> + int lossy);
>
> -
> /**
> * Decode Image data header only to get information using a cipher.
> * @param data The encoded pixel data.
> @@ -1222,15 +1224,15 @@
> * @since 1.0.0
> * @ingroup Eet_File_Image_Cipher_Group
> */
> -EAPI int eet_data_image_header_decode_cipher(const void *data,
> - const char *cipher_key,
> - int size,
> - unsigned int *w,
> - unsigned int *h,
> - int *alpha,
> - int *compress,
> - int *quality,
> - int *lossy);
> +EAPI int eet_data_image_header_decode_cipher(const void * data,
> + const char * cipher_key,
> + int size,
> + unsigned int * w,
> + unsigned int * h,
> + int * alpha,
> + int * compress,
> + int * quality,
> + int * lossy);
>
> /**
> * Decode Image data into pixel data using a cipher.
> @@ -1271,15 +1273,15 @@
> * @since 1.0.0
> * @ingroup Eet_File_Image_Cipher_Group
> */
> -EAPI void *eet_data_image_decode_cipher(const void *data,
> - const char *cipher_key,
> - int size,
> - unsigned int *w,
> - unsigned int *h,
> - int *alpha,
> - int *compress,
> - int *quality,
> - int *lossy);
> +EAPI void * eet_data_image_decode_cipher(const void * data,
> + const char * cipher_key,
> + int size,
> + unsigned int * w,
> + unsigned int * h,
> + int * alpha,
> + int * compress,
> + int * quality,
> + int * lossy);
>
> /**
> * Decode Image data into pixel data using a cipher.
> @@ -1322,19 +1324,19 @@
> * @since 1.0.2
> * @ingroup Eet_File_Image_Cipher_Group
> */
> -EAPI int eet_data_image_decode_to_surface_cipher(const void *data,
> - const char *cipher_key,
> - int size,
> - unsigned int src_x,
> - unsigned int src_y,
> - unsigned int *d,
> - unsigned int w,
> - unsigned int h,
> - unsigned int row_stride,
> - int *alpha,
> - int *compress,
> - int *quality,
> - int *lossy);
> +EAPI int eet_data_image_decode_to_surface_cipher(const void * data,
> + const char * cipher_key,
> + int size,
> + unsigned int src_x,
> + unsigned int src_y,
> + unsigned int * d,
> + unsigned int w,
> + unsigned int h,
> + unsigned int row_stride,
> + int * alpha,
> + int * compress,
> + int * quality,
> + int * lossy);
>
> /**
> * Encode image data for storage or transmission using a cipher.
> @@ -1371,17 +1373,16 @@
> * @since 1.0.0
> * @ingroup Eet_File_Image_Cipher_Group
> */
> -EAPI void *eet_data_image_encode_cipher(const void *data,
> - const char *cipher_key,
> - unsigned int w,
> - unsigned int h,
> - int alpha,
> - int compress,
> - int quality,
> - int lossy,
> - int *size_ret);
> +EAPI void * eet_data_image_encode_cipher(const void * data,
> + const char * cipher_key,
> + unsigned int w,
> + unsigned int h,
> + int alpha,
> + int compress,
> + int quality,
> + int lossy,
> + int * size_ret);
>
> -
> /**
> * @defgroup Eet_Cipher_Group Cip...
[truncated message content] |