diff --git a/legacy/eet/src/lib/Eet.h b/legacy/eet/src/lib/Eet.h index 74f3a2c415..7aee6aedf4 100644 --- a/legacy/eet/src/lib/Eet.h +++ b/legacy/eet/src/lib/Eet.h @@ -260,7 +260,7 @@ typedef struct _Eet_Dictionary Eet_Dictionary; * * @since 1.0.0 */ -EAPI Eet_File * eet_open(const char * file, +EAPI Eet_File * eet_open(const char *file, Eet_File_Mode mode); /** @@ -347,7 +347,7 @@ EAPI Eet_Dictionary * eet_dictionary_get(Eet_File *ef); * @ingroup Eet_File_Group */ EAPI int eet_dictionary_string_check(Eet_Dictionary *ed, - const char * string); + const char *string); /** * Read a specified entry from an eet file and return data @@ -371,9 +371,9 @@ EAPI int eet_dictionary_string_check(Eet_Dictionary *ed, * @since 1.0.0 * @ingroup Eet_File_Group */ -EAPI void * eet_read(Eet_File * ef, +EAPI void * eet_read(Eet_File *ef, const char *name, - int * size_ret); + int *size_ret); /** * Read a specified entry from an eet file and return data @@ -395,9 +395,9 @@ EAPI void * eet_read(Eet_File * ef, * @since 1.0.0 * @ingroup Eet_File_Group */ -EAPI const void * eet_read_direct(Eet_File * ef, +EAPI const void * eet_read_direct(Eet_File *ef, const char *name, - int * size_ret); + int *size_ret); /** * Write a specified entry to an eet file handle @@ -427,7 +427,7 @@ EAPI const void * eet_read_direct(Eet_File * ef, * @since 1.0.0 * @ingroup Eet_File_Group */ -EAPI int eet_write(Eet_File * ef, +EAPI int eet_write(Eet_File *ef, const char *name, const void *data, int size, @@ -451,7 +451,7 @@ EAPI int eet_write(Eet_File * ef, * @since 1.0.0 * @ingroup Eet_File_Group */ -EAPI int eet_delete(Eet_File * ef, +EAPI int eet_delete(Eet_File *ef, const char *name); /** @@ -468,7 +468,7 @@ EAPI int eet_delete(Eet_File * ef, * @since 1.3.3 * @ingroup Eet_File_Group */ -EAPI Eina_Bool eet_alias(Eet_File * ef, +EAPI Eina_Bool eet_alias(Eet_File *ef, const char *name, const char *destination, int compress); @@ -503,9 +503,9 @@ EAPI Eina_Bool eet_alias(Eet_File * ef, * @since 1.0.0 * @ingroup Eet_File_Group */ -EAPI char ** eet_list(Eet_File * ef, +EAPI char ** eet_list(Eet_File *ef, const char *glob, - int * count_ret); + int *count_ret); /** * Return the number of entries in the specified eet file. @@ -552,9 +552,9 @@ EAPI int eet_num_entries(Eet_File *ef); * @since 1.0.0 * @ingroup Eet_File_Cipher_Group */ -EAPI void * eet_read_cipher(Eet_File * ef, +EAPI void * eet_read_cipher(Eet_File *ef, const char *name, - int * size_ret, + int *size_ret, const char *cipher_key); /** @@ -586,7 +586,7 @@ EAPI void * eet_read_cipher(Eet_File * ef, * @since 1.0.0 * @ingroup Eet_File_Cipher_Group */ -EAPI int eet_write_cipher(Eet_File * ef, +EAPI int eet_write_cipher(Eet_File *ef, const char *name, const void *data, int size, @@ -636,14 +636,14 @@ EAPI int eet_write_cipher(Eet_File * ef, * @since 1.0.0 * @ingroup Eet_File_Image_Group */ -EAPI int eet_data_image_header_read(Eet_File * ef, - const char * name, +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); + int *alpha, + int *compress, + int *quality, + int *lossy); /** * Read image data from the named key in the eet file. @@ -683,14 +683,14 @@ EAPI int eet_data_image_header_read(Eet_File * ef, * @since 1.0.0 * @ingroup Eet_File_Image_Group */ -EAPI void * eet_data_image_read(Eet_File * ef, - const char * name, +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); + int *alpha, + int *compress, + int *quality, + int *lossy); /** * Read image data from the named key in the eet file. @@ -732,18 +732,18 @@ EAPI void * eet_data_image_read(Eet_File * ef, * @since 1.0.2 * @ingroup Eet_File_Image_Group */ -EAPI int eet_data_image_read_to_surface(Eet_File * ef, - const char * name, +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); + int *alpha, + int *compress, + int *quality, + int *lossy); /** * Write image data to the named key in an eet file. @@ -780,9 +780,9 @@ EAPI int eet_data_image_read_to_surface(Eet_File * ef, * @since 1.0.0 * @ingroup Eet_File_Image_Group */ -EAPI int eet_data_image_write(Eet_File * ef, - const char * name, - const void * data, +EAPI int eet_data_image_write(Eet_File *ef, + const char *name, + const void *data, unsigned int w, unsigned int h, int alpha, @@ -826,14 +826,14 @@ EAPI int eet_data_image_write(Eet_File * ef, * @since 1.0.0 * @ingroup Eet_File_Image_Group */ -EAPI int eet_data_image_header_decode(const void * data, +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); + int *alpha, + int *compress, + int *quality, + int *lossy); /** * Decode Image data into pixel data. @@ -873,14 +873,14 @@ EAPI int eet_data_image_header_decode(const void * data, * @since 1.0.0 * @ingroup Eet_File_Image_Group */ -EAPI void * eet_data_image_decode(const void * data, +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); + int *alpha, + int *compress, + int *quality, + int *lossy); /** * Decode Image data into pixel data. @@ -922,7 +922,7 @@ EAPI void * eet_data_image_decode(const void * data, * @since 1.0.2 * @ingroup Eet_File_Image_Group */ -EAPI int eet_data_image_decode_to_surface(const void * data, +EAPI int eet_data_image_decode_to_surface(const void *data, int size, unsigned int src_x, unsigned int src_y, @@ -930,10 +930,10 @@ EAPI int eet_data_image_decode_to_surface(const void * data, unsigned int w, unsigned int h, unsigned int row_stride, - int * alpha, - int * compress, - int * quality, - int * lossy); + int *alpha, + int *compress, + int *quality, + int *lossy); /** * Encode image data for storage or transmission. @@ -969,8 +969,8 @@ EAPI int eet_data_image_decode_to_surface(const void * data, * @since 1.0.0 * @ingroup Eet_File_Image_Group */ -EAPI void * eet_data_image_encode(const void * data, - int * size_ret, +EAPI void * eet_data_image_encode(const void *data, + int *size_ret, unsigned int w, unsigned int h, int alpha, @@ -1026,15 +1026,15 @@ EAPI void * eet_data_image_encode(const void * data, * @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, +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); + int *alpha, + int *compress, + int *quality, + int *lossy); /** * Read image data from the named key in the eet file using a cipher. @@ -1075,15 +1075,15 @@ EAPI int eet_data_image_header_read_cipher(Eet_File * ef, * @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, +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); + int *alpha, + int *compress, + int *quality, + int *lossy); /** * Read image data from the named key in the eet file using a cipher. @@ -1126,19 +1126,19 @@ EAPI void * eet_data_image_read_cipher(Eet_File * ef, * @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, +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); + int *alpha, + int *compress, + int *quality, + int *lossy); /** * Write image data to the named key in an eet file using a cipher. @@ -1176,10 +1176,10 @@ EAPI int eet_data_image_read_to_surface_cipher(Eet_File * ef, * @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, +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, @@ -1224,15 +1224,15 @@ EAPI int eet_data_image_write_cipher(Eet_File * ef, * @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, +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); + int *alpha, + int *compress, + int *quality, + int *lossy); /** * Decode Image data into pixel data using a cipher. @@ -1273,15 +1273,15 @@ EAPI int eet_data_image_header_decode_cipher(const void * data, * @since 1.0.0 * @ingroup Eet_File_Image_Cipher_Group */ -EAPI void * eet_data_image_decode_cipher(const void * data, - const char * cipher_key, +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); + int *alpha, + int *compress, + int *quality, + int *lossy); /** * Decode Image data into pixel data using a cipher. @@ -1324,8 +1324,8 @@ EAPI void * eet_data_image_decode_cipher(const void * data, * @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, +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, @@ -1333,10 +1333,10 @@ EAPI int eet_data_image_decode_to_surface_cipher(const void * data, unsigned int w, unsigned int h, unsigned int row_stride, - int * alpha, - int * compress, - int * quality, - int * lossy); + int *alpha, + int *compress, + int *quality, + int *lossy); /** * Encode image data for storage or transmission using a cipher. @@ -1373,15 +1373,15 @@ EAPI int eet_data_image_decode_to_surface_cipher(const void * data, * @since 1.0.0 * @ingroup Eet_File_Image_Cipher_Group */ -EAPI void * eet_data_image_encode_cipher(const void * data, - const char * cipher_key, +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); + int *size_ret); /** * @defgroup Eet_Cipher_Group Cipher, Identity and Protection Mechanisms @@ -1438,8 +1438,8 @@ typedef int (* Eet_Key_Password_Callback)(char *buffer, int size, int * @since 1.2.0 * @ingroup Eet_Cipher_Group */ -EAPI Eet_Key * eet_identity_open(const char * certificate_file, - const char * private_key_file, +EAPI Eet_Key * eet_identity_open(const char *certificate_file, + const char *private_key_file, Eet_Key_Password_Callback cb); /** @@ -1466,7 +1466,7 @@ EAPI void eet_identity_close(Eet_Key *key); * @ingroup Eet_Cipher_Group */ EAPI Eet_Error eet_identity_set(Eet_File *ef, - Eet_Key * key); + Eet_Key *key); /** * Display both private and public key of an Eet_Key. @@ -1478,7 +1478,7 @@ EAPI Eet_Error eet_identity_set(Eet_File *ef, * @ingroup Eet_Cipher_Group */ EAPI void eet_identity_print(Eet_Key *key, - FILE * out); + FILE *out); /** * Get the x509 der certificate associated with an Eet_File. Will return NULL @@ -1492,7 +1492,7 @@ EAPI void eet_identity_print(Eet_Key *key, * @ingroup Eet_Cipher_Group */ EAPI const void * eet_identity_x509(Eet_File *ef, - int * der_length); + int *der_length); /** * Get the raw signature associated with an Eet_File. Will return NULL @@ -1505,7 +1505,7 @@ EAPI const void * eet_identity_x509(Eet_File *ef, * @ingroup Eet_Cipher_Group */ EAPI const void * eet_identity_signature(Eet_File *ef, - int * signature_length); + int *signature_length); /** * Get the SHA1 associated with a file. Could be the one used to @@ -1520,7 +1520,7 @@ EAPI const void * eet_identity_signature(Eet_File *ef, * @ingroup Eet_Cipher_Group */ EAPI const void * eet_identity_sha1(Eet_File *ef, - int * sha1_length); + int *sha1_length); /** * Display the x509 der certificate to out. @@ -1534,7 +1534,7 @@ EAPI const void * eet_identity_sha1(Eet_File *ef, */ EAPI void eet_identity_certificate_print(const unsigned char *certificate, int der_length, - FILE * out); + FILE *out); /** * @defgroup Eet_Data_Group Eet Data Serialization @@ -1763,18 +1763,18 @@ struct _Eet_Data_Descriptor_Class int size; /**< Size in bytes of data type to be serialized */ struct { - void * (*mem_alloc)(size_t size); /**< how to allocate memory (usually malloc()) */ + void * (*mem_alloc)(size_t size); /**< how to allocate memory (usually malloc()) */ void (*mem_free)(void *mem); /**< how to free memory (usually free()) */ - char * (*str_alloc)(const char *str); /**< how to allocate a string */ + char * (*str_alloc)(const char *str); /**< how to allocate a string */ void (*str_free)(const char *str); /**< how to free a string */ - void * (*list_next)(void *l); /**< how to iterate to the next element of a list. Receives and should return the list node. */ - void * (*list_append)(void *l, void *d); /**< how to append data @p d to list which head node is @p l */ - void * (*list_data)(void *l); /**< retrieves the data from node @p l */ - void * (*list_free)(void *l); /**< free all the nodes from the list which head node is @p l */ + void * (*list_next)(void *l); /**< how to iterate to the next element of a list. Receives and should return the list node. */ + void * (*list_append)(void *l, void *d); /**< how to append data @p d to list which head node is @p l */ + void * (*list_data)(void *l); /**< retrieves the data from node @p l */ + void * (*list_free)(void *l); /**< free all the nodes from the list which head node is @p l */ void (*hash_foreach)(void *h, int (*func)(void *h, const char *k, void *dt, void *fdt), void *fdt); /**< iterates over all elements in the hash @p h in no specific order */ - void * (*hash_add)(void *h, const char *k, void *d); /**< add a new data @p d as key @p k in hash @p h */ + void * (*hash_add)(void *h, const char *k, void *d); /**< add a new data @p d as key @p k in hash @p h */ void (*hash_free)(void *h); /**< free all entries from the hash @p h */ - char * (*str_direct_alloc)(const char *str); /**< how to allocate a string directly from file backed/mmaped region pointed by @p str */ + char * (*str_direct_alloc)(const char *str); /**< how to allocate a string directly from file backed/mmaped region pointed by @p str */ void (*str_direct_free)(const char *str); /**< how to free a string returned by str_direct_alloc */ const char *(*type_get)(const void *data, Eina_Bool *unknow); /**< convert any kind of data type to a name that define an Eet_Data_Element. */ Eina_Bool (*type_set)(const char *type, void *data, Eina_Bool unknow); /**< set the type at a particular adress */ @@ -1829,10 +1829,10 @@ EINA_DEPRECATED EAPI Eet_Data_Descriptor * eet_data_descriptor_new(const char void *(*func_list_append)(void *l, void *d), void *(*func_list_data)(void *l), void *(*func_list_free)(void *l), - void (*func_hash_foreach)(void *h, int (*func)(void * h, + void (*func_hash_foreach)(void *h, int (*func)(void *h, const char *k, - void * dt, - void * fdt), void *fdt), + void *dt, + void *fdt), void *fdt), void *(*func_hash_add)(void *h, const char *k, void *d), void (*func_hash_free)(void *h)); /* @@ -1914,7 +1914,7 @@ EAPI Eet_Data_Descriptor * eet_data_descriptor_file_new(const * @ingroup Eet_Data_Group */ EAPI Eina_Bool eet_eina_stream_data_descriptor_class_set(Eet_Data_Descriptor_Class *eddc, - const char * name, + const char *name, int size); /** @@ -1948,7 +1948,7 @@ EAPI Eina_Bool eet_eina_stream_data_descriptor_cl * @ingroup Eet_Data_Group */ EAPI Eina_Bool eet_eina_file_data_descriptor_class_set(Eet_Data_Descriptor_Class *eddc, - const char * name, + const char *name, int size); /** @@ -2007,13 +2007,13 @@ EAPI void eet_data_descriptor_free(Eet_Data_Descriptor *edd); * @ingroup Eet_Data_Group */ EAPI void eet_data_descriptor_element_add(Eet_Data_Descriptor *edd, - const char * name, + const char *name, int type, int group_type, int offset, /* int count_offset, */ int count, - const char * counter_name, + const char *counter_name, Eet_Data_Descriptor *subtype); /** @@ -2043,9 +2043,9 @@ EAPI void eet_data_descriptor_element_add(Eet_Data_Descriptor *edd, * @since 1.0.0 * @ingroup Eet_Data_Group */ -EAPI void * eet_data_read(Eet_File * ef, +EAPI void * eet_data_read(Eet_File *ef, Eet_Data_Descriptor *edd, - const char * name); + const char *name); /** * Write a data structure from memory and store in an eet file. @@ -2064,10 +2064,10 @@ EAPI void * eet_data_read(Eet_File * ef, * @since 1.0.0 * @ingroup Eet_Data_Group */ -EAPI int eet_data_write(Eet_File * ef, +EAPI int eet_data_write(Eet_File *ef, Eet_Data_Descriptor *edd, - const char * name, - const void * data, + const char *name, + const void *data, int compress); /** @@ -2143,7 +2143,7 @@ EAPI int eet_data_text_dump(const void *data_in, */ EAPI void * eet_data_text_undump(const char *text, int textlen, - int * size_ret); + int *size_ret); /** * Dump an eet encoded data structure from an eet file into ascii text @@ -2195,7 +2195,7 @@ EAPI int eet_data_dump(Eet_File *ef, * @since 1.0.0 * @ingroup Eet_Data_Group */ -EAPI int eet_data_undump(Eet_File * ef, +EAPI int eet_data_undump(Eet_File *ef, const char *name, const char *text, int textlen, @@ -2229,7 +2229,7 @@ EAPI int eet_data_undump(Eet_File * ef, * @ingroup Eet_Data_Group */ EAPI void * eet_data_descriptor_decode(Eet_Data_Descriptor *edd, - const void * data_in, + const void *data_in, int size_in); /** @@ -2262,8 +2262,8 @@ EAPI void * eet_data_descriptor_decode(Eet_Data_Descriptor *edd, * @ingroup Eet_Data_Group */ EAPI void * eet_data_descriptor_encode(Eet_Data_Descriptor *edd, - const void * data_in, - int * size_ret); + const void *data_in, + int *size_ret); /** * Add a basic data element to a data descriptor. @@ -2580,10 +2580,10 @@ EAPI void * eet_data_descriptor_encode(Eet_Data_Descriptor *edd, * @since 1.0.0 * @ingroup Eet_Data_Cipher_Group */ -EAPI void * eet_data_read_cipher(Eet_File * ef, +EAPI void * eet_data_read_cipher(Eet_File *ef, Eet_Data_Descriptor *edd, - const char * name, - const char * cipher_key); + const char *name, + const char *cipher_key); /** * Write a data structure from memory and store in an eet file @@ -2604,11 +2604,11 @@ EAPI void * eet_data_read_cipher(Eet_File * ef, * @since 1.0.0 * @ingroup Eet_Data_Cipher_Group */ -EAPI int eet_data_write_cipher(Eet_File * ef, +EAPI int eet_data_write_cipher(Eet_File *ef, Eet_Data_Descriptor *edd, - const char * name, - const char * cipher_key, - const void * data, + const char *name, + const char *cipher_key, + const void *data, int compress); /** @@ -2689,7 +2689,7 @@ EAPI int eet_data_text_dump_cipher(const void *data_in, EAPI void * eet_data_text_undump_cipher(const char *text, const char *cipher_key, int textlen, - int * size_ret); + int *size_ret); /** * Dump an eet encoded data structure from an eet file into ascii @@ -2746,7 +2746,7 @@ EAPI int eet_data_dump_cipher(Eet_File *ef, * @since 1.0.0 * @ingroup Eet_Data_Cipher_Group */ -EAPI int eet_data_undump_cipher(Eet_File * ef, +EAPI int eet_data_undump_cipher(Eet_File *ef, const char *name, const char *cipher_key, const char *text, @@ -2783,8 +2783,8 @@ EAPI int eet_data_undump_cipher(Eet_File * ef, * @ingroup Eet_Data_Cipher_Group */ EAPI void * eet_data_descriptor_decode_cipher(Eet_Data_Descriptor *edd, - const void * data_in, - const char * cipher_key, + const void *data_in, + const char *cipher_key, int size_in); /** @@ -2819,9 +2819,9 @@ EAPI void * eet_data_descriptor_decode_cipher(Eet_Data_Descriptor *edd, * @ingroup Eet_Data_Cipher_Group */ EAPI void * eet_data_descriptor_encode_cipher(Eet_Data_Descriptor *edd, - const void * data_in, - const char * cipher_key, - int * size_ret); + const void *data_in, + const char *cipher_key, + int *size_ret); /** * @defgroup Eet_Node_Group Low-level Serialization Structures. @@ -2861,7 +2861,7 @@ struct _Eet_Node_Data unsigned short us; unsigned int ui; unsigned long long ul; - const char * str; + const char *str; } value; }; @@ -2915,28 +2915,28 @@ EAPI Eet_Node * eet_node_double_new(const char *name, * TODO FIX ME * @ingroup Eet_Node_Group */ -EAPI Eet_Node * eet_node_unsigned_char_new(const char * name, +EAPI Eet_Node * eet_node_unsigned_char_new(const char *name, unsigned char uc); /** * TODO FIX ME * @ingroup Eet_Node_Group */ -EAPI Eet_Node * eet_node_unsigned_short_new(const char * name, +EAPI Eet_Node * eet_node_unsigned_short_new(const char *name, unsigned short us); /** * TODO FIX ME * @ingroup Eet_Node_Group */ -EAPI Eet_Node * eet_node_unsigned_int_new(const char * name, +EAPI Eet_Node * eet_node_unsigned_int_new(const char *name, unsigned int ui); /** * TODO FIX ME * @ingroup Eet_Node_Group */ -EAPI Eet_Node * eet_node_unsigned_long_long_new(const char * name, +EAPI Eet_Node * eet_node_unsigned_long_long_new(const char *name, unsigned long long l); /** @@ -2964,7 +2964,7 @@ EAPI Eet_Node * eet_node_null_new(const char *name); * @ingroup Eet_Node_Group */ EAPI Eet_Node * eet_node_list_new(const char *name, - Eina_List * nodes); + Eina_List *nodes); /** * TODO FIX ME @@ -2972,14 +2972,14 @@ EAPI Eet_Node * eet_node_list_new(const char *name, */ EAPI Eet_Node * eet_node_array_new(const char *name, int count, - Eina_List * nodes); + Eina_List *nodes); /** * TODO FIX ME * @ingroup Eet_Node_Group */ EAPI Eet_Node * eet_node_var_array_new(const char *name, - Eina_List * nodes); + Eina_List *nodes); /** * TODO FIX ME @@ -2987,46 +2987,46 @@ EAPI Eet_Node * eet_node_var_array_new(const char *name, */ EAPI Eet_Node * eet_node_hash_new(const char *name, const char *key, - Eet_Node * node); + Eet_Node *node); /** * TODO FIX ME * @ingroup Eet_Node_Group */ EAPI Eet_Node * eet_node_struct_new(const char *name, - Eina_List * nodes); + Eina_List *nodes); /** * TODO FIX ME * @ingroup Eet_Node_Group */ EAPI Eet_Node * eet_node_struct_child_new(const char *parent, - Eet_Node * child); + Eet_Node *child); /** * TODO FIX ME * @ingroup Eet_Node_Group */ -EAPI void eet_node_list_append(Eet_Node * parent, +EAPI void eet_node_list_append(Eet_Node *parent, const char *name, - Eet_Node * child); + Eet_Node *child); /** * TODO FIX ME * @ingroup Eet_Node_Group */ -EAPI void eet_node_struct_append(Eet_Node * parent, +EAPI void eet_node_struct_append(Eet_Node *parent, const char *name, - Eet_Node * child); + Eet_Node *child); /** * TODO FIX ME * @ingroup Eet_Node_Group */ -EAPI void eet_node_hash_add(Eet_Node * parent, +EAPI void eet_node_hash_add(Eet_Node *parent, const char *name, const char *key, - Eet_Node * child); + Eet_Node *child); /** * TODO FIX ME @@ -3047,9 +3047,9 @@ EAPI void eet_node_del(Eet_Node *n); * TODO FIX ME * @ingroup Eet_Node_Group */ -EAPI void * eet_data_node_encode_cipher(Eet_Node * node, +EAPI void * eet_data_node_encode_cipher(Eet_Node *node, const char *cipher_key, - int * size_ret); + int *size_ret); /** * TODO FIX ME @@ -3063,7 +3063,7 @@ EAPI Eet_Node * eet_data_node_decode_cipher(const void *data_in, * TODO FIX ME * @ingroup Eet_Node_Group */ -EAPI Eet_Node * eet_data_node_read_cipher(Eet_File * ef, +EAPI Eet_Node * eet_data_node_read_cipher(Eet_File *ef, const char *name, const char *cipher_key); @@ -3071,10 +3071,10 @@ EAPI Eet_Node * eet_data_node_read_cipher(Eet_File * ef, * TODO FIX ME * @ingroup Eet_Node_Group */ -EAPI int eet_data_node_write_cipher(Eet_File * ef, +EAPI int eet_data_node_write_cipher(Eet_File *ef, const char *name, const char *cipher_key, - Eet_Node * node, + Eet_Node *node, int compress); /* EXPERIMENTAL: THIS API MAY CHANGE IN THE FUTURE, USE IT ONLY IF YOU KNOW WHAT YOU ARE DOING. */ @@ -3101,11 +3101,11 @@ struct _Eet_Node_Walk void *(*simple)(int type, Eet_Node_Data *data, void *user_data); }; -EAPI void * eet_node_walk(void * parent, - const char * name, - Eet_Node * root, +EAPI void * eet_node_walk(void *parent, + const char *name, + Eet_Node *root, Eet_Node_Walk *cb, - void * user_data); + void *user_data); /*******/ @@ -3152,9 +3152,9 @@ typedef Eina_Bool Eet_Write_Cb (const void *data, size_t size, vo * @since 1.2.4 * @ingroup Eet_Connection_Group */ -EAPI Eet_Connection * eet_connection_new(Eet_Read_Cb * eet_read_cb, +EAPI Eet_Connection * eet_connection_new(Eet_Read_Cb *eet_read_cb, Eet_Write_Cb *eet_write_cb, - const void * user_data); + const void *user_data); /** * Process a raw packet received over the link @@ -3171,7 +3171,7 @@ EAPI Eet_Connection * eet_connection_new(Eet_Read_Cb * eet_read_cb, * @ingroup Eet_Connection_Group */ EAPI int eet_connection_received(Eet_Connection *conn, - const void * data, + const void *data, size_t size); /** @@ -3191,10 +3191,10 @@ EAPI int eet_connection_received(Eet_Connection *conn, * @since 1.2.4 * @ingroup Eet_Connection_Group */ -EAPI Eina_Bool eet_connection_send(Eet_Connection * conn, +EAPI Eina_Bool eet_connection_send(Eet_Connection *conn, Eet_Data_Descriptor *edd, - const void * data_in, - const char * cipher_key); + const void *data_in, + const char *cipher_key); /** * Convert a Eet_Node tree and prepare it to be send. @@ -3213,8 +3213,8 @@ EAPI Eina_Bool eet_connection_send(Eet_Connection * conn, * @ingroup Eet_Connection_Group */ EAPI Eina_Bool eet_connection_node_send(Eet_Connection *conn, - Eet_Node * node, - const char * cipher_key); + Eet_Node *node, + const char *cipher_key); /** * Close a connection and lost its track. @@ -3226,7 +3226,7 @@ EAPI Eina_Bool eet_connection_node_send(Eet_Connection *conn, * @ingroup Eet_Connection_Group */ EAPI void * eet_connection_close(Eet_Connection *conn, - Eina_Bool * on_going); + Eina_Bool *on_going); /***************************************************************************/ diff --git a/legacy/eet/src/lib/Eet_private.h b/legacy/eet/src/lib/Eet_private.h index fdb4d70d84..7f57b6f38c 100644 --- a/legacy/eet/src/lib/Eet_private.h +++ b/legacy/eet/src/lib/Eet_private.h @@ -21,8 +21,8 @@ typedef struct _Eet_String Eet_String; struct _Eet_String { - const char * mmap; - char * str; + const char *mmap; + char *str; int hash; int len; @@ -56,11 +56,11 @@ struct _Eet_Node { int type; int count; - const char * name; - const char * key; - Eet_Node * values; - Eet_Node * next; - Eet_Node * parent; + const char *name; + const char *key; + Eet_Node *values; + Eet_Node *next; + Eet_Node *parent; Eet_Node_Data data; }; @@ -102,50 +102,50 @@ extern int _eet_log_dom_global; Eet_Dictionary * eet_dictionary_add(void); void eet_dictionary_free(Eet_Dictionary *ed); int eet_dictionary_string_add(Eet_Dictionary *ed, - const char * string); + const char *string); int eet_dictionary_string_get_size(const Eet_Dictionary *ed, int index); const char * eet_dictionary_string_get_char(const Eet_Dictionary *ed, int index); Eina_Bool eet_dictionary_string_get_float(const Eet_Dictionary *ed, int index, - float * result); + float *result); Eina_Bool eet_dictionary_string_get_double(const Eet_Dictionary *ed, int index, - double * result); + double *result); Eina_Bool eet_dictionary_string_get_fp(const Eet_Dictionary *ed, int index, - Eina_F32p32 * result); + Eina_F32p32 *result); int eet_dictionary_string_get_hash(const Eet_Dictionary *ed, int index); int _eet_hash_gen(const char *key, int hash_size); -const void * eet_identity_check(const void * data_base, +const void * eet_identity_check(const void *data_base, unsigned int data_length, - void ** sha1, - int * sha1_length, - const void * signature_base, + void **sha1, + int *sha1_length, + const void *signature_base, unsigned int signature_length, - const void ** raw_signature_base, + const void **raw_signature_base, unsigned int *raw_signature_length, - int * x509_length); -void * eet_identity_compute_sha1(const void * data_base, + int *x509_length); +void * eet_identity_compute_sha1(const void *data_base, unsigned int data_length, - int * sha1_length); -Eet_Error eet_cipher(const void * data, + int *sha1_length); +Eet_Error eet_cipher(const void *data, unsigned int size, - const char * key, + const char *key, unsigned int length, - void ** result, + void **result, unsigned int *result_length); -Eet_Error eet_decipher(const void * data, +Eet_Error eet_decipher(const void *data, unsigned int size, - const char * key, + const char *key, unsigned int length, - void ** result, + void **result, unsigned int *result_length); -Eet_Error eet_identity_sign(FILE * fp, +Eet_Error eet_identity_sign(FILE *fp, Eet_Key *key); void eet_identity_unref(Eet_Key *key); void eet_identity_ref(Eet_Key *key); diff --git a/legacy/eet/src/lib/eet_cipher.c b/legacy/eet/src/lib/eet_cipher.c index 4161252723..782175904d 100644 --- a/legacy/eet/src/lib/eet_cipher.c +++ b/legacy/eet/src/lib/eet_cipher.c @@ -80,18 +80,18 @@ void * alloca (size_t); #ifdef HAVE_CIPHER # ifdef HAVE_GNUTLS -static Eet_Error eet_hmac_sha1(const void * key, +static Eet_Error eet_hmac_sha1(const void *key, size_t key_len, - const void * data, + const void *data, size_t data_len, unsigned char *res); # endif /* ifdef HAVE_GNUTLS */ -static Eet_Error eet_pbkdf2_sha1(const char * key, +static Eet_Error eet_pbkdf2_sha1(const char *key, int key_len, const unsigned char *salt, unsigned int salt_len, int iter, - unsigned char * res, + unsigned char *res, int res_len); #endif /* ifdef HAVE_CIPHER */ @@ -103,15 +103,15 @@ struct _Eet_Key gnutls_x509_crt_t certificate; gnutls_x509_privkey_t private_key; # else /* ifdef HAVE_GNUTLS */ - X509 * certificate; - EVP_PKEY * private_key; + X509 *certificate; + EVP_PKEY *private_key; # endif /* ifdef HAVE_GNUTLS */ #endif /* ifdef HAVE_SIGNATURE */ }; EAPI Eet_Key * -eet_identity_open(const char * certificate_file, - const char * private_key_file, +eet_identity_open(const char *certificate_file, + const char *private_key_file, Eet_Key_Password_Callback cb) { #ifdef HAVE_SIGNATURE @@ -303,7 +303,7 @@ eet_identity_close(Eet_Key *key) EAPI void eet_identity_print(Eet_Key *key, - FILE * out) + FILE *out) { #ifdef HAVE_SIGNATURE # ifdef HAVE_GNUTLS @@ -443,9 +443,9 @@ eet_identity_unref(Eet_Key *key) } /* eet_identity_unref */ void * -eet_identity_compute_sha1(const void * data_base, +eet_identity_compute_sha1(const void *data_base, unsigned int data_length, - int * sha1_length) + int *sha1_length) { void *result; @@ -481,7 +481,7 @@ eet_identity_compute_sha1(const void * data_base, } /* eet_identity_compute_sha1 */ Eet_Error -eet_identity_sign(FILE * fp, +eet_identity_sign(FILE *fp, Eet_Key *key) { #ifdef HAVE_SIGNATURE @@ -647,15 +647,15 @@ on_error: } /* eet_identity_sign */ const void * -eet_identity_check(const void * data_base, +eet_identity_check(const void *data_base, unsigned int data_length, - void ** sha1, - int * sha1_length, - const void * signature_base, + void **sha1, + int *sha1_length, + const void *signature_base, unsigned int signature_length, - const void ** raw_signature_base, + const void **raw_signature_base, unsigned int *raw_signature_length, - int * x509_length) + int *x509_length) { #ifdef HAVE_SIGNATURE const int *header = signature_base; @@ -820,7 +820,7 @@ eet_identity_check(const void * data_base, EAPI void eet_identity_certificate_print(const unsigned char *certificate, int der_length, - FILE * out) + FILE *out) { #ifdef HAVE_SIGNATURE if (!certificate || !out || der_length <= 0) @@ -881,11 +881,11 @@ on_error: } /* eet_identity_certificate_print */ Eet_Error -eet_cipher(const void * data, +eet_cipher(const void *data, unsigned int size, - const char * key, + const char *key, unsigned int length, - void ** result, + void **result, unsigned int *result_length) { #ifdef HAVE_CIPHER @@ -1058,11 +1058,11 @@ on_error: } /* eet_cipher */ Eet_Error -eet_decipher(const void * data, +eet_decipher(const void *data, unsigned int size, - const char * key, + const char *key, unsigned int length, - void ** result, + void **result, unsigned int *result_length) { #ifdef HAVE_CIPHER @@ -1211,9 +1211,9 @@ on_error: #ifdef HAVE_CIPHER # ifdef HAVE_GNUTLS static Eet_Error -eet_hmac_sha1(const void * key, +eet_hmac_sha1(const void *key, size_t key_len, - const void * data, + const void *data, size_t data_len, unsigned char *res) { @@ -1252,12 +1252,12 @@ eet_hmac_sha1(const void * key, # endif /* ifdef HAVE_GNUTLS */ static Eet_Error -eet_pbkdf2_sha1(const char * key, +eet_pbkdf2_sha1(const char *key, int key_len, const unsigned char *salt, unsigned int salt_len, int iter, - unsigned char * res, + unsigned char *res, int res_len) { unsigned char digest[20]; diff --git a/legacy/eet/src/lib/eet_connection.c b/legacy/eet/src/lib/eet_connection.c index 474cccb162..4f141c16f3 100644 --- a/legacy/eet/src/lib/eet_connection.c +++ b/legacy/eet/src/lib/eet_connection.c @@ -50,21 +50,21 @@ struct _Eet_Message struct _Eet_Connection { - Eet_Read_Cb * eet_read_cb; + Eet_Read_Cb *eet_read_cb; Eet_Write_Cb *eet_write_cb; - void * user_data; + void *user_data; size_t allocated; size_t size; size_t received; - void * buffer; + void *buffer; }; EAPI Eet_Connection * -eet_connection_new(Eet_Read_Cb * eet_read_cb, +eet_connection_new(Eet_Read_Cb *eet_read_cb, Eet_Write_Cb *eet_write_cb, - const void * user_data) + const void *user_data) { Eet_Connection *conn; @@ -84,7 +84,7 @@ eet_connection_new(Eet_Read_Cb * eet_read_cb, EAPI int eet_connection_received(Eet_Connection *conn, - const void * data, + const void *data, size_t size) { if ((!conn) || (!data) || (!size)) @@ -173,7 +173,7 @@ eet_connection_received(Eet_Connection *conn, static Eina_Bool _eet_connection_raw_send(Eet_Connection *conn, - void * data, + void *data, int data_size) { Eet_Message *message; @@ -195,10 +195,10 @@ _eet_connection_raw_send(Eet_Connection *conn, } /* _eet_connection_raw_send */ EAPI Eina_Bool -eet_connection_send(Eet_Connection * conn, +eet_connection_send(Eet_Connection *conn, Eet_Data_Descriptor *edd, - const void * data_in, - const char * cipher_key) + const void *data_in, + const char *cipher_key) { void *flat_data; int data_size; @@ -220,8 +220,8 @@ eet_connection_send(Eet_Connection * conn, EAPI Eina_Bool eet_connection_node_send(Eet_Connection *conn, - Eet_Node * node, - const char * cipher_key) + Eet_Node *node, + const char *cipher_key) { void *data; int data_size; @@ -240,7 +240,7 @@ eet_connection_node_send(Eet_Connection *conn, EAPI void * eet_connection_close(Eet_Connection *conn, - Eina_Bool * on_going) + Eina_Bool *on_going) { void *user_data; diff --git a/legacy/eet/src/lib/eet_data.c b/legacy/eet/src/lib/eet_data.c index a2bf2eaa05..7cb393883d 100644 --- a/legacy/eet/src/lib/eet_data.c +++ b/legacy/eet/src/lib/eet_data.c @@ -87,7 +87,7 @@ struct _Eet_Data_Basic_Type_Codec int size; const char *name; int (*get)(const Eet_Dictionary *ed, const void *src, const void *src_end, void *dest); - void * (*put)(Eet_Dictionary *ed, const void *src, int *size_ret); + void * (*put)(Eet_Dictionary *ed, const void *src, int *size_ret); }; struct _Eet_Data_Group_Type_Codec @@ -98,11 +98,11 @@ struct _Eet_Data_Group_Type_Codec struct _Eet_Data_Chunk { - char * name; + char *name; int len; int size; int hash; - void * data; + void *data; unsigned char type; unsigned char group_type; }; @@ -116,29 +116,29 @@ struct _Eet_Data_Stream struct _Eet_Data_Descriptor_Hash { - Eet_Data_Element * element; + Eet_Data_Element *element; Eet_Data_Descriptor_Hash *next; }; struct _Eet_Data_Descriptor { - const char * name; + const char *name; const Eet_Dictionary *ed; int size; struct { - void * (*mem_alloc)(size_t size); + void * (*mem_alloc)(size_t size); void (*mem_free)(void *mem); - char * (*str_alloc)(const char *str); - char * (*str_direct_alloc)(const char *str); + char * (*str_alloc)(const char *str); + char * (*str_direct_alloc)(const char *str); void (*str_free)(const char *str); void (*str_direct_free)(const char *str); - void * (*list_next)(void *l); - void * (*list_append)(void *l, void *d); - void * (*list_data)(void *l); - void * (*list_free)(void *l); + void * (*list_next)(void *l); + void * (*list_append)(void *l, void *d); + void * (*list_data)(void *l); + void * (*list_free)(void *l); void (*hash_foreach)(void *h, int (*func)(void *h, const char *k, void *dt, void *fdt), void *fdt); - void * (*hash_add)(void *h, const char *k, void *d); + void * (*hash_add)(void *h, const char *k, void *d); void (*hash_free)(void *h); const char *(*type_get)(const void *data, Eina_Bool *unknow); Eina_Bool (*type_set)(const char *type, void *data, Eina_Bool unknow); @@ -161,9 +161,9 @@ struct _Eet_Data_Descriptor struct _Eet_Data_Element { - const char * name; - const char * counter_name; - const char * directory_name_ptr; + const char *name; + const char *counter_name; + const char *directory_name_ptr; Eet_Data_Descriptor *subtype; int offset; /* offset in bytes from the base element */ int count; /* number of elements for a fixed array */ @@ -174,9 +174,9 @@ struct _Eet_Data_Element struct _Eet_Data_Encode_Hash_Info { - Eet_Data_Stream * ds; + Eet_Data_Stream *ds; Eet_Data_Element *ede; - Eet_Dictionary * ed; + Eet_Dictionary *ed; }; struct _Eet_Free @@ -207,200 +207,200 @@ struct _Eet_Variant_Unknow /*---*/ static int eet_data_get_char(const Eet_Dictionary *ed, - const void * src, - const void * src_end, - void * dest); + const void *src, + const void *src_end, + void *dest); static void * eet_data_put_char(Eet_Dictionary *ed, - const void * src, - int * size_ret); + const void *src, + int *size_ret); static int eet_data_get_short(const Eet_Dictionary *ed, - const void * src, - const void * src_end, - void * dest); + const void *src, + const void *src_end, + void *dest); static void * eet_data_put_short(Eet_Dictionary *ed, - const void * src, - int * size_ret); + const void *src, + int *size_ret); static inline int eet_data_get_int(const Eet_Dictionary *ed, - const void * src, - const void * src_end, - void * dest); + const void *src, + const void *src_end, + void *dest); static void * eet_data_put_int(Eet_Dictionary *ed, - const void * src, - int * size_ret); + const void *src, + int *size_ret); static int eet_data_get_long_long(const Eet_Dictionary *ed, - const void * src, - const void * src_end, - void * dest); + const void *src, + const void *src_end, + void *dest); static void * eet_data_put_long_long(Eet_Dictionary *ed, - const void * src, - int * size_ret); + const void *src, + int *size_ret); static int eet_data_get_float(const Eet_Dictionary *ed, - const void * src, - const void * src_end, - void * dest); + const void *src, + const void *src_end, + void *dest); static void * eet_data_put_float(Eet_Dictionary *ed, - const void * src, - int * size_ret); + const void *src, + int *size_ret); static int eet_data_get_double(const Eet_Dictionary *ed, - const void * src, - const void * src_end, - void * dest); + const void *src, + const void *src_end, + void *dest); static void * eet_data_put_double(Eet_Dictionary *ed, - const void * src, - int * size_ret); + const void *src, + int *size_ret); static int eet_data_get_f32p32(const Eet_Dictionary *ed, - const void * src, - const void * src_end, - void * dest); + const void *src, + const void *src_end, + void *dest); static void * eet_data_put_f32p32(Eet_Dictionary *ed, - const void * src, - int * size_ret); + const void *src, + int *size_ret); static int eet_data_get_f16p16(const Eet_Dictionary *ed, - const void * src, - const void * src_end, - void * dest); + const void *src, + const void *src_end, + void *dest); static void * eet_data_put_f16p16(Eet_Dictionary *ed, - const void * src, - int * size_ret); + const void *src, + int *size_ret); static int eet_data_get_f8p24(const Eet_Dictionary *ed, - const void * src, - const void * src_end, - void * dest); + const void *src, + const void *src_end, + void *dest); static void * eet_data_put_f8p24(Eet_Dictionary *ed, - const void * src, - int * size_ret); + const void *src, + int *size_ret); static inline int eet_data_get_string(const Eet_Dictionary *ed, - const void * src, - const void * src_end, - void * dest); + const void *src, + const void *src_end, + void *dest); static void * eet_data_put_string(Eet_Dictionary *ed, - const void * src, - int * size_ret); + const void *src, + int *size_ret); static int eet_data_get_istring(const Eet_Dictionary *ed, - const void * src, - const void * src_end, - void * dest); + const void *src, + const void *src_end, + void *dest); static void * eet_data_put_istring(Eet_Dictionary *ed, - const void * src, - int * size_ret); + const void *src, + int *size_ret); static int eet_data_get_null(const Eet_Dictionary *ed, - const void * src, - const void * src_end, - void * dest); + const void *src, + const void *src_end, + void *dest); static void * eet_data_put_null(Eet_Dictionary *ed, - const void * src, - int * size_ret); + const void *src, + int *size_ret); static int eet_data_get_type(const Eet_Dictionary *ed, int type, - const void * src, - const void * src_end, - void * dest); + const void *src, + const void *src_end, + void *dest); static void * eet_data_put_type(Eet_Dictionary *ed, int type, - const void * src, - int * size_ret); + const void *src, + int *size_ret); static Eet_Node * eet_data_node_simple_type(int type, const char *name, - void * dd); + void *dd); -static int eet_data_get_unknown(Eet_Free_Context * context, +static int eet_data_get_unknown(Eet_Free_Context *context, const Eet_Dictionary *ed, - Eet_Data_Descriptor * edd, - Eet_Data_Element * ede, - Eet_Data_Chunk * echnk, + Eet_Data_Descriptor *edd, + Eet_Data_Element *ede, + Eet_Data_Chunk *echnk, int type, int group_type, - void * data_in, - char ** p, - int * size); -static void eet_data_put_unknown(Eet_Dictionary * ed, + void *data_in, + char **p, + int *size); +static void eet_data_put_unknown(Eet_Dictionary *ed, Eet_Data_Descriptor *edd, - Eet_Data_Element * ede, - Eet_Data_Stream * ds, - void * data_in); -static void eet_data_put_array(Eet_Dictionary * ed, + Eet_Data_Element *ede, + Eet_Data_Stream *ds, + void *data_in); +static void eet_data_put_array(Eet_Dictionary *ed, Eet_Data_Descriptor *edd, - Eet_Data_Element * ede, - Eet_Data_Stream * ds, - void * data_in); -static int eet_data_get_array(Eet_Free_Context * context, + Eet_Data_Element *ede, + Eet_Data_Stream *ds, + void *data_in); +static int eet_data_get_array(Eet_Free_Context *context, const Eet_Dictionary *ed, - Eet_Data_Descriptor * edd, - Eet_Data_Element * ede, - Eet_Data_Chunk * echnk, + Eet_Data_Descriptor *edd, + Eet_Data_Element *ede, + Eet_Data_Chunk *echnk, int type, int group_type, - void * data, - char ** p, - int * size); -static int eet_data_get_list(Eet_Free_Context * context, + void *data, + char **p, + int *size); +static int eet_data_get_list(Eet_Free_Context *context, const Eet_Dictionary *ed, - Eet_Data_Descriptor * edd, - Eet_Data_Element * ede, - Eet_Data_Chunk * echnk, + Eet_Data_Descriptor *edd, + Eet_Data_Element *ede, + Eet_Data_Chunk *echnk, int type, int group_type, - void * data_in, - char ** p, - int * size); -static void eet_data_put_list(Eet_Dictionary * ed, + void *data_in, + char **p, + int *size); +static void eet_data_put_list(Eet_Dictionary *ed, Eet_Data_Descriptor *edd, - Eet_Data_Element * ede, - Eet_Data_Stream * ds, - void * data_in); -static void eet_data_put_hash(Eet_Dictionary * ed, + Eet_Data_Element *ede, + Eet_Data_Stream *ds, + void *data_in); +static void eet_data_put_hash(Eet_Dictionary *ed, Eet_Data_Descriptor *edd, - Eet_Data_Element * ede, - Eet_Data_Stream * ds, - void * data_in); -static int eet_data_get_hash(Eet_Free_Context * context, + Eet_Data_Element *ede, + Eet_Data_Stream *ds, + void *data_in); +static int eet_data_get_hash(Eet_Free_Context *context, const Eet_Dictionary *ed, - Eet_Data_Descriptor * edd, - Eet_Data_Element * ede, - Eet_Data_Chunk * echnk, + Eet_Data_Descriptor *edd, + Eet_Data_Element *ede, + Eet_Data_Chunk *echnk, int type, int group_type, - void * data, - char ** p, - int * size); -static void eet_data_put_union(Eet_Dictionary * ed, + void *data, + char **p, + int *size); +static void eet_data_put_union(Eet_Dictionary *ed, Eet_Data_Descriptor *edd, - Eet_Data_Element * ede, - Eet_Data_Stream * ds, - void * data_in); -static int eet_data_get_union(Eet_Free_Context * context, + Eet_Data_Element *ede, + Eet_Data_Stream *ds, + void *data_in); +static int eet_data_get_union(Eet_Free_Context *context, const Eet_Dictionary *ed, - Eet_Data_Descriptor * edd, - Eet_Data_Element * ede, - Eet_Data_Chunk * echnk, + Eet_Data_Descriptor *edd, + Eet_Data_Element *ede, + Eet_Data_Chunk *echnk, int type, int group_type, - void * data, - char ** p, - int * size); -static void eet_data_put_variant(Eet_Dictionary * ed, + void *data, + char **p, + int *size); +static void eet_data_put_variant(Eet_Dictionary *ed, Eet_Data_Descriptor *edd, - Eet_Data_Element * ede, - Eet_Data_Stream * ds, - void * data_in); -static int eet_data_get_variant(Eet_Free_Context * context, + Eet_Data_Element *ede, + Eet_Data_Stream *ds, + void *data_in); +static int eet_data_get_variant(Eet_Free_Context *context, const Eet_Dictionary *ed, - Eet_Data_Descriptor * edd, - Eet_Data_Element * ede, - Eet_Data_Chunk * echnk, + Eet_Data_Descriptor *edd, + Eet_Data_Element *ede, + Eet_Data_Chunk *echnk, int type, int group_type, - void * data, - char ** p, - int * size); + void *data, + char **p, + int *size); static void eet_data_chunk_get(const Eet_Dictionary *ed, - Eet_Data_Chunk * chnk, - const void * src, + Eet_Data_Chunk *chnk, + const void *src, int size); -static Eet_Data_Chunk * eet_data_chunk_new(void * data, +static Eet_Data_Chunk * eet_data_chunk_new(void *data, int size, const char *name, int type, @@ -409,26 +409,26 @@ static void eet_data_chunk_free(Eet_Data_Chunk *chnk); static Eet_Data_Stream * eet_data_stream_new(void); static void eet_data_stream_write(Eet_Data_Stream *ds, - const void * data, + const void *data, int size); static void eet_data_stream_free(Eet_Data_Stream *ds); -static void eet_data_chunk_put(Eet_Dictionary * ed, - Eet_Data_Chunk * chnk, +static void eet_data_chunk_put(Eet_Dictionary *ed, + Eet_Data_Chunk *chnk, Eet_Data_Stream *ds); -static int eet_data_descriptor_encode_hash_cb(void * hash, +static int eet_data_descriptor_encode_hash_cb(void *hash, const char *key, - void * hdata, - void * fdata); -static void * _eet_data_descriptor_encode(Eet_Dictionary * ed, + void *hdata, + void *fdata); +static void * _eet_data_descriptor_encode(Eet_Dictionary *ed, Eet_Data_Descriptor *edd, - const void * data_in, - int * size_ret); -static void * _eet_data_descriptor_decode(Eet_Free_Context * context, + const void *data_in, + int *size_ret); +static void * _eet_data_descriptor_decode(Eet_Free_Context *context, const Eet_Dictionary *ed, - Eet_Data_Descriptor * edd, - const void * data_in, + Eet_Data_Descriptor *edd, + const void *data_in, int size_in); /*---*/ @@ -548,9 +548,9 @@ static int _eet_data_words_bigendian = -1; /* CHAR TYPE */ static int eet_data_get_char(const Eet_Dictionary *ed __UNUSED__, - const void * src, - const void * src_end, - void * dst) + const void *src, + const void *src_end, + void *dst) { char *s, *d; @@ -566,8 +566,8 @@ eet_data_get_char(const Eet_Dictionary *ed __UNUSED__, static void * eet_data_put_char(Eet_Dictionary *ed __UNUSED__, - const void * src, - int * size_ret) + const void *src, + int *size_ret) { char *s, *d; @@ -585,9 +585,9 @@ eet_data_put_char(Eet_Dictionary *ed __UNUSED__, /* SHORT TYPE */ static int eet_data_get_short(const Eet_Dictionary *ed __UNUSED__, - const void * src, - const void * src_end, - void * dst) + const void *src, + const void *src_end, + void *dst) { short *d; @@ -602,8 +602,8 @@ eet_data_get_short(const Eet_Dictionary *ed __UNUSED__, static void * eet_data_put_short(Eet_Dictionary *ed __UNUSED__, - const void * src, - int * size_ret) + const void *src, + int *size_ret) { short *s, *d; @@ -621,9 +621,9 @@ eet_data_put_short(Eet_Dictionary *ed __UNUSED__, /* INT TYPE */ static inline int eet_data_get_int(const Eet_Dictionary *ed __UNUSED__, - const void * src, - const void * src_end, - void * dst) + const void *src, + const void *src_end, + void *dst) { int *d; @@ -638,8 +638,8 @@ eet_data_get_int(const Eet_Dictionary *ed __UNUSED__, static void * eet_data_put_int(Eet_Dictionary *ed __UNUSED__, - const void * src, - int * size_ret) + const void *src, + int *size_ret) { int *s, *d; @@ -657,9 +657,9 @@ eet_data_put_int(Eet_Dictionary *ed __UNUSED__, /* LONG LONG TYPE */ static int eet_data_get_long_long(const Eet_Dictionary *ed __UNUSED__, - const void * src, - const void * src_end, - void * dst) + const void *src, + const void *src_end, + void *dst) { unsigned long long *d; @@ -674,8 +674,8 @@ eet_data_get_long_long(const Eet_Dictionary *ed __UNUSED__, static void * eet_data_put_long_long(Eet_Dictionary *ed __UNUSED__, - const void * src, - int * size_ret) + const void *src, + int *size_ret) { unsigned long long *s, *d; @@ -693,8 +693,8 @@ eet_data_put_long_long(Eet_Dictionary *ed __UNUSED__, /* STRING TYPE */ static inline int eet_data_get_string_hash(const Eet_Dictionary *ed, - const void * src, - const void * src_end) + const void *src, + const void *src_end) { if (ed) { @@ -711,9 +711,9 @@ eet_data_get_string_hash(const Eet_Dictionary *ed, static inline int eet_data_get_string(const Eet_Dictionary *ed, - const void * src, - const void * src_end, - void * dst) + const void *src, + const void *src_end, + void *dst) { char *s, **d; @@ -748,8 +748,8 @@ eet_data_get_string(const Eet_Dictionary *ed, static void * eet_data_put_string(Eet_Dictionary *ed, - const void * src, - int * size_ret) + const void *src, + int *size_ret) { char *s, *d; int len; @@ -787,17 +787,17 @@ eet_data_put_string(Eet_Dictionary *ed, /* ALWAYS INLINED STRING TYPE */ static int eet_data_get_istring(const Eet_Dictionary *ed __UNUSED__, - const void * src, - const void * src_end, - void * dst) + const void *src, + const void *src_end, + void *dst) { return eet_data_get_string(NULL, src, src_end, dst); } /* eet_data_get_istring */ static void * eet_data_put_istring(Eet_Dictionary *ed __UNUSED__, - const void * src, - int * size_ret) + const void *src, + int *size_ret) { return eet_data_put_string(NULL, src, size_ret); } /* eet_data_put_istring */ @@ -807,7 +807,7 @@ static int eet_data_get_null(const Eet_Dictionary *ed __UNUSED__, const void *src __UNUSED__, const void *src_end __UNUSED__, - void * dst) + void *dst) { char **d; @@ -820,7 +820,7 @@ eet_data_get_null(const Eet_Dictionary *ed __UNUSED__, static void * eet_data_put_null(Eet_Dictionary *ed __UNUSED__, const void *src __UNUSED__, - int * size_ret) + int *size_ret) { *size_ret = 0; return NULL; @@ -835,7 +835,7 @@ eet_data_put_null(Eet_Dictionary *ed __UNUSED__, static inline int _eet_data_float_cache_get(const char *s, int len, - float * d) + float *d) { /* fast handle of simple case 0xMp+E*/ if ((len == 6) && (s[0] == '0') && (s[1] == 'x') && (s[3] == 'p')) @@ -857,7 +857,7 @@ _eet_data_float_cache_get(const char *s, static inline int _eet_data_double_cache_get(const char *s, int len, - double * d) + double *d) { /* fast handle of simple case 0xMp+E*/ if ((len == 6) && (s[0] == '0') && (s[1] == 'x') && (s[3] == 'p')) @@ -879,9 +879,9 @@ _eet_data_double_cache_get(const char *s, /* FLOAT TYPE */ static int eet_data_get_float(const Eet_Dictionary *ed, - const void * src, - const void * src_end, - void * dst) + const void *src, + const void *src_end, + void *dst) { float *d; int idx; @@ -921,8 +921,8 @@ eet_data_get_float(const Eet_Dictionary *ed, static void * eet_data_put_float(Eet_Dictionary *ed, - const void * src, - int * size_ret) + const void *src, + int *size_ret) { char buf[128]; int idx; @@ -954,9 +954,9 @@ eet_data_put_float(Eet_Dictionary *ed, /* DOUBLE TYPE */ static int eet_data_get_double(const Eet_Dictionary *ed, - const void * src, - const void * src_end, - void * dst) + const void *src, + const void *src_end, + void *dst) { double *d; int idx; @@ -997,8 +997,8 @@ eet_data_get_double(const Eet_Dictionary *ed, static void * eet_data_put_double(Eet_Dictionary *ed, - const void * src, - int * size_ret) + const void *src, + int *size_ret) { char buf[128]; int idx; @@ -1030,9 +1030,9 @@ eet_data_put_double(Eet_Dictionary *ed, static int eet_data_get_f32p32(const Eet_Dictionary *ed, - const void * src, - const void * src_end, - void * dst) + const void *src, + const void *src_end, + void *dst) { Eina_F32p32 *fp; int idx; @@ -1066,8 +1066,8 @@ eet_data_get_f32p32(const Eet_Dictionary *ed, static void * eet_data_put_f32p32(Eet_Dictionary *ed, - const void * src, - int * size_ret) + const void *src, + int *size_ret) { char buf[128]; int idx; @@ -1099,9 +1099,9 @@ eet_data_put_f32p32(Eet_Dictionary *ed, static int eet_data_get_f16p16(const Eet_Dictionary *ed, - const void * src, - const void * src_end, - void * dst) + const void *src, + const void *src_end, + void *dst) { Eina_F32p32 tmp; Eina_F16p16 *fp; @@ -1117,8 +1117,8 @@ eet_data_get_f16p16(const Eet_Dictionary *ed, static void * eet_data_put_f16p16(Eet_Dictionary *ed, - const void * src, - int * size_ret) + const void *src, + int *size_ret) { Eina_F32p32 tmp; @@ -1128,9 +1128,9 @@ eet_data_put_f16p16(Eet_Dictionary *ed, static int eet_data_get_f8p24(const Eet_Dictionary *ed, - const void * src, - const void * src_end, - void * dst) + const void *src, + const void *src_end, + void *dst) { Eina_F32p32 tmp; Eina_F8p24 *fp; @@ -1146,8 +1146,8 @@ eet_data_get_f8p24(const Eet_Dictionary *ed, static void * eet_data_put_f8p24(Eet_Dictionary *ed, - const void * src, - int * size_ret) + const void *src, + int *size_ret) { Eina_F32p32 tmp; @@ -1158,9 +1158,9 @@ eet_data_put_f8p24(Eet_Dictionary *ed, static inline int eet_data_get_type(const Eet_Dictionary *ed, int type, - const void * src, - const void * src_end, - void * dest) + const void *src, + const void *src_end, + void *dest) { int ret; @@ -1171,8 +1171,8 @@ eet_data_get_type(const Eet_Dictionary *ed, static inline void * eet_data_put_type(Eet_Dictionary *ed, int type, - const void * src, - int * size_ret) + const void *src, + int *size_ret) { void *ret; @@ -1232,8 +1232,8 @@ eet_data_type_match(int type1, static inline void eet_data_chunk_get(const Eet_Dictionary *ed, - Eet_Data_Chunk * chnk, - const void * src, + Eet_Data_Chunk *chnk, + const void *src, int size) { const char *s; @@ -1323,7 +1323,7 @@ eet_data_chunk_get(const Eet_Dictionary *ed, } /* eet_data_chunk_get */ static inline Eet_Data_Chunk * -eet_data_chunk_new(void * data, +eet_data_chunk_new(void *data, int size, const char *name, int type, @@ -1392,7 +1392,7 @@ eet_data_stream_flush(Eet_Data_Stream *ds) static inline void eet_data_stream_write(Eet_Data_Stream *ds, - const void * data, + const void *data, int size) { char *p; @@ -1416,8 +1416,8 @@ eet_data_stream_write(Eet_Data_Stream *ds, } /* eet_data_stream_write */ static void -eet_data_chunk_put(Eet_Dictionary * ed, - Eet_Data_Chunk * chnk, +eet_data_chunk_put(Eet_Dictionary *ed, + Eet_Data_Chunk *chnk, Eet_Data_Stream *ds) { int *size; @@ -1547,7 +1547,7 @@ _eet_descriptor_hash_free(Eet_Data_Descriptor *edd) static Eet_Data_Element * _eet_descriptor_hash_find(Eet_Data_Descriptor *edd, - char * name, + char *name, int hash) { Eet_Data_Descriptor_Hash *bucket; @@ -1615,9 +1615,9 @@ _eet_str_free(const char *str) } /* _eet_str_free */ static Eina_Hash * -_eet_eina_hash_add_alloc(Eina_Hash * hash, +_eet_eina_hash_add_alloc(Eina_Hash *hash, const char *key, - void * data) + void *data) { if (!hash) hash = eina_hash_string_small_new(NULL); @@ -1630,9 +1630,9 @@ _eet_eina_hash_add_alloc(Eina_Hash * hash, } /* _eet_eina_hash_add_alloc */ static Eina_Hash * -_eet_eina_hash_direct_add_alloc(Eina_Hash * hash, +_eet_eina_hash_direct_add_alloc(Eina_Hash *hash, const char *key, - void * data) + void *data) { if (!hash) hash = eina_hash_string_small_new(NULL); @@ -1656,9 +1656,9 @@ _eet_str_direct_free(const char *str __UNUSED__) } /* _eet_str_direct_free */ static void -_eet_eina_hash_foreach(void * hash, +_eet_eina_hash_foreach(void *hash, Eina_Hash_Foreach cb, - void * fdata) + void *fdata) { if (hash) eina_hash_foreach(hash, cb, fdata); @@ -1674,7 +1674,7 @@ _eet_eina_hash_free(void *hash) /*---*/ EAPI Eina_Bool eet_eina_stream_data_descriptor_class_set(Eet_Data_Descriptor_Class *eddc, - const char * name, + const char *name, int size) { if (!eddc || !name) @@ -1701,7 +1701,7 @@ eet_eina_stream_data_descriptor_class_set(Eet_Data_Descriptor_Class *eddc, EAPI Eina_Bool eet_eina_file_data_descriptor_class_set(Eet_Data_Descriptor_Class *eddc, - const char * name, + const char *name, int size) { if (!eet_eina_stream_data_descriptor_class_set(eddc, name, size)) @@ -1843,13 +1843,13 @@ eet_data_descriptor_free(Eet_Data_Descriptor *edd) EAPI void eet_data_descriptor_element_add(Eet_Data_Descriptor *edd, - const char * name, + const char *name, int type, int group_type, int offset, int count, /* int counter_offset, */ - const char * counter_name /* FIXME: Useless should go on a major release */, + const char *counter_name /* FIXME: Useless should go on a major release */, Eet_Data_Descriptor *subtype) { Eet_Data_Element *ede; @@ -1939,10 +1939,10 @@ eet_data_descriptor_element_add(Eet_Data_Descriptor *edd, } /* eet_data_descriptor_element_add */ EAPI void * -eet_data_read_cipher(Eet_File * ef, +eet_data_read_cipher(Eet_File *ef, Eet_Data_Descriptor *edd, - const char * name, - const char * cipher_key) + const char *name, + const char *cipher_key) { const Eet_Dictionary *ed = NULL; const void *data = NULL; @@ -1973,7 +1973,7 @@ eet_data_read_cipher(Eet_File * ef, } /* eet_data_read_cipher */ EAPI Eet_Node * -eet_data_node_read_cipher(Eet_File * ef, +eet_data_node_read_cipher(Eet_File *ef, const char *name, const char *cipher_key) { @@ -2006,19 +2006,19 @@ eet_data_node_read_cipher(Eet_File * ef, } /* eet_data_node_read_cipher */ EAPI void * -eet_data_read(Eet_File * ef, +eet_data_read(Eet_File *ef, Eet_Data_Descriptor *edd, - const char * name) + const char *name) { return eet_data_read_cipher(ef, edd, name, NULL); } /* eet_data_read */ EAPI int -eet_data_write_cipher(Eet_File * ef, +eet_data_write_cipher(Eet_File *ef, Eet_Data_Descriptor *edd, - const char * name, - const char * cipher_key, - const void * data, + const char *name, + const char *cipher_key, + const void *data, int compress) { Eet_Dictionary *ed; @@ -2038,10 +2038,10 @@ eet_data_write_cipher(Eet_File * ef, } /* eet_data_write_cipher */ EAPI int -eet_data_write(Eet_File * ef, +eet_data_write(Eet_File *ef, Eet_Data_Descriptor *edd, - const char * name, - const void * data, + const char *name, + const void *data, int compress) { return eet_data_write_cipher(ef, edd, name, NULL, data, compress); @@ -2074,7 +2074,7 @@ _eet_free_hash(void *data) static void _eet_free_add(Eet_Free *ef, - void * data) + void *data) { int hash; int i; @@ -2138,7 +2138,7 @@ _eet_free_unref(Eet_Free *ef) #define _eet_freelist_unref(Ctx) _eet_free_unref(&Ctx->freelist); static void -_eet_freelist_free(Eet_Free_Context * context, +_eet_freelist_free(Eet_Free_Context *context, Eet_Data_Descriptor *edd) { int j; @@ -2164,7 +2164,7 @@ _eet_freelist_free(Eet_Free_Context * context, #define _eet_freelist_list_unref(Ctx) _eet_free_unref(&Ctx->freelist_list); static void -_eet_freelist_list_free(Eet_Free_Context * context, +_eet_freelist_list_free(Eet_Free_Context *context, Eet_Data_Descriptor *edd) { int j; @@ -2213,7 +2213,7 @@ _eet_freelist_str_free(Eet_Free_Context *context, Eet_Data_Descriptor *edd) #define _eet_freelist_direct_str_unref(Ctx) _eet_free_unref(&Ctx->freelist_direct_str); static void -_eet_freelist_direct_str_free(Eet_Free_Context * context, +_eet_freelist_direct_str_free(Eet_Free_Context *context, Eet_Data_Descriptor *edd) { int j; @@ -2239,7 +2239,7 @@ _eet_freelist_direct_str_free(Eet_Free_Context * context, #define _eet_freelist_hash_unref(Ctx) _eet_free_unref(&Ctx->freelist_hash); static void -_eet_freelist_hash_free(Eet_Free_Context * context, +_eet_freelist_hash_free(Eet_Free_Context *context, Eet_Data_Descriptor *edd) { int j; @@ -2282,8 +2282,8 @@ _eet_freelist_all_unref(Eet_Free_Context *freelist_context) static int eet_data_descriptor_encode_hash_cb(void *hash __UNUSED__, const char *cipher_key, - void * hdata, - void * fdata) + void *hdata, + void *fdata) { Eet_Dictionary *ed; Eet_Data_Encode_Hash_Info *edehi; @@ -2348,7 +2348,7 @@ eet_data_descriptor_encode_hash_cb(void *hash __UNUSED__, static char * _eet_data_dump_token_get(const char *src, - int * len) + int *len) { const char *p; char *tok = NULL; @@ -2430,10 +2430,10 @@ _eet_data_dump_token_get(const char *src, } /* _eet_data_dump_token_get */ static void -eet_data_encode(Eet_Dictionary * ed, +eet_data_encode(Eet_Dictionary *ed, Eet_Data_Stream *ds, - void * data, - const char * name, + void *data, + const char *name, int size, int type, int group_type) @@ -2456,8 +2456,8 @@ eet_data_encode(Eet_Dictionary * ed, static void * _eet_data_dump_encode(int parent_type, Eet_Dictionary *ed, - Eet_Node * node, - int * size_ret) + Eet_Node *node, + int *size_ret) { Eet_Data_Chunk *chnk = NULL; Eet_Data_Stream *ds; @@ -2768,8 +2768,8 @@ _eet_data_dump_encode(int parent_type, static void * _eet_data_dump_parse(Eet_Dictionary *ed, - int * size_ret, - const char * src, + int *size_ret, + const char *src, int size) { void *cdata = NULL; @@ -3037,10 +3037,10 @@ _eet_data_dump_parse(Eet_Dictionary *ed, } static void * -_eet_data_descriptor_decode(Eet_Free_Context * context, +_eet_data_descriptor_decode(Eet_Free_Context *context, const Eet_Dictionary *ed, - Eet_Data_Descriptor * edd, - const void * data_in, + Eet_Data_Descriptor *edd, + const void *data_in, int size_in) { Eet_Node *result = NULL; @@ -3259,16 +3259,16 @@ error: } /* _eet_data_descriptor_decode */ static int -eet_data_get_list(Eet_Free_Context * context, +eet_data_get_list(Eet_Free_Context *context, const Eet_Dictionary *ed, - Eet_Data_Descriptor * edd, - Eet_Data_Element * ede, - Eet_Data_Chunk * echnk, + Eet_Data_Descriptor *edd, + Eet_Data_Element *ede, + Eet_Data_Chunk *echnk, int type, int group_type __UNUSED__, - void * data, - char ** p, - int * size) + void *data, + char **p, + int *size) { Eet_Data_Descriptor *subtype = NULL; void *list = NULL; @@ -3325,16 +3325,16 @@ on_error: } /* eet_data_get_list */ static int -eet_data_get_hash(Eet_Free_Context * context, +eet_data_get_hash(Eet_Free_Context *context, const Eet_Dictionary *ed, - Eet_Data_Descriptor * edd, - Eet_Data_Element * ede, - Eet_Data_Chunk * echnk, + Eet_Data_Descriptor *edd, + Eet_Data_Element *ede, + Eet_Data_Chunk *echnk, int type, int group_type __UNUSED__, - void * data, - char ** p, - int * size) + void *data, + char **p, + int *size) { void **ptr; void *hash = NULL; @@ -3411,16 +3411,16 @@ on_error: * each chunk is pointless. */ static int -eet_data_get_array(Eet_Free_Context * context, +eet_data_get_array(Eet_Free_Context *context, const Eet_Dictionary *ed, - Eet_Data_Descriptor * edd, - Eet_Data_Element * ede, - Eet_Data_Chunk * echnk, + Eet_Data_Descriptor *edd, + Eet_Data_Element *ede, + Eet_Data_Chunk *echnk, int type, int group_type, - void * data, - char ** p, - int * size) + void *data, + char **p, + int *size) { Eina_List *childs = NULL; const char *name; @@ -3565,11 +3565,11 @@ on_error: } /* eet_data_get_array */ static void -eet_data_put_union(Eet_Dictionary * ed, +eet_data_put_union(Eet_Dictionary *ed, Eet_Data_Descriptor *edd __UNUSED__, - Eet_Data_Element * ede, - Eet_Data_Stream * ds, - void * data_in) + Eet_Data_Element *ede, + Eet_Data_Stream *ds, + void *data_in) { const char *union_type; int i; @@ -3622,16 +3622,16 @@ eet_data_put_union(Eet_Dictionary * ed, } /* eet_data_put_union */ static int -eet_data_get_union(Eet_Free_Context * context, - const Eet_Dictionary * ed, +eet_data_get_union(Eet_Free_Context *context, + const Eet_Dictionary *ed, Eet_Data_Descriptor *edd __UNUSED__, - Eet_Data_Element * ede, - Eet_Data_Chunk * echnk, + Eet_Data_Element *ede, + Eet_Data_Chunk *echnk, int type, int group_type, - void * data, - char ** p, - int * size) + void *data, + char **p, + int *size) { const char *union_type; void *data_ret = NULL; @@ -3724,11 +3724,11 @@ on_error: } /* eet_data_get_union */ static void -eet_data_put_variant(Eet_Dictionary * ed, +eet_data_put_variant(Eet_Dictionary *ed, Eet_Data_Descriptor *edd __UNUSED__, - Eet_Data_Element * ede, - Eet_Data_Stream * ds, - void * data_in) + Eet_Data_Element *ede, + Eet_Data_Stream *ds, + void *data_in) { const char *union_type; void *data; @@ -3836,16 +3836,16 @@ eet_data_put_variant(Eet_Dictionary * ed, } /* eet_data_put_variant */ static int -eet_data_get_variant(Eet_Free_Context * context, - const Eet_Dictionary * ed, +eet_data_get_variant(Eet_Free_Context *context, + const Eet_Dictionary *ed, Eet_Data_Descriptor *edd __UNUSED__, - Eet_Data_Element * ede, - Eet_Data_Chunk * echnk, + Eet_Data_Element *ede, + Eet_Data_Chunk *echnk, int type __UNUSED__, int group_type __UNUSED__, - void * data, - char ** p, - int * size) + void *data, + char **p, + int *size) { const char *union_type; void *data_ret = NULL; @@ -4025,14 +4025,14 @@ eet_data_node_simple_type(int type, const char *name, void *dd) } /* eet_data_node_simple_type */ static int -eet_data_get_unknown(Eet_Free_Context * context, +eet_data_get_unknown(Eet_Free_Context *context, const Eet_Dictionary *ed, - Eet_Data_Descriptor * edd, - Eet_Data_Element * ede, - Eet_Data_Chunk * echnk, + Eet_Data_Descriptor *edd, + Eet_Data_Element *ede, + Eet_Data_Chunk *echnk, int type, int group_type __UNUSED__, - void * data, + void *data, char **p __UNUSED__, int *size __UNUSED__) { @@ -4140,11 +4140,11 @@ eet_data_get_unknown(Eet_Free_Context * context, } /* eet_data_get_unknown */ static void -eet_data_put_array(Eet_Dictionary * ed, +eet_data_put_array(Eet_Dictionary *ed, Eet_Data_Descriptor *edd __UNUSED__, - Eet_Data_Element * ede, - Eet_Data_Stream * ds, - void * data_in) + Eet_Data_Element *ede, + Eet_Data_Stream *ds, + void *data_in) { void *data; int offset = 0; @@ -4216,11 +4216,11 @@ eet_data_put_array(Eet_Dictionary * ed, } /* eet_data_put_array */ static void -eet_data_put_unknown(Eet_Dictionary * ed, +eet_data_put_unknown(Eet_Dictionary *ed, Eet_Data_Descriptor *edd __UNUSED__, - Eet_Data_Element * ede, - Eet_Data_Stream * ds, - void * data_in) + Eet_Data_Element *ede, + Eet_Data_Stream *ds, + void *data_in) { void *data = NULL; int size; @@ -4245,11 +4245,11 @@ eet_data_put_unknown(Eet_Dictionary * ed, } /* eet_data_put_unknown */ static void -eet_data_put_list(Eet_Dictionary * ed, +eet_data_put_list(Eet_Dictionary *ed, Eet_Data_Descriptor *edd, - Eet_Data_Element * ede, - Eet_Data_Stream * ds, - void * data_in) + Eet_Data_Element *ede, + Eet_Data_Stream *ds, + void *data_in) { void *data; void *l; @@ -4286,11 +4286,11 @@ eet_data_put_list(Eet_Dictionary * ed, } /* eet_data_put_list */ static void -eet_data_put_hash(Eet_Dictionary * ed, +eet_data_put_hash(Eet_Dictionary *ed, Eet_Data_Descriptor *edd, - Eet_Data_Element * ede, - Eet_Data_Stream * ds, - void * data_in) + Eet_Data_Element *ede, + Eet_Data_Stream *ds, + void *data_in) { Eet_Data_Encode_Hash_Info fdata; void *l; @@ -4408,7 +4408,7 @@ EAPI void * eet_data_text_undump_cipher(const char *text, const char *cipher_key, int textlen, - int * size_ret) + int *size_ret) { void *ret = NULL; @@ -4440,13 +4440,13 @@ eet_data_text_undump_cipher(const char *text, EAPI void * eet_data_text_undump(const char *text, int textlen, - int * size_ret) + int *size_ret) { return eet_data_text_undump_cipher(text, NULL, textlen, size_ret); } /* eet_data_text_undump */ EAPI int -eet_data_undump_cipher(Eet_File * ef, +eet_data_undump_cipher(Eet_File *ef, const char *name, const char *cipher_key, const char *text, @@ -4470,7 +4470,7 @@ eet_data_undump_cipher(Eet_File * ef, } /* eet_data_undump_cipher */ EAPI int -eet_data_undump(Eet_File * ef, +eet_data_undump(Eet_File *ef, const char *name, const char *text, int textlen, @@ -4481,8 +4481,8 @@ eet_data_undump(Eet_File * ef, EAPI void * eet_data_descriptor_decode_cipher(Eet_Data_Descriptor *edd, - const void * data_in, - const char * cipher_key, + const void *data_in, + const char *cipher_key, int size_in) { void *deciphered = (void *)data_in; @@ -4515,7 +4515,7 @@ eet_data_descriptor_decode_cipher(Eet_Data_Descriptor *edd, EAPI void * eet_data_descriptor_decode(Eet_Data_Descriptor *edd, - const void * data_in, + const void *data_in, int size_in) { return eet_data_descriptor_decode_cipher(edd, data_in, NULL, size_in); @@ -4555,10 +4555,10 @@ eet_data_node_decode_cipher(const void *data_in, } /* eet_data_node_decode_cipher */ static void * -_eet_data_descriptor_encode(Eet_Dictionary * ed, +_eet_data_descriptor_encode(Eet_Dictionary *ed, Eet_Data_Descriptor *edd, - const void * data_in, - int * size_ret) + const void *data_in, + int *size_ret) { Eet_Data_Stream *ds; Eet_Data_Chunk *chnk; @@ -4617,10 +4617,10 @@ _eet_data_descriptor_encode(Eet_Dictionary * ed, } /* _eet_data_descriptor_encode */ EAPI int -eet_data_node_write_cipher(Eet_File * ef, +eet_data_node_write_cipher(Eet_File *ef, const char *name, const char *cipher_key, - Eet_Node * node, + Eet_Node *node, int compress) { Eet_Dictionary *ed; @@ -4640,9 +4640,9 @@ eet_data_node_write_cipher(Eet_File * ef, } /* eet_data_node_write_cipher */ EAPI void * -eet_data_node_encode_cipher(Eet_Node * node, +eet_data_node_encode_cipher(Eet_Node *node, const char *cipher_key, - int * size_ret) + int *size_ret) { void *ret = NULL; void *ciphered = NULL; @@ -4678,9 +4678,9 @@ eet_data_node_encode_cipher(Eet_Node * node, EAPI void * eet_data_descriptor_encode_cipher(Eet_Data_Descriptor *edd, - const void * data_in, - const char * cipher_key, - int * size_ret) + const void *data_in, + const char *cipher_key, + int *size_ret) { void *ret = NULL; void *ciphered = NULL; @@ -4716,8 +4716,8 @@ eet_data_descriptor_encode_cipher(Eet_Data_Descriptor *edd, EAPI void * eet_data_descriptor_encode(Eet_Data_Descriptor *edd, - const void * data_in, - int * size_ret) + const void *data_in, + int *size_ret) { return eet_data_descriptor_encode_cipher(edd, data_in, NULL, size_ret); } /* eet_data_descriptor_encode */ diff --git a/legacy/eet/src/lib/eet_dictionary.c b/legacy/eet/src/lib/eet_dictionary.c index adcfb85af0..74377a9bef 100644 --- a/legacy/eet/src/lib/eet_dictionary.c +++ b/legacy/eet/src/lib/eet_dictionary.c @@ -49,7 +49,7 @@ eet_dictionary_free(Eet_Dictionary *ed) static int _eet_dictionary_lookup(Eet_Dictionary *ed, - const char * string, + const char *string, int hash) { int prev = -1; @@ -79,7 +79,7 @@ _eet_dictionary_lookup(Eet_Dictionary *ed, int eet_dictionary_string_add(Eet_Dictionary *ed, - const char * string) + const char *string) { Eet_String *current; char *str; @@ -225,8 +225,8 @@ eet_dictionary_string_get_char(const Eet_Dictionary *ed, static inline Eina_Bool _eet_dictionary_string_get_me_cache(const char *s, int len, - int * mantisse, - int * exponent) + int *mantisse, + int *exponent) { if ((len == 6) && (s[0] == '0') && (s[1] == 'x') && (s[3] == 'p')) { @@ -242,7 +242,7 @@ _eet_dictionary_string_get_me_cache(const char *s, static inline Eina_Bool _eet_dictionary_string_get_float_cache(const char *s, int len, - float * result) + float *result) { int mantisse; int exponent; @@ -263,7 +263,7 @@ _eet_dictionary_string_get_float_cache(const char *s, static inline Eina_Bool _eet_dictionary_string_get_double_cache(const char *s, int len, - double * result) + double *result) { int mantisse; int exponent; @@ -284,7 +284,7 @@ _eet_dictionary_string_get_double_cache(const char *s, static inline Eina_Bool _eet_dictionary_test(const Eet_Dictionary *ed, int idx, - void * result) + void *result) { if (!result) return EINA_FALSE; @@ -304,7 +304,7 @@ _eet_dictionary_test(const Eet_Dictionary *ed, Eina_Bool eet_dictionary_string_get_float(const Eet_Dictionary *ed, int idx, - float * result) + float *result) { if (!_eet_dictionary_test(ed, idx, result)) return EINA_FALSE; @@ -338,7 +338,7 @@ eet_dictionary_string_get_float(const Eet_Dictionary *ed, Eina_Bool eet_dictionary_string_get_double(const Eet_Dictionary *ed, int idx, - double * result) + double *result) { if (!_eet_dictionary_test(ed, idx, result)) return EINA_FALSE; @@ -372,7 +372,7 @@ eet_dictionary_string_get_double(const Eet_Dictionary *ed, Eina_Bool eet_dictionary_string_get_fp(const Eet_Dictionary *ed, int idx, - Eina_F32p32 * result) + Eina_F32p32 *result) { if (!_eet_dictionary_test(ed, idx, result)) return EINA_FALSE; @@ -397,7 +397,7 @@ eet_dictionary_string_get_fp(const Eet_Dictionary *ed, EAPI int eet_dictionary_string_check(Eet_Dictionary *ed, - const char * string) + const char *string) { int i; diff --git a/legacy/eet/src/lib/eet_image.c b/legacy/eet/src/lib/eet_image.c index 2ba49cef7d..01b16bda9d 100644 --- a/legacy/eet/src/lib/eet_image.c +++ b/legacy/eet/src/lib/eet_image.c @@ -59,7 +59,7 @@ struct jpeg_membuf_src { struct jpeg_source_mgr pub; - const unsigned char * buf; + const unsigned char *buf; size_t len; }; @@ -101,7 +101,7 @@ _eet_jpeg_membuf_src_term(j_decompress_ptr cinfo) static int eet_jpeg_membuf_src(j_decompress_ptr cinfo, - const void * buf, + const void *buf, size_t len) { struct jpeg_membuf_src *src; @@ -128,10 +128,10 @@ struct jpeg_membuf_dst { struct jpeg_destination_mgr pub; - void ** dst_buf; - size_t * dst_len; + void **dst_buf; + size_t *dst_len; - unsigned char * buf; + unsigned char *buf; size_t len; int failed; }; @@ -190,8 +190,8 @@ _eet_jpeg_membuf_dst_term(j_compress_ptr cinfo) static int eet_jpeg_membuf_dst(j_compress_ptr cinfo, - void ** buf, - size_t * len) + void **buf, + size_t *len) { struct jpeg_membuf_dst *dst; @@ -228,11 +228,11 @@ static void _JPEGErrorHandler(j_common_ptr cinfo); static void _JPEGErrorHandler2(j_common_ptr cinfo, int msg_level); -static int eet_data_image_jpeg_header_decode(const void * data, +static int eet_data_image_jpeg_header_decode(const void *data, int size, unsigned int *w, unsigned int *h); -static int eet_data_image_jpeg_rgb_decode(const void * data, +static int eet_data_image_jpeg_rgb_decode(const void *data, int size, unsigned int src_x, unsigned int src_y, @@ -240,7 +240,7 @@ static int eet_data_image_jpeg_rgb_decode(const void * data, unsigned int w, unsigned int h, unsigned int row_stride); -static void * eet_data_image_jpeg_alpha_decode(const void * data, +static void * eet_data_image_jpeg_alpha_decode(const void *data, int size, unsigned int src_x, unsigned int src_y, @@ -248,25 +248,25 @@ static void * eet_data_image_jpeg_alpha_decode(const void * data, unsigned int w, unsigned int h, unsigned int row_stride); -static void * eet_data_image_lossless_convert(int * size, - const void * data, +static void * eet_data_image_lossless_convert(int *size, + const void *data, unsigned int w, unsigned int h, int alpha); -static void * eet_data_image_lossless_compressed_convert(int * size, - const void * data, +static void * eet_data_image_lossless_compressed_convert(int *size, + const void *data, unsigned int w, unsigned int h, int alpha, int compression); -static void * eet_data_image_jpeg_convert(int * size, - const void * data, +static void * eet_data_image_jpeg_convert(int *size, + const void *data, unsigned int w, unsigned int h, int alpha, int quality); -static void * eet_data_image_jpeg_alpha_convert(int * size, - const void * data, +static void * eet_data_image_jpeg_alpha_convert(int *size, + const void *data, unsigned int w, unsigned int h, int alpha, @@ -351,7 +351,7 @@ _JPEGErrorHandler2(j_common_ptr cinfo __UNUSED__, } /* _JPEGErrorHandler2 */ static int -eet_data_image_jpeg_header_decode(const void * data, +eet_data_image_jpeg_header_decode(const void *data, int size, unsigned int *w, unsigned int *h) @@ -397,7 +397,7 @@ eet_data_image_jpeg_header_decode(const void * data, } /* eet_data_image_jpeg_header_decode */ static int -eet_data_image_jpeg_rgb_decode(const void * data, +eet_data_image_jpeg_rgb_decode(const void *data, int size, unsigned int src_x, unsigned int src_y, @@ -550,7 +550,7 @@ eet_data_image_jpeg_rgb_decode(const void * data, } /* eet_data_image_jpeg_rgb_decode */ static void * -eet_data_image_jpeg_alpha_decode(const void * data, +eet_data_image_jpeg_alpha_decode(const void *data, int size, unsigned int src_x, unsigned int src_y, @@ -659,8 +659,8 @@ eet_data_image_jpeg_alpha_decode(const void * data, } /* eet_data_image_jpeg_alpha_decode */ static void * -eet_data_image_lossless_convert(int * size, - const void * data, +eet_data_image_lossless_convert(int *size, + const void *data, unsigned int w, unsigned int h, int alpha) @@ -707,8 +707,8 @@ eet_data_image_lossless_convert(int * size, } /* eet_data_image_lossless_convert */ static void * -eet_data_image_lossless_compressed_convert(int * size, - const void * data, +eet_data_image_lossless_compressed_convert(int *size, + const void *data, unsigned int w, unsigned int h, int alpha, @@ -781,8 +781,8 @@ eet_data_image_lossless_compressed_convert(int * size, } /* eet_data_image_lossless_compressed_convert */ static void * -eet_data_image_jpeg_convert(int * size, - const void * data, +eet_data_image_jpeg_convert(int *size, + const void *data, unsigned int w, unsigned int h, int alpha, @@ -860,8 +860,8 @@ eet_data_image_jpeg_convert(int * size, } /* eet_data_image_jpeg_convert */ static void * -eet_data_image_jpeg_alpha_convert(int * size, - const void * data, +eet_data_image_jpeg_alpha_convert(int *size, + const void *data, unsigned int w, unsigned int h, int alpha, @@ -1048,10 +1048,10 @@ eet_data_image_jpeg_alpha_convert(int * size, } /* eet_data_image_jpeg_alpha_convert */ EAPI int -eet_data_image_write_cipher(Eet_File * ef, - const char * name, - const char * cipher_key, - const void * data, +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, @@ -1076,9 +1076,9 @@ eet_data_image_write_cipher(Eet_File * ef, } /* eet_data_image_write_cipher */ EAPI int -eet_data_image_write(Eet_File * ef, - const char * name, - const void * data, +eet_data_image_write(Eet_File *ef, + const char *name, + const void *data, unsigned int w, unsigned int h, int alpha, @@ -1099,15 +1099,15 @@ eet_data_image_write(Eet_File * ef, } /* eet_data_image_write */ EAPI void * -eet_data_image_read_cipher(Eet_File * ef, - const char * name, - const char * cipher_key, +eet_data_image_read_cipher(Eet_File *ef, + const char *name, + const char *cipher_key, unsigned int *w, unsigned int *h, - int * alpha, - int * comp, - int * quality, - int * lossy) + int *alpha, + int *comp, + int *quality, + int *lossy) { unsigned int *d = NULL; void *data = NULL; @@ -1134,33 +1134,33 @@ eet_data_image_read_cipher(Eet_File * ef, } /* eet_data_image_read_cipher */ EAPI void * -eet_data_image_read(Eet_File * ef, - const char * name, +eet_data_image_read(Eet_File *ef, + const char *name, unsigned int *w, unsigned int *h, - int * alpha, - int * comp, - int * quality, - int * lossy) + int *alpha, + int *comp, + int *quality, + int *lossy) { return eet_data_image_read_cipher(ef, name, NULL, w, h, alpha, comp, quality, lossy); } /* eet_data_image_read */ EAPI int -eet_data_image_read_to_surface_cipher(Eet_File * ef, - const char * name, - const char * cipher_key, +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 * comp, - int * quality, - int * lossy) + int *alpha, + int *comp, + int *quality, + int *lossy) { void *data = NULL; int free_data = 0; @@ -1189,18 +1189,18 @@ eet_data_image_read_to_surface_cipher(Eet_File * ef, } /* eet_data_image_read_to_surface_cipher */ EAPI int -eet_data_image_read_to_surface(Eet_File * ef, - const char * name, +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 * comp, - int * quality, - int * lossy) + int *alpha, + int *comp, + int *quality, + int *lossy) { return eet_data_image_read_to_surface_cipher(ef, name, NULL, src_x, src_y, d, @@ -1210,15 +1210,15 @@ eet_data_image_read_to_surface(Eet_File * ef, } /* eet_data_image_read_to_surface */ EAPI int -eet_data_image_header_read_cipher(Eet_File * ef, - const char * name, - const char * cipher_key, +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 * comp, - int * quality, - int * lossy) + int *alpha, + int *comp, + int *quality, + int *lossy) { void *data = NULL; int size = 0; @@ -1245,14 +1245,14 @@ eet_data_image_header_read_cipher(Eet_File * ef, } /* eet_data_image_header_read_cipher */ EAPI int -eet_data_image_header_read(Eet_File * ef, - const char * name, +eet_data_image_header_read(Eet_File *ef, + const char *name, unsigned int *w, unsigned int *h, - int * alpha, - int * comp, - int * quality, - int * lossy) + int *alpha, + int *comp, + int *quality, + int *lossy) { return eet_data_image_header_read_cipher(ef, name, NULL, w, h, alpha, @@ -1260,15 +1260,15 @@ eet_data_image_header_read(Eet_File * ef, } /* eet_data_image_header_read */ EAPI void * -eet_data_image_encode_cipher(const void * data, - const char * cipher_key, +eet_data_image_encode_cipher(const void *data, + const char *cipher_key, unsigned int w, unsigned int h, int alpha, int comp, int quality, int lossy, - int * size_ret) + int *size_ret) { void *d = NULL; void *ciphered_d = NULL; @@ -1318,8 +1318,8 @@ eet_data_image_encode_cipher(const void * data, } /* eet_data_image_encode_cipher */ EAPI void * -eet_data_image_encode(const void * data, - int * size_ret, +eet_data_image_encode(const void *data, + int *size_ret, unsigned int w, unsigned int h, int alpha, @@ -1332,15 +1332,15 @@ eet_data_image_encode(const void * data, } /* eet_data_image_encode */ EAPI int -eet_data_image_header_decode_cipher(const void * data, - const char * cipher_key, +eet_data_image_header_decode_cipher(const void *data, + const char *cipher_key, int size, unsigned int *w, unsigned int *h, - int * alpha, - int * comp, - int * quality, - int * lossy) + int *alpha, + int *comp, + int *quality, + int *lossy) { int header[8]; void *deciphered_d = NULL; @@ -1484,14 +1484,14 @@ eet_data_image_header_decode_cipher(const void * data, } /* eet_data_image_header_decode_cipher */ EAPI int -eet_data_image_header_decode(const void * data, +eet_data_image_header_decode(const void *data, int size, unsigned int *w, unsigned int *h, - int * alpha, - int * comp, - int * quality, - int * lossy) + int *alpha, + int *comp, + int *quality, + int *lossy) { return eet_data_image_header_decode_cipher(data, NULL, @@ -1509,7 +1509,7 @@ _eet_data_image_copy_buffer(const unsigned int *src, unsigned int src_x, unsigned int src_y, unsigned int src_w, - unsigned int * dst, + unsigned int *dst, unsigned int w, unsigned int h, unsigned int row_stride) @@ -1529,7 +1529,7 @@ _eet_data_image_copy_buffer(const unsigned int *src, } /* _eet_data_image_copy_buffer */ static int -_eet_data_image_decode_inside(const void * data, +_eet_data_image_decode_inside(const void *data, int size, unsigned int src_x, unsigned int src_y, @@ -1631,15 +1631,15 @@ _eet_data_image_decode_inside(const void * data, } /* _eet_data_image_decode_inside */ EAPI void * -eet_data_image_decode_cipher(const void * data, - const char * cipher_key, +eet_data_image_decode_cipher(const void *data, + const char *cipher_key, int size, unsigned int *w, unsigned int *h, - int * alpha, - int * comp, - int * quality, - int * lossy) + int *alpha, + int *comp, + int *quality, + int *lossy) { unsigned int *d = NULL; unsigned int iw, ih; @@ -1698,22 +1698,22 @@ eet_data_image_decode_cipher(const void * data, } /* eet_data_image_decode_cipher */ EAPI void * -eet_data_image_decode(const void * data, +eet_data_image_decode(const void *data, int size, unsigned int *w, unsigned int *h, - int * alpha, - int * comp, - int * quality, - int * lossy) + int *alpha, + int *comp, + int *quality, + int *lossy) { return eet_data_image_decode_cipher(data, NULL, size, w, h, alpha, comp, quality, lossy); } /* eet_data_image_decode */ EAPI int -eet_data_image_decode_to_surface_cipher(const void * data, - const char * cipher_key, +eet_data_image_decode_to_surface_cipher(const void *data, + const char *cipher_key, int size, unsigned int src_x, unsigned int src_y, @@ -1721,10 +1721,10 @@ eet_data_image_decode_to_surface_cipher(const void * data, unsigned int w, unsigned int h, unsigned int row_stride, - int * alpha, - int * comp, - int * quality, - int * lossy) + int *alpha, + int *comp, + int *quality, + int *lossy) { unsigned int iw, ih; int ialpha, icompress, iquality, ilossy; @@ -1779,7 +1779,7 @@ eet_data_image_decode_to_surface_cipher(const void * data, } /* eet_data_image_decode_to_surface_cipher */ EAPI int -eet_data_image_decode_to_surface(const void * data, +eet_data_image_decode_to_surface(const void *data, int size, unsigned int src_x, unsigned int src_y, @@ -1787,10 +1787,10 @@ eet_data_image_decode_to_surface(const void * data, unsigned int w, unsigned int h, unsigned int row_stride, - int * alpha, - int * comp, - int * quality, - int * lossy) + int *alpha, + int *comp, + int *quality, + int *lossy) { return eet_data_image_decode_to_surface_cipher(data, NULL, size, src_x, src_y, d, diff --git a/legacy/eet/src/lib/eet_lib.c b/legacy/eet/src/lib/eet_lib.c index d55aef0eb7..a31313cc43 100644 --- a/legacy/eet/src/lib/eet_lib.c +++ b/legacy/eet/src/lib/eet_lib.c @@ -90,15 +90,15 @@ typedef struct _Eet_File_Directory Eet_File_Directory; struct _Eet_File { - char * path; - FILE * readfp; - Eet_File_Header * header; - Eet_Dictionary * ed; - Eet_Key * key; + char *path; + FILE *readfp; + Eet_File_Header *header; + Eet_Dictionary *ed; + Eet_Key *key; const unsigned char *data; - const void * x509_der; - const void * signature; - void * sha1; + const void *x509_der; + const void *signature; + void *sha1; Eet_File_Mode mode; @@ -138,8 +138,8 @@ struct _Eet_File_Directory struct _Eet_File_Node { - char * name; - void * data; + char *name; + void *data; Eet_File_Node *next; /* FIXME: make buckets linked lists */ int offset; @@ -225,25 +225,25 @@ char x509[x509_length]; /* The public certificate. */ /* prototypes of internal calls */ static Eet_File * eet_cache_find(const char *path, - Eet_File ** cache, + Eet_File **cache, int cache_num); -static void eet_cache_add(Eet_File * ef, +static void eet_cache_add(Eet_File *ef, Eet_File ***cache, - int * cache_num, - int * cache_alloc); -static void eet_cache_del(Eet_File * ef, + int *cache_num, + int *cache_alloc); +static void eet_cache_del(Eet_File *ef, Eet_File ***cache, - int * cache_num, - int * cache_alloc); + int *cache_num, + int *cache_alloc); static int eet_string_match(const char *s1, const char *s2); #if 0 /* Unused */ static Eet_Error eet_flush(Eet_File *ef); #endif /* if 0 */ static Eet_Error eet_flush2(Eet_File *ef); static Eet_File_Node * find_node_by_name(Eet_File *ef, const char *name); -static int read_data_from_disk(Eet_File * ef, +static int read_data_from_disk(Eet_File *ef, Eet_File_Node *efn, - void * buf, + void *buf, int len); static Eet_Error eet_internal_close(Eet_File *ef, Eina_Bool locked); @@ -338,7 +338,7 @@ eet_test_close(int test, /* find an eet file in the currently in use cache */ static Eet_File * eet_cache_find(const char *path, - Eet_File ** cache, + Eet_File **cache, int cache_num) { int i; @@ -360,10 +360,10 @@ eet_cache_find(const char *path, /* add to end of cache */ /* this should only be called when the cache lock is already held */ static void -eet_cache_add(Eet_File * ef, +eet_cache_add(Eet_File *ef, Eet_File ***cache, - int * cache_num, - int * cache_alloc) + int *cache_num, + int *cache_alloc) { Eet_File **new_cache; int new_cache_num; @@ -416,10 +416,10 @@ eet_cache_add(Eet_File * ef, /* delete from cache */ /* this should only be called when the cache lock is already held */ static void -eet_cache_del(Eet_File * ef, +eet_cache_del(Eet_File *ef, Eet_File ***cache, - int * cache_num, - int * cache_alloc) + int *cache_num, + int *cache_alloc) { Eet_File **new_cache; int new_cache_num, new_cache_alloc; @@ -1489,7 +1489,7 @@ eet_memopen_read(const void *data, } /* eet_memopen_read */ EAPI Eet_File * -eet_open(const char * file, +eet_open(const char *file, Eet_File_Mode mode) { FILE *fp; @@ -1675,7 +1675,7 @@ eet_mode_get(Eet_File *ef) EAPI const void * eet_identity_x509(Eet_File *ef, - int * der_length) + int *der_length) { if (!ef->x509_der) return NULL; @@ -1688,7 +1688,7 @@ eet_identity_x509(Eet_File *ef, EAPI const void * eet_identity_signature(Eet_File *ef, - int * signature_length) + int *signature_length) { if (!ef->signature) return NULL; @@ -1701,7 +1701,7 @@ eet_identity_signature(Eet_File *ef, EAPI const void * eet_identity_sha1(Eet_File *ef, - int * sha1_length) + int *sha1_length) { if (!ef->sha1) ef->sha1 = eet_identity_compute_sha1(ef->data, @@ -1716,7 +1716,7 @@ eet_identity_sha1(Eet_File *ef, EAPI Eet_Error eet_identity_set(Eet_File *ef, - Eet_Key * key) + Eet_Key *key) { Eet_Key *tmp = ef->key; @@ -1740,9 +1740,9 @@ eet_close(Eet_File *ef) } /* eet_close */ EAPI void * -eet_read_cipher(Eet_File * ef, +eet_read_cipher(Eet_File *ef, const char *name, - int * size_ret, + int *size_ret, const char *cipher_key) { Eet_File_Node *efn; @@ -1899,17 +1899,17 @@ on_error: } /* eet_read_cipher */ EAPI void * -eet_read(Eet_File * ef, +eet_read(Eet_File *ef, const char *name, - int * size_ret) + int *size_ret) { return eet_read_cipher(ef, name, size_ret, NULL); } /* eet_read */ EAPI const void * -eet_read_direct(Eet_File * ef, +eet_read_direct(Eet_File *ef, const char *name, - int * size_ret) + int *size_ret) { Eet_File_Node *efn; const char *data = NULL; @@ -2000,7 +2000,7 @@ on_error: } /* eet_read_direct */ EAPI Eina_Bool -eet_alias(Eet_File * ef, +eet_alias(Eet_File *ef, const char *name, const char *destination, int comp) @@ -2155,7 +2155,7 @@ on_error: } /* eet_alias */ EAPI int -eet_write_cipher(Eet_File * ef, +eet_write_cipher(Eet_File *ef, const char *name, const void *data, int size, @@ -2337,7 +2337,7 @@ on_error: } /* eet_write_cipher */ EAPI int -eet_write(Eet_File * ef, +eet_write(Eet_File *ef, const char *name, const void *data, int size, @@ -2347,7 +2347,7 @@ eet_write(Eet_File * ef, } /* eet_write */ EAPI int -eet_delete(Eet_File * ef, +eet_delete(Eet_File *ef, const char *name) { Eet_File_Node *efn; @@ -2418,9 +2418,9 @@ eet_dictionary_get(Eet_File *ef) } /* eet_dictionary_get */ EAPI char ** -eet_list(Eet_File * ef, +eet_list(Eet_File *ef, const char *glob, - int * count_ret) + int *count_ret) { Eet_File_Node *efn; char **list_ret = NULL; @@ -2529,7 +2529,7 @@ eet_num_entries(Eet_File *ef) } /* eet_num_entries */ static Eet_File_Node * -find_node_by_name(Eet_File * ef, +find_node_by_name(Eet_File *ef, const char *name) { Eet_File_Node *efn; @@ -2548,9 +2548,9 @@ find_node_by_name(Eet_File * ef, } /* find_node_by_name */ static int -read_data_from_disk(Eet_File * ef, +read_data_from_disk(Eet_File *ef, Eet_File_Node *efn, - void * buf, + void *buf, int len) { if (efn->offset < 0) diff --git a/legacy/eet/src/lib/eet_node.c b/legacy/eet/src/lib/eet_node.c index 4ac9f8fb1b..b532096985 100644 --- a/legacy/eet/src/lib/eet_node.c +++ b/legacy/eet/src/lib/eet_node.c @@ -125,7 +125,7 @@ eet_node_null_new(const char *name) Eet_Node * eet_node_list_new(const char *name, - Eina_List * nodes) + Eina_List *nodes) { Eet_Node *n; @@ -141,7 +141,7 @@ eet_node_list_new(const char *name, Eet_Node * eet_node_array_new(const char *name, int count, - Eina_List * nodes) + Eina_List *nodes) { Eet_Node *n; @@ -158,7 +158,7 @@ eet_node_array_new(const char *name, Eet_Node * eet_node_var_array_new(const char *name, - Eina_List * nodes) + Eina_List *nodes) { Eet_Node *n; @@ -176,7 +176,7 @@ eet_node_var_array_new(const char *name, Eet_Node * eet_node_hash_new(const char *name, const char *key, - Eet_Node * node) + Eet_Node *node) { Eina_List *nodes; Eet_Node *n; @@ -198,7 +198,7 @@ eet_node_hash_new(const char *name, Eet_Node * eet_node_struct_new(const char *name, - Eina_List * nodes) + Eina_List *nodes) { Eet_Node *n; @@ -213,7 +213,7 @@ eet_node_struct_new(const char *name, Eet_Node * eet_node_struct_child_new(const char *parent, - Eet_Node * child) + Eet_Node *child) { Eet_Node *n; @@ -230,9 +230,9 @@ eet_node_struct_child_new(const char *parent, } /* eet_node_struct_child_new */ void -eet_node_list_append(Eet_Node * parent, +eet_node_list_append(Eet_Node *parent, const char *name, - Eet_Node * child) + Eet_Node *child) { const char *tmp; Eet_Node *nn; @@ -271,9 +271,9 @@ eet_node_list_append(Eet_Node * parent, } /* eet_node_list_append */ void -eet_node_struct_append(Eet_Node * parent, +eet_node_struct_append(Eet_Node *parent, const char *name, - Eet_Node * child) + Eet_Node *child) { const char *tmp; Eet_Node *prev; @@ -319,10 +319,10 @@ eet_node_struct_append(Eet_Node * parent, } /* eet_node_struct_append */ void -eet_node_hash_add(Eet_Node * parent, +eet_node_hash_add(Eet_Node *parent, const char *name, const char *key, - Eet_Node * child) + Eet_Node *child) { Eet_Node *nn; @@ -634,11 +634,11 @@ eet_node_dump(Eet_Node *n, } /* eet_node_dump */ void * -eet_node_walk(void * parent, - const char * name, - Eet_Node * root, +eet_node_walk(void *parent, + const char *name, + Eet_Node *root, Eet_Node_Walk *cb, - void * user_data) + void *user_data) { Eet_Node *it; void *me = NULL;