Enlightenment CVS committal
Author : raster
Project : e17
Module : test
Dir : e17/test/orig/eet
Modified Files:
Makefile eet_main.c
Log Message:
i appreciate the weffort but - this is kind of bad. evas depends on eet, but
now the test program for eet depends on evas - whcih depends on eet... not
very nice. :(
===================================================================
RCS file: /cvs/e/e17/test/orig/eet/Makefile,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- Makefile 10 Jan 2007 12:26:06 -0000 1.3
+++ Makefile 10 Jan 2007 16:36:10 -0000 1.4
@@ -1,5 +1,5 @@
-CFLAGS = -g -Wall `eet-config --cflags` `evas-config --cflags`
-LIBS = `eet-config --libs` `evas-config --libs`
+FLAGS = `eet-config --cflags`
+LIBS = `eet-config --libs`
BINS = eet eet_bench
all: $(BINS)
===================================================================
RCS file: /cvs/e/e17/test/orig/eet/eet_main.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- eet_main.c 10 Jan 2007 12:26:06 -0000 1.2
+++ eet_main.c 10 Jan 2007 16:36:10 -0000 1.3
@@ -15,8 +15,15 @@
#endif
/* just some sample code on how to use encoder/decoders */
+#if 0
#include <Evas.h>
+typedef struct _blah2
+{
+ char *string;
+}
+Blah2;
+
typedef struct _blah3
{
char *string;
@@ -25,25 +32,25 @@
typedef struct _blah
{
- char c;
- char d;
- Evas_Hash *blah3;
+ char character;
+ short sixteen;
+ int integer;
+ long long lots;
+ float floating;
+ double floating_lots;
+ char *string;
+ Blah2 *blah2;
+ Evas_List *blah3;
}
Blah;
-Evas_Bool
-_hash_print(Evas_Hash *hash, const char *key, void *data, void *fdata)
-{
- printf("%s %s\n", key, ((Blah3 *)data)->string);
- return 1;
-}
-
void
encdectest(void)
{
Blah blah;
- Blah3 blah3, blahh;
- Eet_Data_Descriptor *edd, *edd3;
+ Blah2 blah2;
+ Blah3 blah3;
+ Eet_Data_Descriptor *edd, *edd2, *edd3;
void *data;
int size;
FILE *f;
@@ -59,6 +66,16 @@
evas_hash_free);
EET_DATA_DESCRIPTOR_ADD_BASIC(edd3, Blah3, "string3", string, EET_T_STRING);
+ edd2 = eet_data_descriptor_new("blah2", sizeof(Blah2),
+ evas_list_next,
+ evas_list_append,
+ evas_list_data,
+ evas_list_free,
+ evas_hash_foreach,
+ evas_hash_add,
+ evas_hash_free);
+ EET_DATA_DESCRIPTOR_ADD_BASIC(edd2, Blah2, "string2", string, EET_T_STRING);
+
edd = eet_data_descriptor_new("blah", sizeof(Blah),
evas_list_next,
evas_list_append,
@@ -67,22 +84,35 @@
evas_hash_foreach,
evas_hash_add,
evas_hash_free);
- EET_DATA_DESCRIPTOR_ADD_BASIC(edd, Blah, "c", c, EET_T_CHAR);
- EET_DATA_DESCRIPTOR_ADD_HASH (edd, Blah, "blah3", blah3, edd3);
- EET_DATA_DESCRIPTOR_ADD_BASIC(edd, Blah, "b", d, EET_T_CHAR);
+ EET_DATA_DESCRIPTOR_ADD_BASIC(edd, Blah, "character", character,
EET_T_CHAR);
+ EET_DATA_DESCRIPTOR_ADD_BASIC(edd, Blah, "sixteen", sixteen, EET_T_SHORT);
+ EET_DATA_DESCRIPTOR_ADD_BASIC(edd, Blah, "integer", integer, EET_T_INT);
+ EET_DATA_DESCRIPTOR_ADD_BASIC(edd, Blah, "lots", lots, EET_T_LONG_LONG);
+ EET_DATA_DESCRIPTOR_ADD_BASIC(edd, Blah, "floating", floating, EET_T_FLOAT);
+ EET_DATA_DESCRIPTOR_ADD_BASIC(edd, Blah, "floating_lots", floating_lots,
EET_T_DOUBLE);
+ EET_DATA_DESCRIPTOR_ADD_BASIC(edd, Blah, "string", string, EET_T_STRING);
+ EET_DATA_DESCRIPTOR_ADD_SUB (edd, Blah, "blah2", blah2, edd2);
+ EET_DATA_DESCRIPTOR_ADD_LIST (edd, Blah, "blah3", blah3, edd3);
blah3.string="PANTS";
- blahh.string="OFF";
- blah.c='c';
- blah.d='d';
- blah.blah3 = evas_hash_add(NULL, "1", &blah3);
- blah.blah3 = evas_hash_add(blah.blah3, "2", &blahh);
- blah.blah3 = evas_hash_add(blah.blah3, "3", &blah3);
- blah.blah3 = evas_hash_add(blah.blah3, "4", &blahh);
- blah.blah3 = evas_hash_add(blah.blah3, "5", &blah3);
- blah.blah3 = evas_hash_add(blah.blah3, "6", &blahh);
- blah.blah3 = evas_hash_add(blah.blah3, "7", &blah3);
+ blah2.string="subtype string here!";
+
+ blah.character='7';
+ blah.sixteen=0x7777;
+ blah.integer=0xc0def00d;
+ blah.lots=0xdeadbeef31337777;
+ blah.floating=3.141592654;
+ blah.floating_lots=0.777777777777777;
+ blah.string="bite me like a turnip";
+ blah.blah2 = &blah2;
+ blah.blah3 = evas_list_append(NULL, &blah3);
+ blah.blah3 = evas_list_append(blah.blah3, &blah3);
+ blah.blah3 = evas_list_append(blah.blah3, &blah3);
+ blah.blah3 = evas_list_append(blah.blah3, &blah3);
+ blah.blah3 = evas_list_append(blah.blah3, &blah3);
+ blah.blah3 = evas_list_append(blah.blah3, &blah3);
+ blah.blah3 = evas_list_append(blah.blah3, &blah3);
data = eet_data_descriptor_encode(edd, &blah, &size);
f = fopen("out", "wb");
@@ -94,10 +124,15 @@
printf("-----DECODING\n");
blah_in = eet_data_descriptor_decode(edd, data, size);
printf("-----DECODED!\n");
- printf("%c\n", blah_in->c);
- printf("%c\n", blah_in->d);
- evas_hash_foreach(blah_in->blah3, _hash_print, NULL);
-#if 0
+ printf("%c\n", blah_in->character);
+ printf("%x\n", (int)blah_in->sixteen);
+ printf("%x\n", blah_in->integer);
+ printf("%lx\n", blah_in->lots);
+ printf("%f\n", (double)blah_in->floating);
+ printf("%f\n", (double)blah_in->floating_lots);
+ printf("%s\n", blah_in->string);
+ printf("%p\n", blah_in->blah2);
+ printf(" %s\n", blah_in->blah2->string);
{
Evas_List *l;
@@ -110,12 +145,13 @@
printf(" %s\n", blah3_in->string);
}
}
-#endif
eet_data_descriptor_free(edd);
+ eet_data_descriptor_free(edd2);
eet_data_descriptor_free(edd3);
exit(0);
}
+#endif
int eet_mkdir(char *dir);
void eet_mkdirs(char *s);
@@ -348,7 +384,6 @@
int
main(int argc, char **argv)
{
-#if 0
if (argc == 3)
{
if (!strcmp(argv[1], "-d"))
@@ -408,7 +443,4 @@
argv[0], argv[0], argv[0],
argv[0], argv[0], argv[0]);
return -1;
-#endif
- encdectest();
- return 1;
}
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys - and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
