Remove Ecore_Data

SVN revision: 45599
This commit is contained in:
Sebastian Dransfeld 2010-01-26 20:42:49 +00:00
parent c92d5e37f9
commit 07733bd0a1
1 changed files with 5 additions and 17 deletions

View File

@ -10,7 +10,6 @@
#include <getopt.h> #include <getopt.h>
#include <Eet.h> #include <Eet.h>
#include "Ecore_Config.h" #include "Ecore_Config.h"
#include "Ecore_Data.h"
#include "ecore_config_private.h" #include "ecore_config_private.h"
// strcmp for paths - for sorting folders before files // strcmp for paths - for sorting folders before files
@ -106,19 +105,9 @@ get(const char *key)
static int static int
list(const char *file) list(const char *file)
{ {
char *key;
Eet_File *ef;
Ecore_Config_Prop *e; Ecore_Config_Prop *e;
Ecore_Sheap *keys; Eina_List *keys = NULL;
char *key;
// Get number of keys and create heap for sort
ef = eet_open(file, EET_FILE_MODE_READ);
if (!ef) return -1;
keys = ecore_sheap_new(ECORE_COMPARE_CB(pathcmp), eet_num_entries(ef));
eet_close(ef);
e = __ecore_config_bundle_local->data; e = __ecore_config_bundle_local->data;
@ -126,18 +115,17 @@ list(const char *file)
{ {
// don't show system settings // don't show system settings
if( !(e->flags & ECORE_CONFIG_FLAG_SYSTEM) ) if( !(e->flags & ECORE_CONFIG_FLAG_SYSTEM) )
ecore_sheap_insert(keys, e->key); keys = eina_list_append(keys, e->key);
} }
while((e = e->next)); while((e = e->next));
keys = eina_list_sort(keys, -1, EINA_COMPARE_CB(pathcmp));
while((key = ecore_sheap_extract(keys))) EINA_LIST_FREE(keys, key)
{ {
printf("%-28s\t", key); printf("%-28s\t", key);
get(key); get(key);
} }
ecore_sheap_destroy(keys);
return 0; return 0;
} }