fix stupid align of *

SVN revision: 50721
This commit is contained in:
Sebastian Dransfeld 2010-07-31 18:57:35 +00:00
parent 5d1a9f4e0d
commit 1c05469785
9 changed files with 798 additions and 798 deletions

View File

@ -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);
/***************************************************************************/

View File

@ -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);

View File

@ -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];

View File

@ -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;

File diff suppressed because it is too large Load Diff

View File

@ -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;

View File

@ -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,

View File

@ -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)

View File

@ -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;