move libs already in EFL into... IN-EFL - this will stop/prevent/limitmaster

thnigs like people using them and patching them, etc.



SVN revision: 79255

8 files changed, 0 insertions, 2305 deletions

diff --git a/src/examples/Makefile.am b/src/examples/Makefile.am
deleted file mode 100644
index 4ad6f28..0000000
--- a/src/examples/Makefile.am
+++ /dev/null
@@ -1,50 +0,0 @@
-MAINTAINERCLEANFILES = Makefile.in
-
-examplesdir = $(datadir)/$(PACKAGE)/examples
-
-if BUILD_EXAMPLES
-AM_CPPFLAGS = \
--I. \
--I$(top_srcdir)/src/lib \
-@EET_CFLAGS@
-
-examples_PROGRAMS = eet_basic eet_file eet_data_simple eet_data_nested eet_data_file_descriptor_01 eet_data_file_descriptor_02 eet_data_cipher_decipher
-
-eet_basic_SOURCES = eet-basic.c
-eet_basic_LDADD = $(top_builddir)/src/lib/libeet.la @EET_LIBS@
-
-eet_file_SOURCES = eet-file.c
-eet_file_LDADD = $(top_builddir)/src/lib/libeet.la @EET_LIBS@
-
-eet_data_simple_SOURCES = eet-data-simple.c
-eet_data_simple_LDADD = $(top_builddir)/src/lib/libeet.la @EET_LIBS@
-
-eet_data_nested_SOURCES = eet-data-nested.c
-eet_data_nested_LDADD = $(top_builddir)/src/lib/libeet.la @EET_LIBS@
-
-eet_data_file_descriptor_01_SOURCES = eet-data-file_descriptor_01.c
-eet_data_file_descriptor_01_LDADD = $(top_builddir)/src/lib/libeet.la @EET_LIBS@
-
-eet_data_file_descriptor_02_SOURCES = eet-data-file_descriptor_02.c
-eet_data_file_descriptor_02_LDADD = $(top_builddir)/src/lib/libeet.la @EET_LIBS@
-
-eet_data_cipher_decipher_SOURCES = eet-data-cipher_decipher.c
-eet_data_cipher_decipher_LDADD = $(top_builddir)/src/lib/libeet.la @EET_LIBS@
-
-endif
-
-filesdir = $(datadir)/$(PACKAGE)/examples
-files_DATA =
-
-if INSTALL_EXAMPLES
-
-files_DATA += \
-eet-basic.c \
-eet-file.c \
-eet-data-simple.c \
-eet-data-nested.c \
-eet-data-file_descriptor_01.c \
-eet-data-file_descriptor_02.c \
-eet-data-cipher_decipher.c
-
-endif
diff --git a/src/examples/eet-basic.c b/src/examples/eet-basic.c
deleted file mode 100644
index 05ff397..0000000
--- a/src/examples/eet-basic.c
+++ /dev/null
@@ -1,40 +0,0 @@
-#include <Eet.h>
-
-int
-main(void)
-{
-   Eet_File *ef;
-   char *ret;
-   int size;
-   char *entries[] =
-   {
-      "Entry 1",
-      "Big text string here compared to others",
-      "Eet is cool"
-   };
-
-   eet_init();
-
-   // blindly open an file for output and write strings with their NUL char
-   ef = eet_open("test.eet", EET_FILE_MODE_WRITE);
-   eet_write(ef, "Entry 1", entries[0], strlen(entries[0]) + 1, 0);
-   eet_write(ef, "Entry 2", entries[1], strlen(entries[1]) + 1, 1);
-   eet_write(ef, "Entry 3", entries[2], strlen(entries[2]) + 1, 0);
-   eet_close(ef);
-
-   // open the file again and blindly get the entries we wrote
-   ef = eet_open("test.eet", EET_FILE_MODE_READ);
-   ret = eet_read(ef, "Entry 1", &size);
-   printf("%s\n", ret);
-   free(ret);
-   ret = eet_read(ef, "Entry 2", &size);
-   printf("%s\n", ret);
-   free(ret);
-   ret = eet_read(ef, "Entry 3", &size);
-   printf("%s\n", ret);
-   free(ret);
-   eet_close(ef);
-
-   eet_shutdown();
-}
-
diff --git a/src/examples/eet-data-cipher_decipher.c b/src/examples/eet-data-cipher_decipher.c
deleted file mode 100644
index 2ef965c..0000000
--- a/src/examples/eet-data-cipher_decipher.c
+++ /dev/null
@@ -1,119 +0,0 @@
-/*
- * build: gcc -o eet_data_file_cipher_decipher eet-data-file_cipher_decipher.c `pkg-config --cflags --libs eet eina`
- */
-
-#include <Eina.h>
-#include <Eet.h>
-#include <stdio.h>
-#include <limits.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <unistd.h>
-
-int
-main(void)
-{
-   const char *buffer = "Here is a string of data to save !";
-   const char *key = "This is a crypto key";
-   const char *key_bad = "This is another crypto key";
-
-   char *file = strdup("/tmp/eet_cipher_example_XXXXX");
-   Eet_File *ef;
-   char *test;
-   int size;
-
-   eet_init();
-
-   if (!(file = tmpnam(file)))
-     {
-        fprintf(
-          stderr, "ERROR: could not create temporary file (%s).\n", file);
-        goto panic;
-     }
-
-   /* Crypt an eet file. */
-   ef = eet_open(file, EET_FILE_MODE_WRITE);
-   if (!ef)
-     {
-        fprintf(
-          stderr, "ERROR: could not access file (%s).\n", file);
-        goto error;
-     }
-
-   if (!eet_write_cipher(ef, "keys/tests", buffer, strlen(buffer) + 1, 0, key))
-     {
-        fprintf(
-          stderr, "ERROR: could not access file (%s).\n", file);
-        goto error;
-     }
-
-   eet_close(ef);
-
-   /* Decrypt an eet file. */
-   ef = eet_open(file, EET_FILE_MODE_READ);
-   if (!ef)
-     {
-        fprintf(
-          stderr, "ERROR: could not access file (%s).\n", file);
-        goto error;
-     }
-
-   test = eet_read_cipher(ef, "keys/tests", &size, key);
-   if (!test)
-     {
-        fprintf(
-          stderr, "ERROR: could decript contents on file %s, with key %s.\n",
-          file, key);
-        goto error;
-     }
-
-   if (size != (int)strlen(buffer) + 1)
-     {
-        fprintf(
-          stderr, "ERROR: something is wrong with the decripted data\n");
-        goto error;
-     }
-
-   if (memcmp(test, buffer, strlen(buffer) + 1) != 0)
-     {
-        fprintf(
-          stderr, "ERROR: something is wrong with the decripted data\n");
-        goto error;
-     }
-
-   eet_close(ef);
-
-   /* Decrypt an eet file, now using our BAD key!! */
-   ef = eet_open(file, EET_FILE_MODE_READ);
-   if (!ef)
-     {
-        fprintf(
-          stderr, "ERROR: could not access file (%s).\n", file);
-        goto error;
-     }
-
-   test = eet_read_cipher(ef, "keys/tests", &size, key_bad);
-
-   if (size == (int)strlen(buffer) + 1)
-     if (memcmp(test, buffer, strlen(buffer) + 1) == 0)
-       {
-          fprintf(
-            stderr, "ERROR: something is wrong with the contents of %s, as"
-                    " we accessed it with a different key and it decripted our"
-                    " information right.\n", file);
-          goto error;
-       }
-
-   eet_close(ef);
-
-error:
-   if (unlink(file) != 0)
-     {
-        fprintf(
-          stderr, "ERROR: could not unlink file (%s).\n", file);
-     }
-
-panic:
-   eet_shutdown();
-}
-
diff --git a/src/examples/eet-data-file_descriptor_01.c b/src/examples/eet-data-file_descriptor_01.c
deleted file mode 100644
index 4b5b75f..0000000
--- a/src/examples/eet-data-file_descriptor_01.c
+++ /dev/null
@@ -1,529 +0,0 @@
-/*
- * build: gcc -o eet_data_file_descriptor eet-data-file_descriptor.c `pkg-config --cflags --libs eet eina`
- */
-#include <Eina.h>
-#include <Eet.h>
-#include <stdio.h>
-#include <limits.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <unistd.h>
-
-// complex real-world structures based on elmdentica database
-typedef struct
-{
-   const char  *screen_name;
-   const char  *name;
-   const char  *message;
-   unsigned int id;
-   unsigned int status_id;
-   unsigned int date;
-   unsigned int timeline;
-} My_Message;
-
-typedef struct
-{
-   const char *dm_to;
-   const char *message;
-} My_Post;
-
-typedef struct
-{
-   unsigned int id;
-   const char  *name;
-   Eina_List   *messages;
-   My_Post     *posts;
-   int          posts_count;
-} My_Account;
-
-typedef struct
-{
-   unsigned int version; // it is recommended to use versioned configuration!
-   Eina_Hash   *accounts;
-} My_Cache;
-
-// string that represents the entry in eet file, you might like to have
-// different profiles or so in the same file, this is possible with
-// different strings
-static const char MY_CACHE_FILE_ENTRY[] = "cache";
-
-// keep the descriptor static global, so it can be
-// shared by different functions (load/save) of this and only this
-// file.
-static Eet_Data_Descriptor *_my_cache_descriptor;
-static Eet_Data_Descriptor *_my_account_descriptor;
-static Eet_Data_Descriptor *_my_message_descriptor;
-static Eet_Data_Descriptor *_my_post_descriptor;
-
-// keep file handle alive, so mmap()ed strings are all alive as well
-static Eet_File *_my_cache_file = NULL;
-static Eet_Dictionary *_my_cache_dict = NULL;
-
-static void
-_my_cache_descriptor_init(void)
-{
-   Eet_Data_Descriptor_Class eddc;
-
-   // The FILE variant is good for caches and things that are just
-   // appended, but needs to take care when changing strings and files must
-   // be kept open so mmap()ed strings will be kept alive.
-   EET_EINA_FILE_DATA_DESCRIPTOR_CLASS_SET(&eddc, My_Cache);
-   _my_cache_descriptor = eet_data_descriptor_file_new(&eddc);
-
-   EET_EINA_FILE_DATA_DESCRIPTOR_CLASS_SET(&eddc, My_Account);
-   _my_account_descriptor = eet_data_descriptor_file_new(&eddc);
-
-   EET_EINA_FILE_DATA_DESCRIPTOR_CLASS_SET(&eddc, My_Message);
-   _my_message_descriptor = eet_data_descriptor_file_new(&eddc);
-
-   EET_EINA_FILE_DATA_DESCRIPTOR_CLASS_SET(&eddc, My_Post);
-   _my_post_descriptor = eet_data_descriptor_file_new(&eddc);
-
-   // Describe the members to be saved:
-   // Use a temporary macro so we don't type a lot, also avoid errors:
-
-#define ADD_BASIC(member, eet_type) \
-  EET_DATA_DESCRIPTOR_ADD_BASIC     \
-    (_my_message_descriptor, My_Message, # member, member, eet_type)
-   ADD_BASIC(screen_name, EET_T_STRING);
-   ADD_BASIC(name, EET_T_STRING);
-   ADD_BASIC(message, EET_T_STRING);
-   ADD_BASIC(id, EET_T_UINT);
-   ADD_BASIC(status_id, EET_T_UINT);
-   ADD_BASIC(date, EET_T_UINT);
-   ADD_BASIC(timeline, EET_T_UINT);
-#undef ADD_BASIC
-
-#define ADD_BASIC(member, eet_type) \
-  EET_DATA_DESCRIPTOR_ADD_BASIC     \
-    (_my_post_descriptor, My_Post, # member, member, eet_type)
-   ADD_BASIC(dm_to, EET_T_STRING);
-   ADD_BASIC(message, EET_T_STRING);
-#undef ADD_BASIC
-
-#define ADD_BASIC(member, eet_type) \
-  EET_DATA_DESCRIPTOR_ADD_BASIC     \
-    (_my_account_descriptor, My_Account, # member, member, eet_type)
-   ADD_BASIC(name, EET_T_STRING);
-   ADD_BASIC(id, EET_T_UINT);
-#undef ADD_BASIC
-
-   EET_DATA_DESCRIPTOR_ADD_LIST
-     (_my_account_descriptor, My_Account, "messages", messages,
-     _my_message_descriptor);
-   EET_DATA_DESCRIPTOR_ADD_VAR_ARRAY
-     (_my_account_descriptor, My_Account, "posts", posts,
-     _my_post_descriptor);
-
-#define ADD_BASIC(member, eet_type) \
-  EET_DATA_DESCRIPTOR_ADD_BASIC     \
-    (_my_cache_descriptor, My_Cache, # member, member, eet_type)
-   ADD_BASIC(version, EET_T_UINT);
-#undef ADD_BASIC
-
-   EET_DATA_DESCRIPTOR_ADD_HASH
-     (_my_cache_descriptor, My_Cache, "accounts", accounts,
-     _my_account_descriptor);
-} /* _my_cache_descriptor_init */
-
-static void
-_my_cache_descriptor_shutdown(void)
-{
-   eet_data_descriptor_free(_my_cache_descriptor);
-   eet_data_descriptor_free(_my_account_descriptor);
-   eet_data_descriptor_free(_my_message_descriptor);
-   eet_data_descriptor_free(_my_post_descriptor);
-} /* _my_cache_descriptor_shutdown */
-
-// need to check if the pointer came from mmaped area in eet_dictionary
-// or it was allocated with eina_stringshare_add()
-static void
-_eet_string_free(const char *str)
-{
-   if (!str)
-     return;
-
-   if ((_my_cache_dict) && (eet_dictionary_string_check(_my_cache_dict, str)))
-     return;
-
-   eina_stringshare_del(str);
-} /* _eet_string_free */
-
-static My_Message *
-_my_message_new(const char *message)
-{
-   My_Message *msg = calloc(1, sizeof(My_Message));
-   if (!msg)
-     {
-        fprintf(stderr, "ERROR: could not calloc My_Message\n");
-        return NULL;
-     }
-
-   msg->message = eina_stringshare_add(message);
-   return msg;
-} /* _my_message_new */
-
-static void
-_my_message_free(My_Message *msg)
-{
-   _eet_string_free(msg->screen_name);
-   _eet_string_free(msg->name);
-   _eet_string_free(msg->message);
-   free(msg);
-} /* _my_message_free */
-
-static Eina_Bool
-_my_post_add(My_Account *acc,
-             const char *message)
-{
-   int new_count = acc->posts_count + 1;
-   My_Post *post = realloc(acc->posts, new_count * sizeof(My_Post));
-   if (!post)
-     {
-        fprintf(stderr, "ERROR: could add My_Post\n");
-        return EINA_FALSE;
-     }
-
-   post[acc->posts_count].message = eina_stringshare_add(message);
-   post[acc->posts_count].dm_to = NULL;
-   acc->posts_count = new_count;
-   acc->posts = post;
-   return EINA_TRUE;
-} /* _my_post_new */
-
-static void
-_my_post_free(My_Post *post)
-{
-   _eet_string_free(post->dm_to);
-   _eet_string_free(post->message);
-} /* _my_post_free */
-
-static My_Account *
-_my_account_new(const char *name)
-{
-   My_Account *acc = calloc(1, sizeof(My_Account));
-   if (!acc)
-     {
-        fprintf(stderr, "ERROR: could not calloc My_Account\n");
-        return NULL;
-     }
-
-   acc->name = eina_stringshare_add(name);
-   return acc;
-} /* _my_account_new */
-
-static void
-_my_account_free(My_Account *acc)
-{
-   My_Message *m;
-   int i;
-
-   _eet_string_free(acc->name);
-
-   EINA_LIST_FREE(acc->messages, m)
-     _my_message_free(m);
-
-   for (i = 0; i < acc->posts_count; i++)
-     _my_post_free(&acc->posts[i]);
-   free(acc->posts);
-
-   free(acc);
-} /* _my_account_free */
-
-static My_Cache *
-_my_cache_new(void)
-{
-   My_Cache *my_cache = calloc(1, sizeof(My_Cache));
-   if (!my_cache)
-     {
-        fprintf(stderr, "ERROR: could not calloc My_Cache\n");
-        return NULL;
-     }
-
-   my_cache->accounts = eina_hash_string_small_new(NULL);
-
-   my_cache->version = 1;
-   return my_cache;
-} /* _my_cache_new */
-
-static Eina_Bool
-_my_cache_account_free_cb(const Eina_Hash *hash,
-                          const void      *key,
-                          void            *data,
-                          void            *fdata)
-{
-   _my_account_free(data);
-   return EINA_TRUE;
-}
-
-static void
-_my_cache_free(My_Cache *my_cache)
-{
-   My_Account *acc;
-   eina_hash_foreach(my_cache->accounts, _my_cache_account_free_cb, NULL);
-   eina_hash_free(my_cache->accounts);
-   free(my_cache);
-} /* _my_cache_free */
-
-static My_Account *
-_my_cache_account_find(My_Cache   *my_cache,
-                       const char *name)
-{
-   return eina_hash_find(my_cache->accounts, name);
-} /* _my_cache_account_find */
-
-static My_Cache *
-_my_cache_load(const char *filename)
-{
-   My_Cache *my_cache;
-   Eet_File *ef = eet_open(filename, EET_FILE_MODE_READ);
-   if (!ef)
-     {
-        fprintf(stderr, "ERROR: could not open '%s' for read\n", filename);
-        return NULL;
-     }
-
-   my_cache = eet_data_read(ef, _my_cache_descriptor, MY_CACHE_FILE_ENTRY);
-   if (!my_cache)
-     {
-        eet_close(ef);
-        return NULL;
-     }
-
-   if (my_cache->version < 1)
-     {
-        fprintf(stderr,
-                "WARNING: version %#x was too old, upgrading it to %#x\n",
-                my_cache->version, 1);
-
-        my_cache->version = 1;
-     }
-
-   if (_my_cache_file)
-     eet_close(_my_cache_file);
-
-   _my_cache_file = ef;
-   _my_cache_dict = eet_dictionary_get(ef);
-
-   return my_cache;
-} /* _my_cache_load */
-
-static Eina_Bool
-_my_cache_save(const My_Cache *my_cache,
-               const char     *filename)
-{
-   char tmp[PATH_MAX];
-   Eet_File *ef;
-   Eina_Bool ret;
-   unsigned int i, len;
-   struct stat st;
-
-   len = eina_strlcpy(tmp, filename, sizeof(tmp));
-   if (len + 12 >= (int)sizeof(tmp))
-     {
-        fprintf(stderr, "ERROR: file name is too big: %s\n", filename);
-        return EINA_FALSE;
-     }
-
-   i = 0;
-   do
-     {
-        snprintf(tmp + len, 12, ".%u", i);
-        i++;
-     }
-   while (stat(tmp, &st) == 0);
-
-   ef = eet_open(tmp, EET_FILE_MODE_WRITE);
-   if (!ef)
-     {
-        fprintf(stderr, "ERROR: could not open '%s' for write\n", tmp);
-        return EINA_FALSE;
-     }
-
-   ret = eet_data_write
-       (ef, _my_cache_descriptor, MY_CACHE_FILE_ENTRY, my_cache, EINA_TRUE);
-
-   // VERY IMPORTANT NOTE:
-   // after eet_close(), all strings mmaped from file will be GONE, invalid!
-   // you'll need to free the old cache and open the new one.
-   // For cache this is okay, as you should be saving not so often or just
-   // at end.
-   //
-   // This is a trade off, you save memory by using mmap()ed strings, but
-   // you have to care about this.
-   eet_close(ef);
-
-   if (ret)
-     {
-        unlink(filename);
-        rename(tmp, filename);
-     }
-
-   return ret;
-} /* _my_cache_save */
-
-int
-main(int   argc,
-     char *argv[])
-{
-   My_Cache *my_cache;
-   const Eina_List *l_acc;
-   Eina_Iterator *it;
-   My_Account *acc;
-   int ret = 0;
-
-   if (argc < 3)
-     {
-        fprintf(stderr,
-                "Usage:\n\t%s <input> <output> [action] [action-params]\n\n"
-                "Where actions and their parameters:\n"
-                "\tacc <name>\n"
-                "\tpost <account-name> <message>\n"
-                "\tmessage <account-name> <message>\n"
-                "\n",
-                argv[0]);
-        return -1;
-     }
-
-   eina_init();
-   eet_init();
-   _my_cache_descriptor_init();
-
-   my_cache = _my_cache_load(argv[1]);
-   if (!my_cache)
-     {
-        printf("creating new cache.\n");
-        my_cache = _my_cache_new();
-        if (!my_cache)
-          {
-             ret = -2;
-             goto end;
-          }
-     }
-
-   if (argc > 3)
-     {
-        if (strcmp(argv[3], "acc") == 0)
-          {
-             if (argc == 5)
-               {
-                  My_Account *acc = _my_cache_account_find(my_cache, argv[4]);
-                  if (!acc)
-                    {
-                       acc = _my_account_new(argv[4]);
-                       eina_hash_direct_add(my_cache->accounts, acc->name, acc);
-                    }
-                  else
-                    fprintf(stderr, "ERROR: account '%s' already exists.\n",
-                            argv[4]);
-               }
-             else
-               fprintf(stderr,
-                       "ERROR: wrong number of parameters (%d).\n",
-                       argc);
-          }
-        else if (strcmp(argv[3], "post") == 0)
-          {
-             if (argc == 6)
-               {
-                  My_Account *acc = _my_cache_account_find(my_cache, argv[4]);
-                  if (acc)
-                    {
-                       _my_post_add(acc, argv[5]);
-                    }
-                  else
-                    fprintf(stderr, "ERROR: unknown account: '%s'\n", argv[4]);
-               }
-             else
-               fprintf(stderr,
-                       "ERROR: wrong number of parameters (%d).\n",
-                       argc);
-          }
-        else if (strcmp(argv[3], "message") == 0)
-          {
-             if (argc == 6)
-               {
-                  My_Account *acc = _my_cache_account_find(my_cache, argv[4]);
-                  if (acc)
-                    {
-                       My_Message *msg = _my_message_new(argv[5]);
-                       acc->messages = eina_list_append(acc->messages, msg);
-                    }
-                  else
-                    fprintf(stderr, "ERROR: unknown account: '%s'\n", argv[4]);
-               }
-             else
-               fprintf(stderr,
-                       "ERROR: wrong number of parameters (%d).\n",
-                       argc);
-          }
-        else
-          fprintf(stderr, "ERROR: unknown action '%s'\n", argv[2]);
-     }
-
-   printf("My_Cache:\n"
-          "\tversion.: %#x\n"
-          "\taccounts: %u\n",
-          my_cache->version,
-          eina_hash_population(my_cache->accounts));
-   it = eina_hash_iterator_data_new(my_cache->accounts);
-   EINA_ITERATOR_FOREACH(it, acc)
-     {
-        const My_Post *post;
-
-        printf("\t  > %-#8x '%.20s' stats: m=%u, p=%u\n",
-               acc->id, acc->name ? acc->name : "",
-               eina_list_count(acc->messages),
-               acc->posts_count);
-
-        if (eina_list_count(acc->messages))
-          {
-             const Eina_List *l;
-             const My_Message *msg;
-             printf("\t  |messages:\n");
-
-             EINA_LIST_FOREACH(acc->messages, l, msg)
-               {
-                  printf("\t  |   %-8x '%s' [%s]: '%.20s'\n",
-                         msg->id,
-                         msg->name ? msg->name : "",
-                         msg->screen_name ? msg->screen_name : "",
-                         msg->message ? msg->message : "");
-               }
-          }
-
-        if (acc->posts_count)
-          {
-             const My_Post *post;
-             int i;
-             printf("\t  |posts:\n");
-
-             for (i = 0; i < acc->posts_count; i++)
-               {
-                  post = &acc->posts[i];
-                  if (post->dm_to)
-                    printf("\t  |  @%s: '%.20s'\n", post->dm_to, post->message);
-                  else
-                    printf("\t  |  '%.20s'\n", post->message);
-               }
-          }
-
-        printf("\n");
-     }
-   eina_iterator_free(it);
-
-   if (!_my_cache_save(my_cache, argv[2]))
-     ret = -3;
-
-   _my_cache_free(my_cache);
-
-end:
-   if (_my_cache_file)
-     eet_close(_my_cache_file);
-   _my_cache_descriptor_shutdown();
-   eet_shutdown();
-   eina_shutdown();
-
-   return ret;
-} /* main */
-
diff --git a/src/examples/eet-data-file_descriptor_02.c b/src/examples/eet-data-file_descriptor_02.c
deleted file mode 100644
index 65ba79e..0000000
--- a/src/examples/eet-data-file_descriptor_02.c
+++ /dev/null
@@ -1,944 +0,0 @@
-/*
- * build: gcc -o eet_data_file_descriptor_02 eet-data-file_descriptor_02.c `pkg-config --cflags --libs eet eina`
- */
-
-#include <Eina.h>
-#include <Eet.h>
-#include <stdio.h>
-#include <limits.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <unistd.h>
-
-typedef enum _Example_Data_Type      Example_Data_Type;
-typedef struct _Example_Variant_Type Example_Variant_Type;
-typedef struct _Example_Variant      Example_Variant;
-typedef struct _Example_Union        Example_Union;
-typedef struct _Example_Struct1      Example_Struct1;
-typedef struct _Example_Struct2      Example_Struct2;
-typedef struct _Example_Struct3      Example_Struct3;
-typedef struct _Example_Lists        Example_Lists;
-
-enum _Example_Data_Type
-{
-   EET_UNKNOWN = 0,
-   EET_STRUCT1,
-   EET_STRUCT2,
-   EET_STRUCT3
-};
-
-struct
-{
-   Example_Data_Type u;
-   const char       *name;
-} eet_mapping[] = {
-   { EET_STRUCT1, "ST1" },
-   { EET_STRUCT2, "ST2" },
-   { EET_STRUCT3, "ST3" },
-   { EET_UNKNOWN, NULL }
-};
-
-struct _Example_Struct1
-{
-   double      val1;
-   int         stuff;
-   const char *s1;
-};
-
-struct _Example_Struct2
-{
-   Eina_Bool          b1;
-   unsigned long long v1;
-};
-
-struct _Example_Struct3
-{
-   int body;
-};
-
-struct _Example_Union
-{
-   Example_Data_Type type;
-
-   union {
-      Example_Struct1 st1;
-      Example_Struct2 st2;
-      Example_Struct3 st3;
-   } u;
-};
-
-struct _Example_Variant_Type
-{
-   const char *type;
-   Eina_Bool   unknow : 1;
-};
-
-struct _Example_Variant
-{
-   Example_Variant_Type t;
-
-   void                *data; /* differently than the union type, we
-                               * don't need to pre-allocate the memory
-                               * for the field*/
-};
-
-struct _Example_Lists
-{
-   Eina_List *union_list;
-   Eina_List *variant_list;
-};
-
-static void
-_st1_set(Example_Struct1 *st1,
-         double           v1,
-         int              v2,
-         const char      *v3)
-{
-   st1->val1 = v1;
-   st1->stuff = v2;
-   st1->s1 = v3;
-} /* _st1_set */
-
-static void
-_st2_set(Example_Struct2   *st2,
-         Eina_Bool          v1,
-         unsigned long long v2)
-{
-   st2->b1 = v1;
-   st2->v1 = v2;
-} /* _st2_set */
-
-static void
-_st3_set(Example_Struct3 *st3,
-         int              v1)
-{
-   st3->body = v1;
-} /* _st3_set */
-
-static const char *
-/* union
-   type_get() */
-_union_type_get(const void *data,
-                Eina_Bool  *unknow)
-{
-   const Example_Data_Type *u = data;
-   int i;
-
-   if (unknow)
-     *unknow = EINA_FALSE;
-
-   for (i = 0; eet_mapping[i].name != NULL; ++i)
-     if (*u == eet_mapping[i].u)
-       return eet_mapping[i].name;
-
-   if (unknow)
-     *unknow = EINA_TRUE;
-
-   return NULL;
-} /* _union_type_get */
-
-static Eina_Bool
-_union_type_set(const char *type,
-                void       *data,
-                Eina_Bool   unknow)
-{
-   Example_Data_Type *u = data;
-   int i;
-
-   if (unknow)
-     return EINA_FALSE;
-
-   for (i = 0; eet_mapping[i].name != NULL; ++i)
-     if (strcmp(eet_mapping[i].name, type) == 0)
-       {
-          *u = eet_mapping[i].u;
-          return EINA_TRUE;
-       }
-
-   return EINA_FALSE;
-} /* _union_type_set */
-
-static const char *
-_variant_type_get(const void *data,
-                  Eina_Bool  *unknow)
-{
-   const Example_Variant_Type *type = data;
-   int i;
-
-   if (unknow)
-     *unknow = type->unknow;
-
-   for (i = 0; eet_mapping[i].name != NULL; ++i)
-     if (strcmp(type->type, eet_mapping[i].name) == 0)
-       return eet_mapping[i].name;
-
-   if (unknow)
-     *unknow = EINA_FALSE;
-
-   return type->type;
-} /* _variant_type_get */
-
-static Eina_Bool
-_variant_type_set(const char *type,
-                  void       *data,
-                  Eina_Bool   unknow)
-{
-   Example_Variant_Type *vt = data;
-
-   vt->type = type;
-   vt->unknow = unknow;
-   return EINA_TRUE;
-} /* _variant_type_set */
-
-static Eet_Data_Descriptor *
-_st1_dd(void)
-{
-   Eet_Data_Descriptor_Class eddc;
-   Eet_Data_Descriptor *res;
-
-   EET_EINA_FILE_DATA_DESCRIPTOR_CLASS_SET(&eddc, Example_Struct1);
-   res = eet_data_descriptor_file_new(&eddc);
-   EET_DATA_DESCRIPTOR_ADD_BASIC(
-     res, Example_Struct1, "val1", val1, EET_T_DOUBLE);
-   EET_DATA_DESCRIPTOR_ADD_BASIC(
-     res, Example_Struct1, "stuff", stuff, EET_T_INT);
-   EET_DATA_DESCRIPTOR_ADD_BASIC(
-     res, Example_Struct1, "s1", s1, EET_T_STRING);
-
-   return res;
-} /* _st1_dd */
-
-static Eet_Data_Descriptor *
-_st2_dd(void)
-{
-   Eet_Data_Descriptor_Class eddc;
-   Eet_Data_Descriptor *res;
-
-   EET_EINA_FILE_DATA_DESCRIPTOR_CLASS_SET(&eddc, Example_Struct2);
-   res = eet_data_descriptor_file_new(&eddc);
-   EET_DATA_DESCRIPTOR_ADD_BASIC(
-     res, Example_Struct2, "b1", b1, EET_T_UCHAR);
-   EET_DATA_DESCRIPTOR_ADD_BASIC(
-     res, Example_Struct2, "v1", v1, EET_T_ULONG_LONG);
-
-   return res;
-} /* _st2_dd */
-
-static Eet_Data_Descriptor *
-_st3_dd(void)
-{
-   Eet_Data_Descriptor_Class eddc;
-   Eet_Data_Descriptor *res;
-
-   EET_EINA_FILE_DATA_DESCRIPTOR_CLASS_SET(&eddc, Example_Struct3);
-   res = eet_data_descriptor_file_new(&eddc);
-   EET_DATA_DESCRIPTOR_ADD_BASIC(
-     res, Example_Struct3, "body", body, EET_T_INT);
-
-   return res;
-} /* _st3_dd */
-
-/* string that represents the entry in the eet file. you might like to
- * have different profiles or so in the same file, this is possible
- * with different strings
- */
-static const char CACHE_FILE_ENTRY[] = "cache";
-
-/* keep the descriptor static global, so it can be shared by different
- * functions (load/save) of this and only this file.
- */
-static Eet_Data_Descriptor *_lists_descriptor;
-static Eet_Data_Descriptor *_struct_1_descriptor;
-static Eet_Data_Descriptor *_struct_2_descriptor;
-static Eet_Data_Descriptor *_struct_3_descriptor;
-static Eet_Data_Descriptor *_union_descriptor;
-static Eet_Data_Descriptor *_variant_descriptor;
-static Eet_Data_Descriptor *_union_unified_descriptor;
-static Eet_Data_Descriptor *_variant_unified_descriptor;
-
-/* keep file handle alive, so mmap()ed strings are all alive as
- * well */
-static Eet_File *_cache_file = NULL;
-static Eet_Dictionary *_cache_dict = NULL;
-
-static void
-/* declaring types */
-_data_descriptors_init(void)
-{
-   Eet_Data_Descriptor_Class eddc;
-
-   EET_EINA_FILE_DATA_DESCRIPTOR_CLASS_SET(&eddc, Example_Lists);
-   _lists_descriptor = eet_data_descriptor_file_new(&eddc);
-
-   _struct_1_descriptor = _st1_dd();
-   _struct_2_descriptor = _st2_dd();
-   _struct_3_descriptor = _st3_dd();
-
-   /* for union */
-   EET_EINA_FILE_DATA_DESCRIPTOR_CLASS_SET(&eddc, Example_Union);
-   _union_descriptor = eet_data_descriptor_file_new(&eddc);
-
-   eddc.version = EET_DATA_DESCRIPTOR_CLASS_VERSION;
-   eddc.func.type_get = _union_type_get;
-   eddc.func.type_set = _union_type_set;
-   _union_unified_descriptor = eet_data_descriptor_file_new(&eddc);
-
-   EET_DATA_DESCRIPTOR_ADD_MAPPING(
-     _union_unified_descriptor, "ST1", _struct_1_descriptor);
-   EET_DATA_DESCRIPTOR_ADD_MAPPING(
-     _union_unified_descriptor, "ST2", _struct_2_descriptor);
-   EET_DATA_DESCRIPTOR_ADD_MAPPING(
-     _union_unified_descriptor, "ST3", _struct_3_descriptor);
-
-   EET_DATA_DESCRIPTOR_ADD_UNION(
-     _union_descriptor, Example_Union, "u", u, type,
-     _union_unified_descriptor);
-
-   EET_DATA_DESCRIPTOR_ADD_LIST(
-     _lists_descriptor, Example_Lists, "union_list", union_list,
-     _union_descriptor);
-
-   /* for variant */
-   EET_EINA_FILE_DATA_DESCRIPTOR_CLASS_SET(&eddc, Example_Variant);
-   _variant_descriptor = eet_data_descriptor_file_new(&eddc);
-
-   eddc.version = EET_DATA_DESCRIPTOR_CLASS_VERSION;
-   eddc.func.type_get = _variant_type_get;
-   eddc.func.type_set = _variant_type_set;
-   _variant_unified_descriptor = eet_data_descriptor_stream_new(&eddc);
-
-   EET_DATA_DESCRIPTOR_ADD_MAPPING(
-     _variant_unified_descriptor, "ST1", _struct_1_descriptor);
-   EET_DATA_DESCRIPTOR_ADD_MAPPING(
-     _variant_unified_descriptor, "ST2", _struct_2_descriptor);
-   EET_DATA_DESCRIPTOR_ADD_MAPPING(
-     _variant_unified_descriptor, "ST3", _struct_3_descriptor);
-
-   EET_DATA_DESCRIPTOR_ADD_VARIANT(
-     _variant_descriptor, Example_Variant, "data", data, t,
-     _variant_unified_descriptor);
-
-   EET_DATA_DESCRIPTOR_ADD_LIST(
-     _lists_descriptor, Example_Lists, "variant_list", variant_list,
-     _variant_descriptor);
-} /* _data_descriptors_init */
-
-static void
-_data_descriptors_shutdown(void)
-{
-   eet_data_descriptor_free(_lists_descriptor);
-   eet_data_descriptor_free(_struct_1_descriptor);
-   eet_data_descriptor_free(_struct_2_descriptor);
-   eet_data_descriptor_free(_struct_3_descriptor);
-   eet_data_descriptor_free(_union_descriptor);
-   eet_data_descriptor_free(_variant_descriptor);
-   eet_data_descriptor_free(_union_unified_descriptor);
-   eet_data_descriptor_free(_variant_unified_descriptor);
-} /* _data_descriptors_shutdown */
-
-/* need to check if the pointer came from mmap()ed area in
- * eet_dictionary or it was allocated with eina_stringshare_add()
- */
-static void
-_string_free(const char *str)
-{
-   if (!str)
-     return;
-
-   if ((_cache_dict) && (eet_dictionary_string_check(_cache_dict, str)))
-     return;
-
-   eina_stringshare_del(str);
-} /* _string_free */
-
-static Example_Union *
-_union_1_new(const char *v1,
-             const char *v2,
-             const char *v3)
-{
-   Example_Union *un = calloc(1, sizeof(Example_Union));
-   if (!un)
-     {
-        fprintf(
-          stderr, "ERROR: could not allocate an Example_Union struct.\n");
-        return NULL;
-     }
-
-   un->type = EET_STRUCT1;
-   _st1_set(&(un->u.st1), atof(v1), atoi(v2), eina_stringshare_add(v3));
-
-   return un;
-}
-
-static Example_Union *
-_union_2_new(const char *v1,
-             const char *v2)
-{
-   Example_Union *un = calloc(1, sizeof(Example_Union));
-   if (!un)
-     {
-        fprintf(
-          stderr, "ERROR: could not allocate an Example_Union struct.\n");
-        return NULL;
-     }
-
-   un->type = EET_STRUCT2;
-   _st2_set(&(un->u.st2), atoi(v1), atoi(v2));
-
-   return un;
-}
-
-static Example_Union *
-_union_3_new(const char *v1)
-{
-   Example_Union *un = calloc(1, sizeof(Example_Union));
-   if (!un)
-     {
-        fprintf(
-          stderr, "ERROR: could not allocate an Example_Union struct.\n");
-        return NULL;
-     }
-
-   un->type = EET_STRUCT3;
-   _st3_set(&(un->u.st3), atoi(v1));
-
-   return un;
-}
-
-static Example_Variant *
-_variant_1_new(const char *v1,
-               const char *v2,
-               const char *v3)
-{
-   Example_Struct1 *st1;
-   Example_Variant *va = calloc(1, sizeof(Example_Variant));
-   if (!va)
-     {
-        fprintf(
-          stderr, "ERROR: could not allocate an Example_Variant struct.\n");
-        return NULL;
-     }
-
-   va = calloc(1, sizeof (Example_Variant));
-   va->t.type = eet_mapping[0].name;
-   st1 = calloc(1, sizeof (Example_Struct1));
-   _st1_set(st1, atof(v1), atoi(v2), eina_stringshare_add(v3));
-   va->data = st1;
-
-   return va;
-}
-
-static Example_Variant *
-_variant_2_new(const char *v1,
-               const char *v2)
-{
-   printf("varinant 2 new\n");
-
-   Example_Struct2 *st2;
-   Example_Variant *va = calloc(1, sizeof(Example_Variant));
-   if (!va)
-     {
-        fprintf(
-          stderr, "ERROR: could not allocate an Example_Variant struct.\n");
-        return NULL;
-     }
-
-   va = calloc(1, sizeof (Example_Variant));
-
-   va->t.type = eet_mapping[1].name;
-
-   printf("type gets %s\n", va->t.type);
-
-   st2 = calloc(1, sizeof (Example_Struct2));
-   _st2_set(st2, atoi(v1), atoi(v2));
-   va->data = st2;
-
-   return va;
-}
-
-static Example_Variant *
-_variant_3_new(const char *v1)
-{
-   Example_Struct3 *st3;
-   Example_Variant *va = calloc(1, sizeof(Example_Variant));
-   if (!va)
-     {
-        fprintf(
-          stderr, "ERROR: could not allocate an Example_Variant struct.\n");
-        return NULL;
-     }
-
-   va = calloc(1, sizeof (Example_Variant));
-   va->t.type = eet_mapping[2].name;
-   st3 = calloc(1, sizeof (Example_Struct3));
-   _st3_set(st3, atoi(v1));
-   va->data = st3;
-
-   return va;
-}
-
-static Example_Lists *
-_data_new(void)
-{
-   Example_Lists *example_lists = calloc(1, sizeof(Example_Lists));
-   if (!example_lists)
-     {
-        fprintf(stderr, "ERROR: could not allocate a Example_Lists struct.\n");
-        return NULL;
-     }
-
-   return example_lists;
-} /* _data_new */
-
-static void
-_union_free(Example_Union *un)
-{
-   if (un->type == EET_STRUCT1)
-     {
-        Example_Struct1 *st1 = &(un->u.st1);
-        _string_free(st1->s1);
-     }
-
-   free(un);
-}
-
-static void
-_variant_free(Example_Variant *va)
-{
-   if (!strcmp(va->t.type, eet_mapping[0].name))
-     {
-        Example_Struct1 *st1 = va->data;
-        _string_free(st1->s1);
-     }
-
-   free(va->data);
-   free(va);
-}
-
-static void
-_data_free(Example_Lists *cache)
-{
-   Example_Union *un;
-   Example_Variant *va;
-
-   EINA_LIST_FREE(cache->union_list, un)
-     _union_free(un);
-
-   EINA_LIST_FREE(cache->variant_list, va)
-     _variant_free(va);
-
-   free(cache);
-} /* _data_free */
-
-static Example_Lists *
-_data_load(const char *filename)
-{
-   Example_Lists *data;
-   Eet_File *ef = eet_open(filename, EET_FILE_MODE_READ);
-   if (!ef)
-     {
-        fprintf(stderr, "ERROR: could not open '%s' for read\n", filename);
-        return NULL;
-     }
-
-   data = eet_data_read(ef, _lists_descriptor, CACHE_FILE_ENTRY);
-   if (!data)
-     {
-        eet_close(ef);
-        return NULL;
-     }
-
-   if (_cache_file)
-     eet_close(_cache_file);
-
-   _cache_file = ef;
-   _cache_dict = eet_dictionary_get(ef);
-
-   return data;
-} /* _data_load */
-
-static Eina_Bool
-_data_save(const Example_Lists *cache,
-           const char          *filename)
-{
-   char tmp[PATH_MAX];
-   Eet_File *ef;
-   Eina_Bool ret;
-   unsigned int i, len;
-   struct stat st;
-
-   len = eina_strlcpy(tmp, filename, sizeof(tmp));
-   if (len + 12 >= (int)sizeof(tmp))
-     {
-        fprintf(stderr, "ERROR: file name is too big: %s\n", filename);
-        return EINA_FALSE;
-     }
-
-   i = 0;
-   do
-     {
-        snprintf(tmp + len, 12, ".%u", i);
-        i++;
-     }
-   while (stat(tmp, &st) == 0);
-
-   ef = eet_open(tmp, EET_FILE_MODE_WRITE);
-   if (!ef)
-     {
-        fprintf(stderr, "ERROR: could not open '%s' for write\n", tmp);
-        return EINA_FALSE;
-     }
-
-   ret = eet_data_write
-       (ef, _lists_descriptor, CACHE_FILE_ENTRY, cache, EINA_TRUE);
-
-   eet_close(ef);
-
-   if (ret)
-     {
-        unlink(filename);
-        rename(tmp, filename);
-     }
-
-   return ret;
-} /* _data_save */
-
-static void
-_print_union(const Example_Union *un)
-{
-   printf("\t  |   type: %s'\n", eet_mapping[un->type - 1].name);
-
-   switch (un->type)
-     {
-      case EET_STRUCT1:
-        printf("\t\t  val1: %f\n", un->u.st1.val1);
-        printf("\t\t  stuff: %d\n", un->u.st1.stuff);
-        printf("\t\t  s1: %s\n", un->u.st1.s1);
-        break;
-
-      case EET_STRUCT2:
-        printf("\t\t  val1: %i\n", un->u.st2.b1);
-        printf("\t\t  stuff: %lli\n", un->u.st2.v1);
-        break;
-
-      case EET_STRUCT3:
-        printf("\t\t  val1: %i\n", un->u.st3.body);
-        break;
-
-      default:
-        return;
-     }
-}
-
-static void
-_print_variant(const Example_Variant *va)
-{
-   printf("\t  |   type: %s'\n", va->t.type);
-
-   switch (va->t.type[2])
-     {
-      case '1':
-      {
-         Example_Struct1 *st1 = va->data;
-
-         printf("\t\t  val1: %f\n", st1->val1);
-         printf("\t\t  stuff: %d\n", st1->stuff);
-         printf("\t\t  s1: %s\n", st1->s1);
-      }
-      break;
-
-      case '2':
-      {
-         Example_Struct2 *st2 = va->data;
-
-         printf("\t\t  val1: %i\n", st2->b1);
-         printf("\t\t  stuff: %lli\n", st2->v1);
-      }
-      break;
-
-      case '3':
-      {
-         Example_Struct3 *st3 = va->data;
-
-         printf("\t\t  val1: %i\n", st3->body);
-      }
-      break;
-
-      default:
-        return;
-     }
-}
-
-int
-main(int   argc,
-     char *argv[])
-{
-   Example_Lists *data_lists;
-   int ret = 0;
-
-   if (argc < 3)
-     {
-        fprintf(stderr,
-                "Usage:\n\t%s <input> <output> [action action-params]\n\n"
-                "where actions and their parameters are:\n"
-                "\tunion <type> [fields]\n"
-                "\tvariant <type> [fields]\n"
-                "\n",
-                argv[0]);
-        return -1;
-     }
-
-   eina_init();
-   eet_init();
-   _data_descriptors_init();
-
-   data_lists = _data_load(argv[1]);
-   if (!data_lists)
-     {
-        printf("Creating new data lists.\n");
-        data_lists = _data_new();
-        if (!data_lists)
-          {
-             ret = -2;
-             goto end;
-          }
-     }
-
-   if (argc > 3)
-     {
-        if (strcmp(argv[3], "union") == 0)
-          {
-             if (argc > 4)
-               {
-                  int type = atoi(argv[4]);
-                  Example_Union *un;
-
-                  if (type < EET_STRUCT1 || type > EET_STRUCT3)
-                    {
-                       fprintf(stderr,
-                               "ERROR: invalid type parameter (%s).\n",
-                               argv[4]);
-                       goto cont;
-                    }
-
-                  switch (type)
-                    {
-                     case 1:
-                       if (argc != 8)
-                         {
-                            fprintf(
-                              stderr, "ERROR: wrong number of parameters"
-                                      " (%d).\n", argc);
-                            goto cont;
-                         }
-
-                       un = _union_1_new(
-                           argv[5], argv[6], argv[7]);
-                       if (!un)
-                         {
-                            fprintf(
-                              stderr, "ERROR: could not create the "
-                                      "requested union.\n");
-                            goto cont;
-                         }
-                       data_lists->union_list =
-                         eina_list_append(data_lists->union_list, un);
-                       break;
-
-                     case 2:
-                       if (argc != 7)
-                         {
-                            fprintf(
-                              stderr, "ERROR: wrong number of parameters"
-                                      " (%d).\n", argc);
-                            goto cont;
-                         }
-
-                       un = _union_2_new(argv[5], argv[6]);
-                       if (!un)
-                         {
-                            fprintf(
-                              stderr, "ERROR: could not create the "
-                                      "requested union.\n");
-                            goto cont;
-                         }
-                       data_lists->union_list =
-                         eina_list_append(data_lists->union_list, un);
-                       break;
-
-                     case 3:
-                       if (argc != 6)
-                         {
-                            fprintf(
-                              stderr, "ERROR: wrong number of parameters"
-                                      " (%d).\n", argc);
-                            goto cont;
-                         }
-
-                       un = _union_3_new(argv[5]);
-                       if (!un)
-                         {
-                            fprintf(
-                              stderr, "ERROR: could not create the "
-                                      "requested union.\n");
-                            goto cont;
-                         }
-                       data_lists->union_list =
-                         eina_list_append(data_lists->union_list, un);
-                       break;
-
-                     default:
-                       fprintf(
-                         stderr, "ERROR: bad type of of struct passed\n");
-                       goto cont;
-                    }
-               }
-             else
-               fprintf(stderr,
-                       "ERROR: wrong number of parameters (%d).\n",
-                       argc);
-          }
-        else if (strcmp(argv[3], "variant") == 0)
-          {
-             if (argc > 4)
-               {
-                  int type = atoi(argv[4]);
-                  Example_Variant *va;
-
-                  if (type < EET_STRUCT1 || type > EET_STRUCT3)
-                    {
-                       fprintf(stderr,
-                               "ERROR: invalid type parameter (%s).\n",
-                               argv[4]);
-                       goto cont;
-                    }
-
-                  switch (type)
-                    {
-                     case 1:
-                       if (argc != 8)
-                         {
-                            fprintf(
-                              stderr, "ERROR: wrong number of parameters"
-                                      " (%d).\n", argc);
-                            goto cont;
-                         }
-
-                       va = _variant_1_new(
-                           argv[5], argv[6], argv[7]);
-                       if (!va)
-                         {
-                            fprintf(
-                              stderr, "ERROR: could not create the "
-                                      "requested variant.\n");
-                            goto cont;
-                         }
-                       data_lists->variant_list =
-                         eina_list_append(data_lists->variant_list, va);
-                       break;
-
-                     case 2:
-                       if (argc != 7)
-                         {
-                            fprintf(
-                              stderr, "ERROR: wrong number of parameters"
-                                      " (%d).\n", argc);
-                            goto cont;
-                         }
-
-                       va = _variant_2_new(argv[5], argv[6]);
-                       if (!va)
-                         {
-                            fprintf(
-                              stderr, "ERROR: could not create the "
-                                      "requested variant.\n");
-                            goto cont;
-                         }
-                       data_lists->variant_list =
-                         eina_list_append(data_lists->variant_list, va);
-                       break;
-
-                     case 3:
-                       if (argc != 6)
-                         {
-                            fprintf(
-                              stderr, "ERROR: wrong number of parameters"
-                                      " (%d).\n", argc);
-                            goto cont;
-                         }
-
-                       va = _variant_3_new(argv[5]);
-                       if (!va)
-                         {
-                            fprintf(
-                              stderr, "ERROR: could not create the "
-                                      "requested variant.\n");
-                            goto cont;
-                         }
-                       data_lists->variant_list =
-                         eina_list_append(data_lists->variant_list, va);
-                       break;
-
-                     default:
-                       fprintf(
-                         stderr, "ERROR: bad type of of struct passed\n");
-                       goto cont;
-                    }
-               }
-             else
-               fprintf(stderr,
-                       "ERROR: wrong number of parameters (%d).\n",
-                       argc);
-          }
-        else
-          fprintf(stderr, "ERROR: unknown action '%s'\n", argv[3]);
-     }
-
-cont:
-   printf("Cached data:\n");
-
-   printf("\tstats: unions=%u, variants=%u\n",
-          eina_list_count(data_lists->union_list),
-          eina_list_count(data_lists->variant_list));
-
-   if (eina_list_count(data_lists->union_list))
-     {
-        const Eina_List *l;
-        const Example_Union *un;
-        printf("\t  * union list:\n");
-
-        EINA_LIST_FOREACH(data_lists->union_list, l, un)
-          {
-             _print_union(un);
-          }
-     }
-
-   if (eina_list_count(data_lists->variant_list))
-     {
-        const Eina_List *l;
-        const Example_Variant *un;
-        printf("\t  * variant list:\n");
-
-        EINA_LIST_FOREACH(data_lists->variant_list, l, un)
-          {
-             _print_variant(un);
-          }
-     }
-
-   printf("\n");
-
-   if (!_data_save(data_lists, argv[2]))
-     ret = -3;
-
-   _data_free(data_lists);
-
-end:
-   if (_cache_file)
-     eet_close(_cache_file);
-   _data_descriptors_shutdown();
-   eet_shutdown();
-   eina_shutdown();
-
-   return ret;
-} /* main */
-
diff --git a/src/examples/eet-data-nested.c b/src/examples/eet-data-nested.c
deleted file mode 100644
index a6b0e12..0000000
--- a/src/examples/eet-data-nested.c
+++ /dev/null
@@ -1,272 +0,0 @@
-/*
- * build: gcc -o eet_data_nested eet-data-nested.c `pkg-config --cflags --libs eet eina`
- */
-#include <Eina.h>
-#include <Eet.h>
-#include <stdio.h>
-#include <limits.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <unistd.h>
-
-// The struct that will be loaded and saved.
-// note that only the members described in the eet_data_descriptor
-// will be automatically handled. The other members will have their
-// space reserved and zeroed (as it uses calloc()), but not
-// saved or loaded from eet files.
-typedef struct
-{
-   unsigned int version; // it is recommended to use versioned configuration!
-   const char  *name;
-   int          id;
-   int          not_saved_value; // example of not saved data inside!
-   Eina_Bool    enabled;
-   Eina_List   *subs;
-} My_Conf_Type;
-
-typedef struct
-{
-   const char *server;
-   int         port;
-} My_Conf_Subtype;
-
-// string that represents the entry in eet file, you might like to have
-// different profiles or so in the same file, this is possible with
-// different strings
-static const char MY_CONF_FILE_ENTRY[] = "config";
-
-// keep the descriptor static global, so it can be
-// shared by different functions (load/save) of this and only this
-// file.
-static Eet_Data_Descriptor *_my_conf_descriptor;
-static Eet_Data_Descriptor *_my_conf_sub_descriptor;
-
-static void
-_my_conf_descriptor_init(void)
-{
-   Eet_Data_Descriptor_Class eddc;
-
-   // The class describe the functions to use to create the type and its
-   // full allocated size.
-   //
-   // Eina types are very convenient, so use them to create the descriptor,
-   // so we get eina_list,  eina_hash and eina_stringshare automatically!
-   //
-   // The STREAM variant is better for configuration files as the values
-   // will likely change a lot.
-   //
-   // The other variant, FILE, is good for caches and things that are just
-   // appended, but needs to take care when changing strings and files must
-   // be kept open so mmap()ed strings will be kept alive.
-   EET_EINA_STREAM_DATA_DESCRIPTOR_CLASS_SET(&eddc, My_Conf_Type);
-   _my_conf_descriptor = eet_data_descriptor_stream_new(&eddc);
-
-   EET_EINA_STREAM_DATA_DESCRIPTOR_CLASS_SET(&eddc, My_Conf_Subtype);
-   _my_conf_sub_descriptor = eet_data_descriptor_stream_new(&eddc);
-
-   // Describe the members to be saved:
-   // Use a temporary macro so we don't type a lot, also avoid errors:
-#define MY_CONF_ADD_BASIC(member, eet_type) \
-  EET_DATA_DESCRIPTOR_ADD_BASIC             \
-    (_my_conf_descriptor, My_Conf_Type, # member, member, eet_type)
-#define MY_CONF_SUB_ADD_BASIC(member, eet_type) \
-  EET_DATA_DESCRIPTOR_ADD_BASIC                 \
-    (_my_conf_sub_descriptor, My_Conf_Subtype, # member, member, eet_type)
-
-   MY_CONF_SUB_ADD_BASIC(server, EET_T_STRING);
-   MY_CONF_SUB_ADD_BASIC(port, EET_T_INT);
-
-   MY_CONF_ADD_BASIC(version, EET_T_UINT);
-   MY_CONF_ADD_BASIC(name, EET_T_STRING);
-   MY_CONF_ADD_BASIC(id, EET_T_INT);
-   MY_CONF_ADD_BASIC(enabled, EET_T_UCHAR);
-
-   // And add the sub descriptor as a linked list at 'subs' in the main struct
-   EET_DATA_DESCRIPTOR_ADD_LIST
-     (_my_conf_descriptor, My_Conf_Type, "subs", subs, _my_conf_sub_descriptor);
-
-#undef MY_CONF_ADD_BASIC
-#undef MY_CONF_SUB_ADD_BASIC
-} /* _my_conf_descriptor_init */
-
-static void
-_my_conf_descriptor_shutdown(void)
-{
-   eet_data_descriptor_free(_my_conf_sub_descriptor);
-   eet_data_descriptor_free(_my_conf_descriptor);
-} /* _my_conf_descriptor_shutdown */
-
-static My_Conf_Type *
-_my_conf_new(void)
-{
-   My_Conf_Type *my_conf = calloc(1, sizeof(My_Conf_Type));
-   My_Conf_Subtype *sub;
-   if (!my_conf)
-     {
-        fprintf(stderr, "ERROR: could not calloc My_Conf_Type\n");
-        return NULL;
-     }
-
-   my_conf->version = 0x112233;
-   my_conf->enabled = EINA_TRUE;
-
-   sub = calloc(1, sizeof(My_Conf_Subtype));
-   if (sub)
-     {
-        sub->server = eina_stringshare_add("my-server.com");
-        sub->port = 1234;
-        my_conf->subs = eina_list_append(my_conf->subs, sub);
-     }
-
-   return my_conf;
-} /* _my_conf_new */
-
-static void
-_my_conf_free(My_Conf_Type *my_conf)
-{
-   My_Conf_Subtype *sub;
-   EINA_LIST_FREE(my_conf->subs, sub)
-     {
-        eina_stringshare_del(sub->server);
-        free(sub);
-     }
-
-   eina_stringshare_del(my_conf->name);
-   free(my_conf);
-} /* _my_conf_free */
-
-static My_Conf_Type *
-_my_conf_load(const char *filename)
-{
-   My_Conf_Type *my_conf;
-   Eet_File *ef = eet_open(filename, EET_FILE_MODE_READ);
-   if (!ef)
-     {
-        fprintf(stderr, "ERROR: could not open '%s' for read\n", filename);
-        return NULL;
-     }
-
-   my_conf = eet_data_read(ef, _my_conf_descriptor, MY_CONF_FILE_ENTRY);
-   if (!my_conf)
-     goto end;
-
-   if (my_conf->version < 0x112233)
-     {
-        fprintf(stderr,
-                "WARNING: version %#x was too old, upgrading it to %#x\n",
-                my_conf->version, 0x112233);
-
-        my_conf->version = 0x112233;
-        my_conf->enabled = EINA_TRUE;
-     }
-
-end:
-   eet_close(ef);
-   return my_conf;
-} /* _my_conf_load */
-
-static Eina_Bool
-_my_conf_save(const My_Conf_Type *my_conf,
-              const char         *filename)
-{
-   char tmp[PATH_MAX];
-   Eet_File *ef;
-   Eina_Bool ret;
-   unsigned int i, len;
-   struct stat st;
-
-   len = eina_strlcpy(tmp, filename, sizeof(tmp));
-   if (len + 12 >= (int)sizeof(tmp))
-     {
-        fprintf(stderr, "ERROR: file name is too big: %s\n", filename);
-        return EINA_FALSE;
-     }
-
-   i = 0;
-   do
-     {
-        snprintf(tmp + len, 12, ".%u", i);
-        i++;
-     }
-   while (stat(tmp, &st) == 0);
-
-   ef = eet_open(tmp, EET_FILE_MODE_WRITE);
-   if (!ef)
-     {
-        fprintf(stderr, "ERROR: could not open '%s' for write\n", tmp);
-        return EINA_FALSE;
-     }
-
-   ret = eet_data_write
-       (ef, _my_conf_descriptor, MY_CONF_FILE_ENTRY, my_conf, EINA_TRUE);
-   eet_close(ef);
-
-   if (ret)
-     {
-        unlink(filename);
-        rename(tmp, filename);
-     }
-
-   return ret;
-} /* _my_conf_save */
-
-int
-main(int   argc,
-     char *argv[])
-{
-   My_Conf_Type *my_conf;
-   const My_Conf_Subtype *sub;
-   const Eina_List *l;
-   int ret = 0;
-
-   if (argc != 3)
-     {
-        fprintf(stderr, "Usage:\n\t%s <input> <output>\n\n", argv[0]);
-        return -1;
-     }
-
-   eina_init();
-   eet_init();
-   _my_conf_descriptor_init();
-
-   my_conf = _my_conf_load(argv[1]);
-   if (!my_conf)
-     {
-        printf("creating new configuration.\n");
-        my_conf = _my_conf_new();
-        if (!my_conf)
-          {
-             ret = -2;
-             goto end;
-          }
-     }
-
-   printf("My_Conf_Type:\n"
-          "\tversion: %#x\n"
-          "\tname...: '%s'\n"
-          "\tid.....: %d\n"
-          "\tenabled: %hhu\n"
-          "\tsubs...:\n",
-          my_conf->version,
-          my_conf->name ? my_conf->name : "",
-          my_conf->id,
-          my_conf->enabled);
-
-   EINA_LIST_FOREACH(my_conf->subs, l, sub)
-     printf("\t\tserver: '%s', port: %d\n",
-            sub->server ? sub->server : "",
-            sub->port);
-
-   if (!_my_conf_save(my_conf, argv[2]))
-     ret = -3;
-
-   _my_conf_free(my_conf);
-
-end:
-   _my_conf_descriptor_shutdown();
-   eet_shutdown();
-   eina_shutdown();
-
-   return ret;
-} /* main */
-
diff --git a/src/examples/eet-data-simple.c b/src/examples/eet-data-simple.c
deleted file mode 100644
index 1951fc0..0000000
--- a/src/examples/eet-data-simple.c
+++ /dev/null
@@ -1,224 +0,0 @@
-/*
- * build: gcc -o eet_data_simple eet-data-simple.c `pkg-config --cflags --libs eet eina`
- */
-#include <Eina.h>
-#include <Eet.h>
-#include <stdio.h>
-#include <limits.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <unistd.h>
-
-// The struct that will be loaded and saved.
-// note that only the members described in the eet_data_descriptor
-// will be automatically handled. The other members will have their
-// space reserved and zeroed (as it uses calloc()), but not
-// saved or loaded from eet files.
-typedef struct
-{
-   unsigned int version; // it is recommended to use versioned configuration!
-   const char  *name;
-   int          id;
-   int          not_saved_value; // example of not saved data inside!
-   Eina_Bool    enabled;
-} My_Conf_Type;
-
-// string that represents the entry in eet file, you might like to have
-// different profiles or so in the same file, this is possible with
-// different strings
-static const char MY_CONF_FILE_ENTRY[] = "config";
-
-// keep the descriptor static global, so it can be
-// shared by different functions (load/save) of this and only this
-// file.
-static Eet_Data_Descriptor *_my_conf_descriptor;
-
-static void
-_my_conf_descriptor_init(void)
-{
-   Eet_Data_Descriptor_Class eddc;
-
-   // The class describe the functions to use to create the type and its
-   // full allocated size.
-   //
-   // Eina types are very convenient, so use them to create the descriptor,
-   // so we get eina_list,  eina_hash and eina_stringshare automatically!
-   //
-   // The STREAM variant is better for configuration files as the values
-   // will likely change a lot.
-   //
-   // The other variant, FILE, is good for caches and things that are just
-   // appended, but needs to take care when changing strings and files must
-   // be kept open so mmap()ed strings will be kept alive.
-   EET_EINA_STREAM_DATA_DESCRIPTOR_CLASS_SET(&eddc, My_Conf_Type);
-   _my_conf_descriptor = eet_data_descriptor_stream_new(&eddc);
-
-   // Describe the members to be saved:
-   // Use a temporary macro so we don't type a lot, also avoid errors:
-#define MY_CONF_ADD_BASIC(member, eet_type) \
-  EET_DATA_DESCRIPTOR_ADD_BASIC             \
-    (_my_conf_descriptor, My_Conf_Type, # member, member, eet_type)
-
-   MY_CONF_ADD_BASIC(version, EET_T_UINT);
-   MY_CONF_ADD_BASIC(name, EET_T_STRING);
-   MY_CONF_ADD_BASIC(id, EET_T_INT);
-   MY_CONF_ADD_BASIC(enabled, EET_T_UCHAR);
-
-#undef MY_CONF_ADD_BASIC
-} /* _my_conf_descriptor_init */
-
-static void
-_my_conf_descriptor_shutdown(void)
-{
-   eet_data_descriptor_free(_my_conf_descriptor);
-} /* _my_conf_descriptor_shutdown */
-
-static My_Conf_Type *
-_my_conf_new(void)
-{
-   My_Conf_Type *my_conf = calloc(1, sizeof(My_Conf_Type));
-   if (!my_conf)
-     {
-        fprintf(stderr, "ERROR: could not calloc My_Conf_Type\n");
-        return NULL;
-     }
-
-   my_conf->version = 0x112233;
-   my_conf->enabled = EINA_TRUE;
-   return my_conf;
-} /* _my_conf_new */
-
-static void
-_my_conf_free(My_Conf_Type *my_conf)
-{
-   eina_stringshare_del(my_conf->name);
-   free(my_conf);
-} /* _my_conf_free */
-
-static My_Conf_Type *
-_my_conf_load(const char *filename)
-{
-   My_Conf_Type *my_conf;
-   Eet_File *ef = eet_open(filename, EET_FILE_MODE_READ);
-   if (!ef)
-     {
-        fprintf(stderr, "ERROR: could not open '%s' for read\n", filename);
-        return NULL;
-     }
-
-   my_conf = eet_data_read(ef, _my_conf_descriptor, MY_CONF_FILE_ENTRY);
-   if (!my_conf)
-     goto end;
-
-   if (my_conf->version < 0x112233)
-     {
-        fprintf(stderr,
-                "WARNING: version %#x was too old, upgrading it to %#x\n",
-                my_conf->version, 0x112233);
-
-        my_conf->version = 0x112233;
-        my_conf->enabled = EINA_TRUE;
-     }
-
-end:
-   eet_close(ef);
-   return my_conf;
-} /* _my_conf_load */
-
-static Eina_Bool
-_my_conf_save(const My_Conf_Type *my_conf,
-              const char         *filename)
-{
-   char tmp[PATH_MAX];
-   Eet_File *ef;
-   Eina_Bool ret;
-   unsigned int i, len;
-   struct stat st;
-
-   len = eina_strlcpy(tmp, filename, sizeof(tmp));
-   if (len + 12 >= (int)sizeof(tmp))
-     {
-        fprintf(stderr, "ERROR: file name is too big: %s\n", filename);
-        return EINA_FALSE;
-     }
-
-   i = 0;
-   do
-     {
-        snprintf(tmp + len, 12, ".%u", i);
-        i++;
-     }
-   while (stat(tmp, &st) == 0);
-
-   ef = eet_open(tmp, EET_FILE_MODE_WRITE);
-   if (!ef)
-     {
-        fprintf(stderr, "ERROR: could not open '%s' for write\n", tmp);
-        return EINA_FALSE;
-     }
-
-   ret = eet_data_write
-       (ef, _my_conf_descriptor, MY_CONF_FILE_ENTRY, my_conf, EINA_TRUE);
-   eet_close(ef);
-
-   if (ret)
-     {
-        unlink(filename);
-        rename(tmp, filename);
-     }
-
-   return ret;
-} /* _my_conf_save */
-
-int
-main(int   argc,
-     char *argv[])
-{
-   My_Conf_Type *my_conf;
-   int ret = 0;
-
-   if (argc != 3)
-     {
-        fprintf(stderr, "Usage:\n\t%s <input> <output>\n\n", argv[0]);
-        return -1;
-     }
-
-   eina_init();
-   eet_init();
-   _my_conf_descriptor_init();
-
-   my_conf = _my_conf_load(argv[1]);
-   if (!my_conf)
-     {
-        printf("creating new configuration.\n");
-        my_conf = _my_conf_new();
-        if (!my_conf)
-          {
-             ret = -2;
-             goto end;
-          }
-     }
-
-   printf("My_Conf_Type:\n"
-          "\tversion: %#x\n"
-          "\tname...: '%s'\n"
-          "\tid.....: %d\n"
-          "\tenabled: %hhu\n",
-          my_conf->version,
-          my_conf->name ? my_conf->name : "",
-          my_conf->id,
-          my_conf->enabled);
-
-   if (!_my_conf_save(my_conf, argv[2]))
-     ret = -3;
-
-   _my_conf_free(my_conf);
-
-end:
-   _my_conf_descriptor_shutdown();
-   eet_shutdown();
-   eina_shutdown();
-
-   return ret;
-} /* main */
-
diff --git a/src/examples/eet-file.c b/src/examples/eet-file.c
deleted file mode 100644
index 740c179..0000000
--- a/src/examples/eet-file.c
+++ /dev/null
@@ -1,127 +0,0 @@
-/*
- * build: gcc -o eet_file eet-file.c `pkg-config --cflags --libs eet`
- */
-#include <Eet.h>
-#include <stdio.h>
-#include <string.h>
-
-static int
-create_eet_file(void)
-{
-   Eet_File *ef;
-   char buf[1024], *ptr;
-   int size, len, i;
-   const char *some_strings[] = {
-      "And some more strings",
-      "spread across several",
-      "elements of an array!"
-   };
-   const char some_data[] =
-     "\x1e\xe7\x0f\x42\x00\x00\x00\x01\x00\x00\x00\x00\x00\x00\x00\x35"
-     "\x00\x00\x00\xa0\x00\x00\x00\xa0\x00\x00\x00\x24\x00\x00\x00\x11"
-     "\x00\x00\x00\x00\x2f\x6d\x69\x73\x74\x65\x72\x69\x6f\x75\x73\x2f"
-     "\x64\x61\x74\x61\x00\x41\x6e\x20\x45\x45\x54\x20\x69\x6e\x73\x69"
-     "\x64\x65\x20\x6f\x66\x20\x61\x6e\x20\x45\x45\x54\x21\x0a\x54\x68"
-     "\x69\x73\x20\x77\x61\x73\x6e\x27\x74\x20\x72\x65\x61\x6c\x6c\x79"
-     "\x20\x75\x73\x65\x66\x75\x6c\x20\x62\x75\x74\x20\x69\x74\x20\x68"
-     "\x65\x6c\x70\x65\x64\x20\x74\x6f\x20\x73\x68\x6f\x77\x20\x68\x6f"
-     "\x77\x0a\x74\x6f\x20\x75\x73\x65\x20\x65\x65\x74\x5f\x6d\x65\x6d"
-     "\x6f\x70\x65\x6e\x5f\x72\x65\x61\x64\x28\x29\x20\x74\x6f\x20\x6f"
-     "\x70\x65\x6e\x20\x61\x6e\x20\x65\x65\x74\x20\x66\x69\x6c\x65\x20"
-     "\x66\x72\x6f\x6d\x0a\x64\x61\x74\x61\x20\x61\x6c\x72\x65\x61\x64"
-     "\x79\x20\x6c\x6f\x61\x64\x65\x64\x20\x69\x6e\x20\x6d\x65\x6d\x6f"
-     "\x72\x79\x2e\x0a\x00";
-
-   ef = eet_open("/tmp/my_file.eet", EET_FILE_MODE_WRITE);
-   if (!ef) return 0;
-
-   strcpy(buf, "Here is a string of data to save!");
-   size = eet_write(ef, "/key/to_store/at", buf, sizeof(buf), 1);
-   if (!size)
-     {
-        fprintf(stderr, "Error writing data!\n");
-        eet_close(ef);
-        return 0;
-     }
-   len = strlen(buf);
-   printf("strlen() = %d, eet_write() = %d\n", len, size);
-
-   ptr = buf;
-   for (i = 0; i < 3; i++)
-     {
-        len = strlen(some_strings[i]) + 1;
-        memcpy(ptr, some_strings[i], len);
-        ptr += len;
-     }
-   eet_write(ef, "/several/strings", buf, sizeof(buf), 1);
-   eet_sync(ef);
-
-   eet_write(ef, "/some/mysterious/data", some_data, sizeof(some_data) - 1, 1);
-
-   eet_delete(ef, "/several/strings");
-
-   return eet_close(ef) == EET_ERROR_NONE;
-}
-
-int
-main(void)
-{
-   Eet_File *ef;
-   char *ret, **list;
-   int size, num, i;
-
-   eet_init();
-
-   if (!create_eet_file())
-     return -1;
-
-   ef = eet_open("/tmp/my_file.eet", EET_FILE_MODE_READ);
-   if (!ef) return -1;
-
-   list = eet_list(ef, "*", &num);
-   if (list)
-     {
-        for (i = 0; i < num; i++)
-          printf("Key stored: %s\n", list[i]);
-        free(list);
-     }
-
-   ret = eet_read(ef, "/key/to_store/at", &size);
-   if (ret)
-     {
-        printf("Data read (%i bytes):\n%s\n", size, ret);
-        free(ret);
-     }
-
-   ret = eet_read(ef, "/several/strings", &size);
-   if (ret)
-     {
-        printf("More data read (%i bytes):\n%s\n", size, ret);
-        free(ret);
-     }
-
-   ret = eet_read(ef, "/some/mysterious/data", &size);
-   if (ret)
-     {
-        Eet_File *ef2;
-
-        ef2 = eet_memopen_read(ret, size);
-
-        num = eet_num_entries(ef2);
-        printf("Mysterious data has %d entries\n", num);
-
-        printf("Mysterious data:\n%s\n",
-               (char *)eet_read_direct(ef2, "/mysterious/data", NULL));
-
-        eet_close(ef2);
-
-        free(ret);
-     }
-
-   eet_close(ef);
-
-   eet_shutdown();
-
-   return 0;
-}
-