summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--legacy/eet/ChangeLog4
-rw-r--r--legacy/eet/README.in6
-rw-r--r--legacy/eet/debian/control10
-rw-r--r--legacy/eet/doc/eet.dox.in8
-rw-r--r--legacy/eet/eet.spec.in6
-rw-r--r--legacy/eet/m4/efl_binary.m412
-rw-r--r--legacy/eet/src/lib/Eet.h20
-rw-r--r--legacy/eet/src/lib/eet_lib.c10
8 files changed, 38 insertions, 38 deletions
diff --git a/legacy/eet/ChangeLog b/legacy/eet/ChangeLog
index 0a8cd3e891..3881dff1b2 100644
--- a/legacy/eet/ChangeLog
+++ b/legacy/eet/ChangeLog
@@ -10,7 +10,7 @@
10 10
112008-05-14 Cedric BAIL 112008-05-14 Cedric BAIL
12 12
13 * Fix convertion from a text to a hash (EET_G_HASH). 13 * Fix conversion from a text to a hash (EET_G_HASH).
14 14
15 * Fix inlined string (EET_T_INLINED_STRING) dump/undump by introducing 15 * Fix inlined string (EET_T_INLINED_STRING) dump/undump by introducing
16 the new word for the parser 'inlined'. 16 the new word for the parser 'inlined'.
@@ -273,7 +273,7 @@
2732009-12-07 Cedric BAIL 2732009-12-07 Cedric BAIL
274 274
275 * Fix error when retrieving a different float type than the stored one. 275 * Fix error when retrieving a different float type than the stored one.
276 * Reduce convertion with a little memory overhead. 276 * Reduce conversion with a little memory overhead.
277 277
2782009-12-07 Vincent Torri 2782009-12-07 Vincent Torri
279 279
diff --git a/legacy/eet/README.in b/legacy/eet/README.in
index 182ac0a213..b506459484 100644
--- a/legacy/eet/README.in
+++ b/legacy/eet/README.in
@@ -21,7 +21,7 @@ Optional requirements:
21 gnutls (1.7.6 or better) 21 gnutls (1.7.6 or better)
22 openssl 22 openssl
23 23
24Eet is a tiny library designed to write an arbitary set of chunks of 24Eet is a tiny library designed to write an arbitrary set of chunks of
25data to a file and optionally compress each chunk (very much like a 25data to a file and optionally compress each chunk (very much like a
26zip file) and allow fast random-access reading of the file later 26zip file) and allow fast random-access reading of the file later
27on. It does not do zip as a zip itself has more complexity than is 27on. It does not do zip as a zip itself has more complexity than is
@@ -29,8 +29,8 @@ needed, and it was much simpler to implement this once here.
29 29
30It also can encode and decode data structures in memory, as well as 30It also can encode and decode data structures in memory, as well as
31image data for saving to eet files or sending across the network to 31image data for saving to eet files or sending across the network to
32other machines, or just writing to arbitary files on the system. All 32other machines, or just writing to arbitrary files on the system. All
33data is encoded in a platform independant way and can be written and 33data is encoded in a platform independent way and can be written and
34read by any architecture. This data once encoded can be sent to 34read by any architecture. This data once encoded can be sent to
35another process or machine and decoded on the other end without 35another process or machine and decoded on the other end without
36needing to go into an eet file. Eet can also optionally encrypt files 36needing to go into an eet file. Eet can also optionally encrypt files
diff --git a/legacy/eet/debian/control b/legacy/eet/debian/control
index 082b929256..ed910aec9a 100644
--- a/legacy/eet/debian/control
+++ b/legacy/eet/debian/control
@@ -14,7 +14,7 @@ Architecture: any
14Depends: libeet1 (= ${binary:Version}), libjpeg62-dev, pkg-config 14Depends: libeet1 (= ${binary:Version}), libjpeg62-dev, pkg-config
15Recommends: libeet-doc 15Recommends: libeet-doc
16Description: Enlightenment DR17 file chunk reading/writing library development files 16Description: Enlightenment DR17 file chunk reading/writing library development files
17 Eet is a tiny library designed to write an arbitary set of chunks of data to a 17 Eet is a tiny library designed to write an arbitrary set of chunks of data to a
18 file and optionally compress each chunk (very much like a zip file) and allow 18 file and optionally compress each chunk (very much like a zip file) and allow
19 fast random-access reading of the file later on. It does not do zip as zip 19 fast random-access reading of the file later on. It does not do zip as zip
20 itself has more complexity than we need, and it was much simpler to implement 20 itself has more complexity than we need, and it was much simpler to implement
@@ -27,7 +27,7 @@ Section: doc
27Architecture: all 27Architecture: all
28Enhances: libeet-dev 28Enhances: libeet-dev
29Description: libeet1 API documentation 29Description: libeet1 API documentation
30 Eet is a tiny library designed to write an arbitary set of chunks of data to a 30 Eet is a tiny library designed to write an arbitrary set of chunks of data to a
31 file and optionally compress each chunk (very much like a zip file) and allow 31 file and optionally compress each chunk (very much like a zip file) and allow
32 fast random-access reading of the file later on. It does not do zip as zip 32 fast random-access reading of the file later on. It does not do zip as zip
33 itself has more complexity than we need, and it was much simpler to implement 33 itself has more complexity than we need, and it was much simpler to implement
@@ -40,7 +40,7 @@ Package: libeet1
40Architecture: any 40Architecture: any
41Depends: ${shlibs:Depends} 41Depends: ${shlibs:Depends}
42Description: Enlightenment DR17 file chunk reading/writing library 42Description: Enlightenment DR17 file chunk reading/writing library
43 Eet is a tiny library designed to write an arbitary set of chunks of data to a 43 Eet is a tiny library designed to write an arbitrary set of chunks of data to a
44 file and optionally compress each chunk (very much like a zip file) and allow 44 file and optionally compress each chunk (very much like a zip file) and allow
45 fast random-access reading of the file later on. It does not do zip as zip 45 fast random-access reading of the file later on. It does not do zip as zip
46 itself has more complexity than we need, and it was much simpler to implement 46 itself has more complexity than we need, and it was much simpler to implement
@@ -52,7 +52,7 @@ Package: libeet-bin
52Architecture: any 52Architecture: any
53Depends: ${shlibs:Depends} 53Depends: ${shlibs:Depends}
54Description: Enlightenment DR17 file chunk reading/writing utility 54Description: Enlightenment DR17 file chunk reading/writing utility
55 Eet is a tiny library designed to write an arbitary set of chunks of data to a 55 Eet is a tiny library designed to write an arbitrary set of chunks of data to a
56 file and optionally compress each chunk (very much like a zip file) and allow 56 file and optionally compress each chunk (very much like a zip file) and allow
57 fast random-access reading of the file later on. It does not do zip as zip 57 fast random-access reading of the file later on. It does not do zip as zip
58 itself has more complexity than we need, and it was much simpler to implement 58 itself has more complexity than we need, and it was much simpler to implement
@@ -67,7 +67,7 @@ Section: libdevel
67Priority: extra 67Priority: extra
68Depends: libeet1 (= ${binary:Version}) 68Depends: libeet1 (= ${binary:Version})
69Description: Enlightenment DR17 file chunk reading/writing library - debug symbols 69Description: Enlightenment DR17 file chunk reading/writing library - debug symbols
70 Eet is a tiny library designed to write an arbitary set of chunks of data to a 70 Eet is a tiny library designed to write an arbitrary set of chunks of data to a
71 file and optionally compress each chunk (very much like a zip file) and allow 71 file and optionally compress each chunk (very much like a zip file) and allow
72 fast random-access reading of the file later on. It does not do zip as zip 72 fast random-access reading of the file later on. It does not do zip as zip
73 itself has more complexity than we need, and it was much simpler to implement 73 itself has more complexity than we need, and it was much simpler to implement
diff --git a/legacy/eet/doc/eet.dox.in b/legacy/eet/doc/eet.dox.in
index d6a7bfbd3d..14c0ed4464 100644
--- a/legacy/eet/doc/eet.dox.in
+++ b/legacy/eet/doc/eet.dox.in
@@ -39,11 +39,11 @@ These routines are used for Eet Library interaction
39 39
40@section intro What is Eet? 40@section intro What is Eet?
41 41
42It is a tiny library designed to write an arbitary set of chunks of data 42It is a tiny library designed to write an arbitrary set of chunks of data
43to a file and optionally compress each chunk (very much like a zip file) 43to a file and optionally compress each chunk (very much like a zip file)
44and allow fast random-access reading of the file later on. It does not 44and allow fast random-access reading of the file later on. It does not
45do zip as a zip itself has more complexity than is needed, and it was much 45do zip as a zip itself has more complexity than is needed, and it was much
46simpler to impliment this once here. 46simpler to implement this once here.
47 47
48Eet is extremely fast, small and simple. Eet files can be very small and 48Eet is extremely fast, small and simple. Eet files can be very small and
49highly compressed, making them very optimal for just sending across the 49highly compressed, making them very optimal for just sending across the
@@ -54,8 +54,8 @@ times, but the program does not want to have to read it all in at once.
54 54
55It also can encode and decode data structures in memory, as well as image 55It also can encode and decode data structures in memory, as well as image
56data for saving to Eet files or sending across the network to other 56data for saving to Eet files or sending across the network to other
57machines, or just writing to arbitary files on the system. All data is 57machines, or just writing to arbitrary files on the system. All data is
58encoded in a platform independant way and can be written and read by any 58encoded in a platform independent way and can be written and read by any
59architecture. 59architecture.
60 60
61@section example A simple example on using Eet 61@section example A simple example on using Eet
diff --git a/legacy/eet/eet.spec.in b/legacy/eet/eet.spec.in
index 58d64c54b0..119266b440 100644
--- a/legacy/eet/eet.spec.in
+++ b/legacy/eet/eet.spec.in
@@ -16,7 +16,7 @@ BuildRequires: libjpeg-devel zlib-devel
16BuildRoot: %{_tmppath}/%{name}-%{version}-root 16BuildRoot: %{_tmppath}/%{name}-%{version}-root
17 17
18%description 18%description
19Eet is a tiny library designed to write an arbitary set of chunks of 19Eet is a tiny library designed to write an arbitrary set of chunks of
20data to a file and optionally compress each chunk (very much like a 20data to a file and optionally compress each chunk (very much like a
21zip file) and allow fast random-access reading of the file later 21zip file) and allow fast random-access reading of the file later
22on. It does not do zip as a zip itself has more complexity than is 22on. It does not do zip as a zip itself has more complexity than is
@@ -24,8 +24,8 @@ needed, and it was much simpler to implement this once here.
24 24
25It also can encode and decode data structures in memory, as well as 25It also can encode and decode data structures in memory, as well as
26image data for saving to eet files or sending across the network to 26image data for saving to eet files or sending across the network to
27other machines, or just writing to arbitary files on the system. All 27other machines, or just writing to arbitrary files on the system. All
28data is encoded in a platform independant way and can be written and 28data is encoded in a platform independent way and can be written and
29read by any architecture. 29read by any architecture.
30 30
31%package devel 31%package devel
diff --git a/legacy/eet/m4/efl_binary.m4 b/legacy/eet/m4/efl_binary.m4
index 08732564dc..fc2f200509 100644
--- a/legacy/eet/m4/efl_binary.m4
+++ b/legacy/eet/m4/efl_binary.m4
@@ -4,9 +4,9 @@ dnl That code is public domain and can be freely used or copied.
4dnl Macro that checks if a binary is built or not 4dnl Macro that checks if a binary is built or not
5 5
6dnl Usage: EFL_ENABLE_BIN(binary) 6dnl Usage: EFL_ENABLE_BIN(binary)
7dnl Call AC_SUBST(BINARY_PRG) (BINARY is the uppercase of binary, - being tranformed into _) 7dnl Call AC_SUBST(BINARY_PRG) (BINARY is the uppercase of binary, - being transformed into _)
8dnl Define have_binary (- is tranformed into _) 8dnl Define have_binary (- is transformed into _)
9dnl Define conditional BUILD_BINARY (BINARY is the uppercase of binary, - being tranformed into _) 9dnl Define conditional BUILD_BINARY (BINARY is the uppercase of binary, - being transformed into _)
10 10
11AC_DEFUN([EFL_ENABLE_BIN], 11AC_DEFUN([EFL_ENABLE_BIN],
12[ 12[
@@ -46,9 +46,9 @@ AS_IF([test "x$have_[]m4_defn([DOWN])" = "xyes"], [$2], [$3])
46dnl Macro that specifies the binary to be used 46dnl Macro that specifies the binary to be used
47 47
48dnl Usage: EFL_WITH_BIN(binary, package, msg) 48dnl Usage: EFL_WITH_BIN(binary, package, msg)
49dnl Call AC_SUBST(BINARY_PRG) (BINARY is the uppercase of binary, - being tranformed into _) 49dnl Call AC_SUBST(BINARY_PRG) (BINARY is the uppercase of binary, - being transformed into _)
50dnl Define with_binary (- is tranformed into _) 50dnl Define with_binary (- is transformed into _)
51dnl Define conditional BUILD_BINARY (BINARY is the uppercase of binary, - being tranformed into _) 51dnl Define conditional BUILD_BINARY (BINARY is the uppercase of binary, - being transformed into _)
52 52
53AC_DEFUN([EFL_WITH_BIN], 53AC_DEFUN([EFL_WITH_BIN],
54[ 54[
diff --git a/legacy/eet/src/lib/Eet.h b/legacy/eet/src/lib/Eet.h
index 17446762f3..e9c5028ca5 100644
--- a/legacy/eet/src/lib/Eet.h
+++ b/legacy/eet/src/lib/Eet.h
@@ -629,7 +629,7 @@ eet_write_cipher(Eet_File *ef,
629 * @param compress A pointer to the int to hold the compression amount. 629 * @param compress A pointer to the int to hold the compression amount.
630 * @param quality A pointer to the int to hold the quality amount. 630 * @param quality A pointer to the int to hold the quality amount.
631 * @param lossy A pointer to the int to hold the lossiness flag. 631 * @param lossy A pointer to the int to hold the lossiness flag.
632 * @return 1 on successfull decode, 0 otherwise 632 * @return 1 on successful decode, 0 otherwise
633 * 633 *
634 * This function reads an image from an eet file stored under the named 634 * This function reads an image from an eet file stored under the named
635 * key in the eet file and return a pointer to the decompressed pixel data. 635 * key in the eet file and return a pointer to the decompressed pixel data.
@@ -1027,7 +1027,7 @@ eet_data_image_encode(const void *data,
1027 * @param compress A pointer to the int to hold the compression amount. 1027 * @param compress A pointer to the int to hold the compression amount.
1028 * @param quality A pointer to the int to hold the quality amount. 1028 * @param quality A pointer to the int to hold the quality amount.
1029 * @param lossy A pointer to the int to hold the lossiness flag. 1029 * @param lossy A pointer to the int to hold the lossiness flag.
1030 * @return 1 on successfull decode, 0 otherwise 1030 * @return 1 on successful decode, 0 otherwise
1031 * 1031 *
1032 * This function reads an image from an eet file stored under the named 1032 * This function reads an image from an eet file stored under the named
1033 * key in the eet file and return a pointer to the decompressed pixel data. 1033 * key in the eet file and return a pointer to the decompressed pixel data.
@@ -1820,7 +1820,7 @@ struct _Eet_Data_Descriptor_Class
1820 char *(*str_direct_alloc)(const char *str); /**< how to allocate a string directly from file backed/mmaped region pointed by @p str */ 1820 char *(*str_direct_alloc)(const char *str); /**< how to allocate a string directly from file backed/mmaped region pointed by @p str */
1821 void (*str_direct_free)(const char *str); /**< how to free a string returned by str_direct_alloc */ 1821 void (*str_direct_free)(const char *str); /**< how to free a string returned by str_direct_alloc */
1822 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. */ 1822 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. */
1823 Eina_Bool (*type_set)(const char *type, void *data, Eina_Bool unknow); /**< set the type at a particular adress */ 1823 Eina_Bool (*type_set)(const char *type, void *data, Eina_Bool unknow); /**< set the type at a particular address */
1824 void *(*array_alloc)(size_t size); /**< how to allocate memory for array (usually malloc()) */ 1824 void *(*array_alloc)(size_t size); /**< how to allocate memory for array (usually malloc()) */
1825 void (*array_free)(void *mem); /**< how to free memory for array (usually free()) */ 1825 void (*array_free)(void *mem); /**< how to free memory for array (usually free()) */
1826 } func; 1826 } func;
@@ -1856,7 +1856,7 @@ struct _Eet_Data_Descriptor_Class
1856 * 1856 *
1857 * Once you have described all the members of a struct you want loaded, or 1857 * Once you have described all the members of a struct you want loaded, or
1858 * saved eet can load and save those members for you, encode them into 1858 * saved eet can load and save those members for you, encode them into
1859 * endian-independant serialised data chunks for transmission across a 1859 * endian-independent serialised data chunks for transmission across a
1860 * a network or more. 1860 * a network or more.
1861 * 1861 *
1862 * The function pointers to the list and hash table functions are only 1862 * The function pointers to the list and hash table functions are only
@@ -1905,11 +1905,11 @@ eet_data_descriptor3_new(const Eet_Data_Descriptor_Class *eddc);
1905 * 1905 *
1906 * Once you have described all the members of a struct you want loaded, or 1906 * Once you have described all the members of a struct you want loaded, or
1907 * saved eet can load and save those members for you, encode them into 1907 * saved eet can load and save those members for you, encode them into
1908 * endian-independant serialised data chunks for transmission across a 1908 * endian-independent serialised data chunks for transmission across a
1909 * a network or more. 1909 * a network or more.
1910 * 1910 *
1911 * This function specially ignore str_direct_alloc and str_direct_free. It 1911 * This function specially ignore str_direct_alloc and str_direct_free. It
1912 * is usefull when the eet_data you are reading don't have a dictionnary 1912 * is useful when the eet_data you are reading don't have a dictionnary
1913 * like network stream or ipc. It also mean that all string will be allocated 1913 * like network stream or ipc. It also mean that all string will be allocated
1914 * and duplicated in memory. 1914 * and duplicated in memory.
1915 * 1915 *
@@ -1932,11 +1932,11 @@ eet_data_descriptor_stream_new(const Eet_Data_Descriptor_Class *eddc);
1932 * 1932 *
1933 * Once you have described all the members of a struct you want loaded, or 1933 * Once you have described all the members of a struct you want loaded, or
1934 * saved eet can load and save those members for you, encode them into 1934 * saved eet can load and save those members for you, encode them into
1935 * endian-independant serialised data chunks for transmission across a 1935 * endian-independent serialised data chunks for transmission across a
1936 * a network or more. 1936 * a network or more.
1937 * 1937 *
1938 * This function use str_direct_alloc and str_direct_free. It is 1938 * This function use str_direct_alloc and str_direct_free. It is
1939 * usefull when the eet_data you are reading come from a file and 1939 * useful when the eet_data you are reading come from a file and
1940 * have a dictionnary. This will reduce memory use, improve the 1940 * have a dictionnary. This will reduce memory use, improve the
1941 * possibility for the OS to page this string out. But be carrefull 1941 * possibility for the OS to page this string out. But be carrefull
1942 * all EET_T_STRING are pointer to a mmapped area and it will point 1942 * all EET_T_STRING are pointer to a mmapped area and it will point
@@ -2264,7 +2264,7 @@ eet_data_undump(Eet_File *ef,
2264 int compress); 2264 int compress);
2265 2265
2266/** 2266/**
2267 * Decode a data structure from an arbitary location in memory. 2267 * Decode a data structure from an arbitrary location in memory.
2268 * @param edd The data descriptor to use when decoding. 2268 * @param edd The data descriptor to use when decoding.
2269 * @param data_in The pointer to the data to decode into a struct. 2269 * @param data_in The pointer to the data to decode into a struct.
2270 * @param size_in The size of the data pointed to in bytes. 2270 * @param size_in The size of the data pointed to in bytes.
@@ -2826,7 +2826,7 @@ eet_data_undump_cipher(Eet_File *ef,
2826 int compress); 2826 int compress);
2827 2827
2828/** 2828/**
2829 * Decode a data structure from an arbitary location in memory 2829 * Decode a data structure from an arbitrary location in memory
2830 * using a cipher. 2830 * using a cipher.
2831 * @param edd The data descriptor to use when decoding. 2831 * @param edd The data descriptor to use when decoding.
2832 * @param data_in The pointer to the data to decode into a struct. 2832 * @param data_in The pointer to the data to decode into a struct.
diff --git a/legacy/eet/src/lib/eet_lib.c b/legacy/eet/src/lib/eet_lib.c
index ef8e5c93f7..36f0e2386c 100644
--- a/legacy/eet/src/lib/eet_lib.c
+++ b/legacy/eet/src/lib/eet_lib.c
@@ -915,11 +915,11 @@ eet_internal_read2(Eet_File *ef)
915 bytes_dictionary_entries = EET_FILE2_DICTIONARY_ENTRY_SIZE * 915 bytes_dictionary_entries = EET_FILE2_DICTIONARY_ENTRY_SIZE *
916 num_dictionary_entries; 916 num_dictionary_entries;
917 917
918 /* we cant have <= 0 values here - invalid */ 918 /* we can't have <= 0 values here - invalid */
919 if (eet_test_close((num_directory_entries <= 0), ef)) 919 if (eet_test_close((num_directory_entries <= 0), ef))
920 return NULL; 920 return NULL;
921 921
922 /* we cant have more bytes directory and bytes in dictionaries than the size of the file */ 922 /* we can't have more bytes directory and bytes in dictionaries than the size of the file */
923 if (eet_test_close((bytes_directory_entries + bytes_dictionary_entries) > 923 if (eet_test_close((bytes_directory_entries + bytes_dictionary_entries) >
924 ef->data_size, ef)) 924 ef->data_size, ef))
925 return NULL; 925 return NULL;
@@ -1167,7 +1167,7 @@ eet_internal_read1(Eet_File *ef)
1167 EXTRACT_INT(num_entries, ef->data, idx); 1167 EXTRACT_INT(num_entries, ef->data, idx);
1168 EXTRACT_INT(byte_entries, ef->data, idx); 1168 EXTRACT_INT(byte_entries, ef->data, idx);
1169 1169
1170 /* we cant have <= 0 values here - invalid */ 1170 /* we can't have <= 0 values here - invalid */
1171 if (eet_test_close((num_entries <= 0) || (byte_entries <= 0), ef)) 1171 if (eet_test_close((num_entries <= 0) || (byte_entries <= 0), ef))
1172 return NULL; 1172 return NULL;
1173 1173
@@ -1289,7 +1289,7 @@ eet_internal_read1(Eet_File *ef)
1289 efn->name); 1289 efn->name);
1290 } 1290 }
1291 else 1291 else
1292 /* The only really usefull peace of code for efn->name (no backward compatibility) */ 1292 /* The only really useful peace of code for efn->name (no backward compatibility) */
1293 efn->name = (char *)((unsigned char *)(p + HEADER_SIZE)); 1293 efn->name = (char *)((unsigned char *)(p + HEADER_SIZE));
1294 1294
1295 /* get hash bucket it should go in */ 1295 /* get hash bucket it should go in */
@@ -1793,7 +1793,7 @@ eet_read_cipher(Eet_File *ef,
1793 { 1793 {
1794 void *data_deciphered = NULL; 1794 void *data_deciphered = NULL;
1795 unsigned int data_deciphered_sz = 0; 1795 unsigned int data_deciphered_sz = 0;
1796 /* if we alreayd have the data in ram... copy that */ 1796 /* if we already have the data in ram... copy that */
1797 1797
1798 if (efn->data) 1798 if (efn->data)
1799 memcpy(data, efn->data, efn->size); 1799 memcpy(data, efn->data, efn->size);