Home / Browse / Enlightenment / Mail / Archive

Donate

Enlightenment

Email Archive: enlightenment-cvs (read-only)

E CVS: libs/eet englebass

From: Enlightenment CVS <noreply@cv...> - 2008-01-27 12:56

Enlightenment CVS committal

Author  : englebass
Project : e17
Module  : libs/eet

Dir     : e17/libs/eet/src/lib


Modified Files:
	eet_image.c eet_lib.c 


Log Message:
formatting

===================================================================
RCS file: /cvs/e/e17/libs/eet/src/lib/eet_image.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -3 -r1.12 -r1.13
--- eet_image.c	27 Jan 2008 12:55:29 -0000	1.12
+++ eet_image.c	27 Jan 2008 12:56:44 -0000	1.13
@@ -733,7 +733,7 @@
    unsigned int *d = NULL;
    int		free_data = 0;
 
-   data = (void *)eet_read_direct (ef, name, &size);
+   data = (void *)eet_read_direct(ef, name, &size);
    if (!data)
      {
 	data = eet_read(ef, name, &size);
@@ -759,7 +759,7 @@
    int	d;
    int	free_data = 0;
 
-   data = (void *)eet_read_direct (ef, name, &size);
+   data = (void *)eet_read_direct(ef, name, &size);
    if (!data)
      {
 	data = eet_read(ef, name, &size);
===================================================================
RCS file: /cvs/e/e17/libs/eet/src/lib/eet_lib.c,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -3 -r1.86 -r1.87
--- eet_lib.c	26 Jan 2008 05:50:09 -0000	1.86
+++ eet_lib.c	27 Jan 2008 12:56:44 -0000	1.87
@@ -456,7 +456,7 @@
 }
 
 static Eet_File*
-eet_internal_read (Eet_File *ef)
+eet_internal_read(Eet_File *ef)
 {
    const unsigned char	*dyn_buf = NULL;
    const unsigned char	*p = NULL;

Thread View

Thread	Author	Date
E CVS: libs/eet englebass	Enlightenment CVS <noreply@cv...>

E CVS: libs/eet englebass

From: Enlightenment CVS <noreply@cv...> - 2006-12-16 22:32

Enlightenment CVS committal

Author  : englebass
Project : e17
Module  : libs/eet

Dir     : e17/libs/eet/src/lib


Modified Files:
	eet_data.c 


Log Message:
Move common error code to the end of the function.

===================================================================
RCS file: /cvs/e/e17/libs/eet/src/lib/eet_data.c,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -3 -r1.40 -r1.41
--- eet_data.c	15 Dec 2006 20:16:29 -0000	1.40
+++ eet_data.c	16 Dec 2006 22:27:18 -0000	1.41
@@ -1041,27 +1041,8 @@
    _eet_freelist_add(data);
    memset(&chnk, 0, sizeof(Eet_Data_Chunk));
    eet_data_chunk_get(&chnk, data_in, size_in);
-   if (!chnk.name)
-     {
-	_eet_freelist_unref();
-	_eet_freelist_str_unref();
-	_eet_freelist_list_unref();
-	_eet_freelist_free(edd);
-	_eet_freelist_str_free(edd);
-	_eet_freelist_list_free(edd);
-	return NULL;
-     }
-   if (strcmp(chnk.name, edd->name))
-     {
-	free(chnk.name);
-	_eet_freelist_unref();
-	_eet_freelist_str_unref();
-	_eet_freelist_list_unref();
-	_eet_freelist_free(edd);
-	_eet_freelist_str_free(edd);
-	_eet_freelist_list_free(edd);
-	return NULL;
-     }
+   if (!chnk.name) goto error;
+   if (strcmp(chnk.name, edd->name)) goto error;
    p = chnk.data;
    size = size_in - (4 + 4 + strlen(chnk.name) + 1);
    if (!edd->elements.hash.buckets) _eet_descriptor_hash_new(edd);
@@ -1073,17 +1054,7 @@
 	/* get next data chunk */
 	memset(&echnk, 0, sizeof(Eet_Data_Chunk));
 	eet_data_chunk_get(&echnk, p, size);
-	if (!echnk.name)
-	  {
-	     _eet_freelist_unref();
-	     _eet_freelist_str_unref();
-	     _eet_freelist_list_unref();
-	     _eet_freelist_free(edd);
-	     _eet_freelist_str_free(edd);
-	     _eet_freelist_list_free(edd);
-	     free(chnk.name);
-	     return NULL;
-	  }
+	if (!echnk.name) goto error;
 	ede = _eet_descriptor_hash_find(edd, echnk.name);
 	if (ede)
 	  {
@@ -1120,17 +1091,7 @@
 		       data_ret = eet_data_descriptor_decode(ede->subtype,
 							     echnk.data,
 							     echnk.size);
-		       if (!data_ret)
-			 {
-			    _eet_freelist_unref();
-			    _eet_freelist_str_unref();
-			    _eet_freelist_list_unref();
-			    _eet_freelist_free(edd);
-			    _eet_freelist_str_free(edd);
-			    _eet_freelist_list_free(edd);
-			    free(chnk.name);
-			    return NULL;
-			 }
+		       if (!data_ret) goto error;
 		       ptr = (void **)(((char *)data) + ede->offset);
 		       *ptr = (void *)data_ret;
 		    }
@@ -1166,29 +1127,10 @@
 							      echnk.data,
 							      ((char *)echnk.data) + echnk.size,
 							      data_ret);
-				      if (ret <= 0)
-					{
-					   _eet_freelist_unref();
-					   _eet_freelist_str_unref();
-					   _eet_freelist_list_unref();
-					   _eet_freelist_free(edd);
-					   _eet_freelist_str_free(edd);
-					   _eet_freelist_list_free(edd);
-					   free(chnk.name);
-					   return NULL;
-					}
+				      if (ret <= 0) goto error;
 				   }
 				 else
-				   {
-				      _eet_freelist_unref();
-				      _eet_freelist_str_unref();
-				      _eet_freelist_list_unref();
-				      _eet_freelist_free(edd);
-				      _eet_freelist_str_free(edd);
-				      _eet_freelist_list_free(edd);
-				      free(chnk.name);
-				      return NULL;
-				   }
+				   goto error;
 			      }
 			    else if (ede->subtype)
 			      {
@@ -1203,16 +1145,7 @@
 				 _eet_freelist_list_add(ptr);
 			      }
 			    else
-			      {
-				 _eet_freelist_unref();
-				 _eet_freelist_str_unref();
-				 _eet_freelist_list_unref();
-				 _eet_freelist_free(edd);
-				 _eet_freelist_str_free(edd);
-				 _eet_freelist_list_free(edd);
-				 free(chnk.name);
-				 return NULL;
-			      }
+			      goto error;
 			 }
 		       break;
 		     case EET_G_HASH:
@@ -1236,6 +1169,16 @@
    _eet_freelist_str_reset();
    _eet_freelist_list_reset();
    return data;
+
+error:
+   if (chnk.name) free(chnk.name);
+   _eet_freelist_unref();
+   _eet_freelist_str_unref();
+   _eet_freelist_list_unref();
+   _eet_freelist_free(edd);
+   _eet_freelist_str_free(edd);
+   _eet_freelist_list_free(edd);
+   return NULL;
 }
 
 EAPI void *

E CVS: libs/eet englebass

From: Enlightenment CVS <noreply@cv...> - 2006-12-17 10:58

Enlightenment CVS committal

Author  : englebass
Project : e17
Module  : libs/eet

Dir     : e17/libs/eet/src/lib


Modified Files:
	eet_data.c 


Log Message:
When put'ing data we should not modify the source, so add const modifier.
This is a preparation for storing hashes, which uses const on the key.

===================================================================
RCS file: /cvs/e/e17/libs/eet/src/lib/eet_data.c,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -3 -r1.41 -r1.42
--- eet_data.c	16 Dec 2006 22:27:18 -0000	1.41
+++ eet_data.c	17 Dec 2006 10:58:35 -0000	1.42
@@ -53,7 +53,7 @@
 {
    int     size;
    int   (*get) (void *src, void *src_end, void *dest);
-   void *(*put) (void *src, int *size_ret);
+   void *(*put) (const void *src, int *size_ret);
 };
 
 struct _Eet_Data_Chunk
@@ -119,19 +119,19 @@
 /*---*/
 
 static int   eet_data_get_char(void *src, void *src_end, void *dest);
-static void *eet_data_put_char(void *src, int *size_ret);
+static void *eet_data_put_char(const void *src, int *size_ret);
 static int   eet_data_get_short(void *src, void *src_end, void *dest);
-static void *eet_data_put_short(void *src, int *size_ret);
+static void *eet_data_put_short(const void *src, int *size_ret);
 static int   eet_data_get_int(void *src, void *src_end, void *dest);
-static void *eet_data_put_int(void *src, int *size_ret);
+static void *eet_data_put_int(const void *src, int *size_ret);
 static int   eet_data_get_long_long(void *src, void *src_end, void *dest);
-static void *eet_data_put_long_long(void *src, int *size_ret);
+static void *eet_data_put_long_long(const void *src, int *size_ret);
 static int   eet_data_get_float(void *src, void *src_end, void *dest);
-static void *eet_data_put_float(void *src, int *size_ret);
+static void *eet_data_put_float(const void *src, int *size_ret);
 static int   eet_data_get_double(void *src, void *src_end, void *dest);
-static void *eet_data_put_double(void *src, int *size_ret);
+static void *eet_data_put_double(const void *src, int *size_ret);
 static int   eet_data_get_string(void *src, void *src_end, void *dest);
-static void *eet_data_put_string(void *src, int *size_ret);
+static void *eet_data_put_string(const void *src, int *size_ret);
 
 static int   eet_data_get_type(int type, void *src, void *src_end, void *dest);
 static void *eet_data_put_type(int type, void *src, int *size_ret);
@@ -207,7 +207,7 @@
 }
 
 static void *
-eet_data_put_char(void *src, int *size_ret)
+eet_data_put_char(const void *src, int *size_ret)
 {
    char *s, *d;
 
@@ -234,7 +234,7 @@
 }
 
 static void *
-eet_data_put_short(void *src, int *size_ret)
+eet_data_put_short(const void *src, int *size_ret)
 {
    short *s, *d;
 
@@ -261,7 +261,7 @@
 }
 
 static void *
-eet_data_put_int(void *src, int *size_ret)
+eet_data_put_int(const void *src, int *size_ret)
 {
    int *s, *d;
 
@@ -288,7 +288,7 @@
 }
 
 static void *
-eet_data_put_long_long(void *src, int *size_ret)
+eet_data_put_long_long(const void *src, int *size_ret)
 {
    unsigned long long *s, *d;
 
@@ -326,7 +326,7 @@
 }
 
 static void *
-eet_data_put_string(void *src, int *size_ret)
+eet_data_put_string(const void *src, int *size_ret)
 {
    char *s, *d;
    int len;
@@ -372,7 +372,7 @@
 }
 
 static void *
-eet_data_put_float(void *src, int *size_ret)
+eet_data_put_float(const void *src, int *size_ret)
 {
    float *s;
    char *d, buf[64], *prev_locale;
@@ -419,7 +419,7 @@
 }
 
 static void *
-eet_data_put_double(void *src, int *size_ret)
+eet_data_put_double(const void *src, int *size_ret)
 {
    double *s;
    char *d, buf[128], *prev_locale;

E CVS: libs/eet englebass

From: Enlightenment CVS <noreply@cv...> - 2006-12-17 11:00

Enlightenment CVS committal

Author  : englebass
Project : e17
Module  : libs/eet

Dir     : e17/libs/eet/src/lib


Modified Files:
	Eet.h eet_data.c 


Log Message:
Store hashes. Please review.

===================================================================
RCS file: /cvs/e/e17/libs/eet/src/lib/Eet.h,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -3 -r1.36 -r1.37
--- Eet.h	5 Nov 2006 12:14:08 -0000	1.36
+++ Eet.h	17 Dec 2006 11:00:45 -0000	1.37
@@ -903,6 +903,29 @@
 					0, NULL, subtype); \
      }
 
+   /**
+    * Add a hash type to a data descriptor
+    * @param edd The data descriptor to add the type to.
+    * @param struct_type The type of the struct.
+    * @param name The string name to use to encode/decode this member (must be a constant global and never change).
+    * @param member The struct member itself to be encoded.
+    * @param subtype The type of hash member to add.
+    *
+    * This macro lets you easily add a hash of other data types. All the
+    * parameters are the same as for EET_DATA_DESCRIPTOR_ADD_BASIC(), with the
+    * @p subtype being the exception. This must be the data descriptor of the
+    * element that is in each member of the hash to be stored.
+    *
+    */
+#define EET_DATA_DESCRIPTOR_ADD_HASH(edd, struct_type, name, member, subtype) \
+     { \
+	struct_type ___ett; \
+	\
+	eet_data_descriptor_element_add(edd, name, EET_T_UNKNOW, EET_G_HASH, \
+					(char *)(&(___ett.member)) - (char *)(&(___ett)), \
+					0, NULL, subtype); \
+     }
+
 /***************************************************************************/
 #ifdef __cplusplus
 }
===================================================================
RCS file: /cvs/e/e17/libs/eet/src/lib/eet_data.c,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -3 -r1.42 -r1.43
--- eet_data.c	17 Dec 2006 10:58:35 -0000	1.42
+++ eet_data.c	17 Dec 2006 11:00:45 -0000	1.43
@@ -46,6 +46,7 @@
 typedef struct _Eet_Data_Chunk              Eet_Data_Chunk;
 typedef struct _Eet_Data_Stream             Eet_Data_Stream;
 typedef struct _Eet_Data_Descriptor_Hash    Eet_Data_Descriptor_Hash;
+typedef struct _Eet_Data_Encode_Hash_Info   Eet_Data_Encode_Hash_Info;
 
 /*---*/
 
@@ -116,6 +117,12 @@
    Eet_Data_Descriptor *subtype;
 };
 
+struct _Eet_Data_Encode_Hash_Info
+{
+   Eet_Data_Stream  *ds;
+   Eet_Data_Element *ede;
+};
+
 /*---*/
 
 static int   eet_data_get_char(void *src, void *src_end, void *dest);
@@ -134,7 +141,7 @@
 static void *eet_data_put_string(const void *src, int *size_ret);
 
 static int   eet_data_get_type(int type, void *src, void *src_end, void *dest);
-static void *eet_data_put_type(int type, void *src, int *size_ret);
+static void *eet_data_put_type(int type, const void *src, int *size_ret);
 
 static void            eet_data_chunk_get(Eet_Data_Chunk *chnk, const void *src, int size);
 static Eet_Data_Chunk *eet_data_chunk_new(void *data, int size, const char *name);
@@ -146,6 +153,8 @@
 
 static void             eet_data_chunk_put(Eet_Data_Chunk *chnk, Eet_Data_Stream *ds);
 
+static int  eet_data_descriptor_encode_hash_cb(void *hash, const char *key, void *hdata, void *fdata);
+
 /*---*/
 
 const Eet_Data_Basic_Type_Decoder eet_coder[] =
@@ -447,7 +456,7 @@
 }
 
 static void *
-eet_data_put_type(int type, void *src, int *size_ret)
+eet_data_put_type(int type, const void *src, int *size_ret)
 {
    void *ret;
 
@@ -830,7 +839,7 @@
    int	size;
    int	required_free = 0;
 
-   data = eet_read_direct (ef, name, &size);
+   data = eet_read_direct(ef, name, &size);
    if (!data)
      {
 	required_free = 1;
@@ -1014,6 +1023,54 @@
    freelist_str_ref--;
 }
 
+static int
+eet_data_descriptor_encode_hash_cb(void *hash, const char *key, void *hdata, void *fdata)
+{
+   Eet_Data_Encode_Hash_Info *edehi;
+   Eet_Data_Stream    *ds;
+   Eet_Data_Element   *ede;
+   Eet_Data_Chunk     *echnk;
+   void               *data = NULL;
+   int                 size;
+
+   edehi = fdata;
+   ede = edehi->ede;
+   ds = edehi->ds;
+
+   /* Store key */
+   data = eet_data_put_type(EET_T_STRING,
+			    &key,
+			    &size);
+   if (data)
+     {
+	echnk = eet_data_chunk_new(data, size, ede->name);
+	eet_data_chunk_put(echnk, ds);
+	eet_data_chunk_free(echnk);
+	free(data);
+	data = NULL;
+     }
+
+   /* Store data */
+   if ((ede->type >= EET_T_CHAR) &&
+       (ede->type <= EET_T_STRING))
+     data = eet_data_put_type(ede->type,
+			      hdata,
+			      &size);
+   else if (ede->subtype)
+     data = eet_data_descriptor_encode(ede->subtype,
+				       hdata,
+				       &size);
+   if (data)
+     {
+	echnk = eet_data_chunk_new(data, size, ede->name);
+	eet_data_chunk_put(echnk, ds);
+	eet_data_chunk_free(echnk);
+	free(data);
+	data = NULL;
+     }
+   return 1;
+}
+
 EAPI void *
 eet_data_descriptor_decode(Eet_Data_Descriptor *edd,
 			   const void *data_in,
@@ -1149,7 +1206,70 @@
 			 }
 		       break;
 		     case EET_G_HASH:
-		       printf("HASH TYPE NOT IMPLIMENTED YET!!!\n");
+			 {
+			    int ret;
+			    void *hash = NULL;
+			    void **ptr;
+			    char *key = NULL;
+			    void *data_ret = NULL;
+			    
+			    ptr = (void **)(((char *)data) + ede->offset);
+			    hash = *ptr;
+
+			    /* Read key */
+			    key = calloc(1, eet_coder[EET_T_STRING].size);
+			    if (key)
+			      {
+				 _eet_freelist_add(key);
+				 ret = eet_data_get_type(EET_T_STRING,
+							 echnk.data,
+							 ((char *)echnk.data) + echnk.size,
+							 &key);
+				 if (ret <= 0) goto error;
+			      }
+			    else
+			      goto error;
+
+			    /* Advance to next chunk */
+			    p += (4 + 4 + strlen(echnk.name) + 1 + echnk.size);
+			    size -= (4 + 4 + strlen(echnk.name) + 1 + echnk.size);
+			    free(echnk.name);
+			    memset(&echnk, 0, sizeof(Eet_Data_Chunk));
+
+			    /* Read value */
+			    eet_data_chunk_get(&echnk, p, size);
+			    if (!echnk.name) goto error;
+			    if ((ede->type >= EET_T_CHAR) &&
+				(ede->type <= EET_T_STRING))
+			      {
+				 data_ret = calloc(1, eet_coder[ede->type].size);
+				 if (data_ret)
+				   {
+				      _eet_freelist_add(data_ret);
+				      ret = eet_data_get_type(ede->type,
+							      echnk.data,
+							      ((char *)echnk.data) + echnk.size,
+							      data_ret);
+				      if (ret <= 0) goto error;
+				   }
+				 else
+				   goto error;
+			      }
+			    else if (ede->subtype)
+			      {
+				 data_ret = eet_data_descriptor_decode(ede->subtype,
+								       echnk.data,
+								       echnk.size);
+			      }
+			    if (data_ret)
+			      {
+				 hash = edd->func.hash_add(hash, key, data_ret);
+				 *ptr = hash;
+				 _eet_freelist_list_add(ptr);
+			      }
+			    else
+			      goto error;
+			 }
 		       break;
 		     default:
 		       break;
@@ -1273,7 +1393,13 @@
 		  break;
 		case EET_G_HASH:
 		    {
-		       printf("HASH TYPE NOT IMPLIMENTED YET!!!\n");
+		       Eet_Data_Encode_Hash_Info fdata;
+		       void *l;
+
+		       l = *((void **)(((char *)data_in) + ede->offset));
+		       fdata.ds = ds;
+		       fdata.ede = ede;
+		       edd->func.hash_foreach(l, eet_data_descriptor_encode_hash_cb, &fdata);
 		    }
 		  break;
 		default:

E CVS: libs/eet englebass

From: Enlightenment CVS <noreply@cv...> - 2006-12-17 11:07

Enlightenment CVS committal

Author  : englebass
Project : e17
Module  : libs/eet

Dir     : e17/libs/eet/src/lib


Modified Files:
	eet_data.c 


Log Message:
Fix memleak.

===================================================================
RCS file: /cvs/e/e17/libs/eet/src/lib/eet_data.c,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -3 -r1.43 -r1.44
--- eet_data.c	17 Dec 2006 11:00:45 -0000	1.43
+++ eet_data.c	17 Dec 2006 11:07:23 -0000	1.44
@@ -1217,18 +1217,11 @@
 			    hash = *ptr;
 
 			    /* Read key */
-			    key = calloc(1, eet_coder[EET_T_STRING].size);
-			    if (key)
-			      {
-				 _eet_freelist_add(key);
-				 ret = eet_data_get_type(EET_T_STRING,
-							 echnk.data,
-							 ((char *)echnk.data) + echnk.size,
-							 &key);
-				 if (ret <= 0) goto error;
-			      }
-			    else
-			      goto error;
+			    ret = eet_data_get_type(EET_T_STRING,
+						    echnk.data,
+						    ((char *)echnk.data) + echnk.size,
+						    &key);
+			    if (ret <= 0) goto error;
 
 			    /* Advance to next chunk */
 			    p += (4 + 4 + strlen(echnk.name) + 1 + echnk.size);

E CVS: libs/eet englebass

From: Enlightenment CVS <noreply@cv...> - 2006-12-17 11:20

Enlightenment CVS committal

Author  : englebass
Project : e17
Module  : libs/eet

Dir     : e17/libs/eet/src/lib


Modified Files:
	eet_data.c 


Log Message:
Fix memleak.

===================================================================
RCS file: /cvs/e/e17/libs/eet/src/lib/eet_data.c,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -3 -r1.44 -r1.45
--- eet_data.c	17 Dec 2006 11:07:23 -0000	1.44
+++ eet_data.c	17 Dec 2006 11:20:25 -0000	1.45
@@ -1258,6 +1258,7 @@
 			      {
 				 hash = edd->func.hash_add(hash, key, data_ret);
 				 *ptr = hash;
+				 free(key);
 				 _eet_freelist_list_add(ptr);
 			      }
 			    else

E CVS: libs/eet englebass

From: Enlightenment CVS <noreply@cv...> - 2006-12-28 15:23

Enlightenment CVS committal

Author  : englebass
Project : e17
Module  : libs/eet

Dir     : e17/libs/eet/src/lib


Modified Files:
	Eet_private.h Makefile.am eet_data.c eet_lib.c 
Added Files:
	eet_utils.c 


Log Message:
Move hash gen func to own file.

===================================================================
RCS file: /cvs/e/e17/libs/eet/src/lib/Eet_private.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -3 -r1.13 -r1.14
--- Eet_private.h	5 Nov 2006 12:14:08 -0000	1.13
+++ Eet_private.h	28 Dec 2006 15:23:47 -0000	1.14
@@ -41,45 +41,10 @@
 FILE *_eet_memfile_write_open(void **data, size_t *size);
 void  _eet_memfile_write_close(FILE *f);
 void  _eet_memfile_shutdown(void);
+int   _eet_hash_gen(const char *key, int hash_size);
 
 #ifndef PATH_MAX
 #define PATH_MAX 4096
 #endif
-
-/* caluclate hash table entry valu with bitmask size of hash_size */
-static int
-eet_hash_gen(const char *key, int hash_size)
-{
-   int			hash_num = 0;
-   int			value, i;
-   unsigned char	*ptr;
- 
-   const int masks[9] =
-     {
-	0x00,
-	0x01,
-	0x03,
-	0x07,
-	0x0f,
-	0x1f,
-	0x3f,
-	0x7f,
-	0xff
-     };
- 
-   /* no string - index 0 */
-   if (!key) return 0;
- 
-   /* calc hash num */
-   for (i = 0, ptr = (unsigned char *)key, value = (int)(*ptr);
-	value;
-	ptr++, i++, value = (int)(*ptr))
-     hash_num ^= (value | (value << 8)) >> (i & 0x7);
-
-   /* mask it */
-   hash_num &= masks[hash_size];
-   /* return it */
-   return hash_num;
-}
 
 #endif
===================================================================
RCS file: /cvs/e/e17/libs/eet/src/lib/Makefile.am,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -3 -r1.13 -r1.14
--- Makefile.am	15 May 2006 02:50:18 -0000	1.13
+++ Makefile.am	28 Dec 2006 15:23:47 -0000	1.14
@@ -17,6 +17,7 @@
 eet_data.c \
 eet_image.c \
 eet_memfile.c \
+eet_utils.c \
 Eet_private.h
 
 libeet_la_LIBADD       = -lz -ljpeg @fnmatch_libs@ @winsock_libs@
===================================================================
RCS file: /cvs/e/e17/libs/eet/src/lib/eet_data.c,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -3 -r1.45 -r1.46
--- eet_data.c	17 Dec 2006 11:20:25 -0000	1.45
+++ eet_data.c	28 Dec 2006 15:23:47 -0000	1.46
@@ -610,7 +610,7 @@
 	int hash;
 	
 	ede = &(edd->elements.set[i]);
-	hash = eet_hash_gen((char *) ede->name, 6);
+	hash = _eet_hash_gen((char *) ede->name, 6);
 	if (!edd->elements.hash.buckets[hash].element)
 	  edd->elements.hash.buckets[hash].element = ede;
 	else
@@ -651,7 +651,7 @@
    int hash;
    Eet_Data_Descriptor_Hash *bucket;
    
-   hash = eet_hash_gen(name, 6);
+   hash = _eet_hash_gen(name, 6);
    if (!edd->elements.hash.buckets[hash].element) return NULL;
    if (!strcmp(edd->elements.hash.buckets[hash].element->name, name))
      return edd->elements.hash.buckets[hash].element;
===================================================================
RCS file: /cvs/e/e17/libs/eet/src/lib/eet_lib.c,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -3 -r1.72 -r1.73
--- eet_lib.c	16 Oct 2006 15:02:11 -0000	1.72
+++ eet_lib.c	28 Dec 2006 15:23:47 -0000	1.73
@@ -701,7 +701,7 @@
 	       efn->name = (char*)((uint8_t*)(p + HEADER_SIZE));
 
 	     /* get hash bucket it should go in */
-	     hash = eet_hash_gen(efn->name, ef->header->directory->size);
+	     hash = _eet_hash_gen(efn->name, ef->header->directory->size);
 	     efn->next = ef->header->directory->nodes[hash];
 	     ef->header->directory->nodes[hash] = efn;
 
@@ -1020,7 +1020,7 @@
      }
 
    /* figure hash bucket */
-   hash = eet_hash_gen(name, ef->header->directory->size);
+   hash = _eet_hash_gen(name, ef->header->directory->size);
 
    data_size = compress ? 12 + ((size * 101) / 100) : size;
 
@@ -1124,7 +1124,7 @@
      return 0;
 
    /* figure hash bucket */
-   hash = eet_hash_gen(name, ef->header->directory->size);
+   hash = _eet_hash_gen(name, ef->header->directory->size);
 
    /* Does this node already exist? */
    for (pefn = NULL, efn = ef->header->directory->nodes[hash];
@@ -1252,7 +1252,7 @@
    int hash;
 
    /* get hash bucket this should be in */
-   hash = eet_hash_gen(name, ef->header->directory->size);
+   hash = _eet_hash_gen(name, ef->header->directory->size);
 
    for (efn = ef->header->directory->nodes[hash]; efn; efn = efn->next)
      {

E CVS: libs/eet englebass

From: Enlightenment CVS <noreply@cv...> - 2007-03-22 15:55

Enlightenment CVS committal

Author  : englebass
Project : e17
Module  : libs/eet

Dir     : e17/libs/eet/m4


Removed Files:
	ac_path_generic.m4 


Log Message:
No longer needed.

E CVS: libs/eet englebass

From: Enlightenment CVS <noreply@cv...> - 2007-03-25 08:44

Enlightenment CVS committal

Author  : englebass
Project : e17
Module  : libs/eet

Dir     : e17/libs/eet/m4


Removed Files:
	ac_expand_dir.m4 


Log Message:
Remove unused file.

E CVS: libs/eet englebass

From: Enlightenment CVS <noreply@cv...> - 2007-09-14 23:38

Enlightenment CVS committal

Author  : englebass
Project : e17
Module  : libs/eet

Dir     : e17/libs/eet/src/lib


Modified Files:
	Eet_private.h eet_data.c 


Log Message:
Fix compiler warnings.

===================================================================
RCS file: /cvs/e/e17/libs/eet/src/lib/Eet_private.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -3 -r1.14 -r1.15
--- Eet_private.h	28 Dec 2006 15:23:47 -0000	1.14
+++ Eet_private.h	14 Sep 2007 23:38:17 -0000	1.15
@@ -15,6 +15,7 @@
 #if HAVE_ALLOCA_H
 #include <alloca.h>
 #endif
+#include <ctype.h>
 
 #ifdef HAVE_NETINET_IN_H
 #include <netinet/in.h>
===================================================================
RCS file: /cvs/e/e17/libs/eet/src/lib/eet_data.c,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -3 -r1.52 -r1.53
--- eet_data.c	9 Sep 2007 02:00:45 -0000	1.52
+++ eet_data.c	14 Sep 2007 23:38:17 -0000	1.53
@@ -1131,7 +1131,7 @@
 	else sz += 1;
      }
    s = malloc(sz + 1);
-   if (!s) return;
+   if (!s) return NULL;
    for (strp = str, sp = s; *strp; strp++, sp++)
      {
 	if (*strp == '\"')
@@ -1151,7 +1151,7 @@
 }
 
 static void
-_eet_data_dump_string_escape(void *dumpdata, void *dumpfunc(void *data, const char *str), const char *str)
+_eet_data_dump_string_escape(void *dumpdata, void dumpfunc(void *data, const char *str), const char *str)
 {
    char *s;
    
@@ -1164,9 +1164,10 @@
 }
 
 static char *
-_eet_data_dump_token_get(char *src, int *len)
+_eet_data_dump_token_get(const char *src, int *len)
 {
-   char *p, *tok = NULL;
+   const char *p;
+   char *tok = NULL;
    int in_token = 0;
    int in_quote = 0;
    int tlen = 0, tsize = 0;
@@ -1310,7 +1311,6 @@
 {
    Eet_Data_Chunk *chnk = NULL, *echnk = NULL;
    Eet_Data_Stream *ds;
-   int i;
    void *cdata, *data;
    int csize, size;
    Node *n;
@@ -1515,15 +1515,14 @@
 
 static void *
 _eet_data_dump_parse(int *size_ret,
-		     char *src,
+		     const char *src,
 		     int size)
 {
    void *cdata = NULL;
-   char *p;
+   const char *p;
 #define M_NONE 0
 #define M_STRUCT 1
 #define M_ 2
-   int mode = M_NONE;
    int left, jump;
    Node *node_base = NULL;
    Node *node = NULL;
@@ -1745,8 +1744,8 @@
 			    void *dumpdata)
 {
    void *data = NULL;
-   char *p, *buf, tbuf[256], *ts;
-   int size, i, dump, bsize;
+   char *p, *buf, tbuf[256];
+   int size, i, dump;
    Eet_Data_Chunk chnk;
 
    if (words_bigendian == -1)
@@ -2153,7 +2152,7 @@
 			    if ((type >= EET_T_CHAR) &&
 				(type <= EET_T_STRING))
 			      {
-				 data_ret = 1;
+				 data_ret = (void *)1;
 				 ret = eet_data_get_type(type,
 							 echnk.data,
 							 ((char *)echnk.data) + echnk.size,
@@ -2196,7 +2195,7 @@
 			    if ((type >= EET_T_CHAR) &&
 				(type <= EET_T_STRING))
 			      {
-				 data_ret = 1;
+				 data_ret = (void *)1;
 				 ret = eet_data_get_type(type,
 							 echnk.data,
 							 ((char *)echnk.data) + echnk.size,

E CVS: libs/eet englebass

From: Enlightenment CVS <noreply@cv...> - 2007-09-15 23:52

Enlightenment CVS committal

Author  : englebass
Project : e17
Module  : libs/eet

Dir     : e17/libs/eet/src/bin


Added Files:
	.cvsignore 


Log Message:
ignore

E CVS: libs/eet englebass

From: Enlightenment CVS <noreply@cv...> - 2008-01-18 18:29

Enlightenment CVS committal

Author  : englebass
Project : e17
Module  : libs/eet

Dir     : e17/libs/eet/src/lib


Modified Files:
	eet_data.c 


Log Message:
const

===================================================================
RCS file: /cvs/e/e17/libs/eet/src/lib/eet_data.c,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -3 -r1.58 -r1.59
--- eet_data.c	21 Nov 2007 22:20:16 -0000	1.58
+++ eet_data.c	18 Jan 2008 18:29:29 -0000	1.59
@@ -55,7 +55,7 @@
 struct _Eet_Data_Basic_Type_Decoder
 {
    int     size;
-   int   (*get) (void *src, void *src_end, void *dest);
+   int   (*get) (const void *src, const void *src_end, void *dest);
    void *(*put) (const void *src, int *size_ret);
 };
 
@@ -129,22 +129,22 @@
 
 /*---*/
 
-static int   eet_data_get_char(void *src, void *src_end, void *dest);
+static int   eet_data_get_char(const void *src, const void *src_end, void *dest);
 static void *eet_data_put_char(const void *src, int *size_ret);
-static int   eet_data_get_short(void *src, void *src_end, void *dest);
+static int   eet_data_get_short(const void *src, const void *src_end, void *dest);
 static void *eet_data_put_short(const void *src, int *size_ret);
-static int   eet_data_get_int(void *src, void *src_end, void *dest);
+static int   eet_data_get_int(const void *src, const void *src_end, void *dest);
 static void *eet_data_put_int(const void *src, int *size_ret);
-static int   eet_data_get_long_long(void *src, void *src_end, void *dest);
+static int   eet_data_get_long_long(const void *src, const void *src_end, void *dest);
 static void *eet_data_put_long_long(const void *src, int *size_ret);
-static int   eet_data_get_float(void *src, void *src_end, void *dest);
+static int   eet_data_get_float(const void *src, const void *src_end, void *dest);
 static void *eet_data_put_float(const void *src, int *size_ret);
-static int   eet_data_get_double(void *src, void *src_end, void *dest);
+static int   eet_data_get_double(const void *src, const void *src_end, void *dest);
 static void *eet_data_put_double(const void *src, int *size_ret);
-static int   eet_data_get_string(void *src, void *src_end, void *dest);
+static int   eet_data_get_string(const void *src, const void *src_end, void *dest);
 static void *eet_data_put_string(const void *src, int *size_ret);
 
-static int   eet_data_get_type(int type, void *src, void *src_end, void *dest);
+static int   eet_data_get_type(int type, const void *src, const void *src_end, void *dest);
 static void *eet_data_put_type(int type, const void *src, int *size_ret);
 
 static void            eet_data_chunk_get(Eet_Data_Chunk *chnk, const void *src, int size);
@@ -207,7 +207,7 @@
 
 /* CHAR TYPE */
 static int
-eet_data_get_char(void *src, void *src_end, void *dst)
+eet_data_get_char(const void *src, const void *src_end, void *dst)
 {
    char *s, *d;
 
@@ -235,7 +235,7 @@
 
 /* SHORT TYPE */
 static int
-eet_data_get_short(void *src, void *src_end, void *dst)
+eet_data_get_short(const void *src, const void *src_end, void *dst)
 {
    short *d;
 
@@ -262,7 +262,7 @@
 
 /* INT TYPE */
 static int
-eet_data_get_int(void *src, void *src_end, void *dst)
+eet_data_get_int(const void *src, const void *src_end, void *dst)
 {
    int *d;
 
@@ -289,7 +289,7 @@
 
 /* LONG LONG TYPE */
 static int
-eet_data_get_long_long(void *src, void *src_end, void *dst)
+eet_data_get_long_long(const void *src, const void *src_end, void *dst)
 {
    unsigned long long *d;
 
@@ -316,7 +316,7 @@
 
 /* STRING TYPE */
 static int
-eet_data_get_string(void *src, void *src_end, void *dst)
+eet_data_get_string(const void *src, const void *src_end, void *dst)
 {
    char *s, **d, *p;
    int len;
@@ -397,7 +397,7 @@
 
 /* FLOAT TYPE */
 static int
-eet_data_get_float(void *src, void *src_end, void *dst)
+eet_data_get_float(const void *src, const void *src_end, void *dst)
 {
    float *d;
    long long mantisse;
@@ -442,7 +442,7 @@
 
 /* DOUBLE TYPE */
 static int
-eet_data_get_double(void *src, void *src_end, void *dst)
+eet_data_get_double(const void *src, const void *src_end, void *dst)
 {
    double   *d;
    long long mantisse = 0;
@@ -486,7 +486,7 @@
 }
 
 static int
-eet_data_get_type(int type, void *src, void *src_end, void *dest)
+eet_data_get_type(int type, const void *src, const void *src_end, void *dest)
 {
    int ret;
 
@@ -556,7 +556,7 @@
 	     return;
 	  }
      }
-   ret1 = eet_data_get_type(EET_T_INT, (void *)(s + 4), (void *)(s + size), &(chnk->size));
+   ret1 = eet_data_get_type(EET_T_INT, (s + 4), (s + size), &(chnk->size));
    if (ret1 <= 0)
      {
 	return;
@@ -565,7 +565,7 @@
      {
 	return;
      }
-   ret2 = eet_data_get_type(EET_T_STRING, (void *)(s + 8), (void *)(s + size), &(chnk->name));
+   ret2 = eet_data_get_type(EET_T_STRING, (s + 8), (s + size), &(chnk->name));
    if (ret2 <= 0)
      {
 	return;

E CVS: libs/eet englebass

From: Enlightenment CVS <noreply@cv...> - 2008-01-27 12:55

Enlightenment CVS committal

Author  : englebass
Project : e17
Module  : libs/eet

Dir     : e17/libs/eet/src/lib


Modified Files:
	eet_data.c eet_image.c 


Log Message:
formatting

===================================================================
RCS file: /cvs/e/e17/libs/eet/src/lib/eet_data.c,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -3 -r1.60 -r1.61
--- eet_data.c	21 Jan 2008 01:09:51 -0000	1.60
+++ eet_data.c	27 Jan 2008 12:55:29 -0000	1.61
@@ -906,11 +906,11 @@
 eet_data_read(Eet_File *ef, Eet_Data_Descriptor *edd, const char *name)
 {
    void *data_dec;
-   const void *data;
+   void *data;
    int	size;
    int	required_free = 0;
 
-   data = eet_read_direct(ef, name, &size);
+   data = (void *)eet_read_direct(ef, name, &size);
    if (!data)
      {
 	required_free = 1;
===================================================================
RCS file: /cvs/e/e17/libs/eet/src/lib/eet_image.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -3 -r1.11 -r1.12
--- eet_image.c	21 Jan 2008 01:09:51 -0000	1.11
+++ eet_image.c	27 Jan 2008 12:55:29 -0000	1.12
@@ -733,7 +733,7 @@
    unsigned int *d = NULL;
    int		free_data = 0;
 
-   data = (void*) eet_read_direct (ef, name, &size);
+   data = (void *)eet_read_direct (ef, name, &size);
    if (!data)
      {
 	data = eet_read(ef, name, &size);
@@ -759,7 +759,7 @@
    int	d;
    int	free_data = 0;
 
-   data = (void*) eet_read_direct (ef, name, &size);
+   data = (void *)eet_read_direct (ef, name, &size);
    if (!data)
      {
 	data = eet_read(ef, name, &size);

E CVS: libs/eet englebass

From: Enlightenment CVS <noreply@cv...> - 2008-01-27 12:56

Enlightenment CVS committal

Author  : englebass
Project : e17
Module  : libs/eet

Dir     : e17/libs/eet/src/lib


Modified Files:
	eet_image.c eet_lib.c 


Log Message:
formatting

===================================================================
RCS file: /cvs/e/e17/libs/eet/src/lib/eet_image.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -3 -r1.12 -r1.13
--- eet_image.c	27 Jan 2008 12:55:29 -0000	1.12
+++ eet_image.c	27 Jan 2008 12:56:44 -0000	1.13
@@ -733,7 +733,7 @@
    unsigned int *d = NULL;
    int		free_data = 0;
 
-   data = (void *)eet_read_direct (ef, name, &size);
+   data = (void *)eet_read_direct(ef, name, &size);
    if (!data)
      {
 	data = eet_read(ef, name, &size);
@@ -759,7 +759,7 @@
    int	d;
    int	free_data = 0;
 
-   data = (void *)eet_read_direct (ef, name, &size);
+   data = (void *)eet_read_direct(ef, name, &size);
    if (!data)
      {
 	data = eet_read(ef, name, &size);
===================================================================
RCS file: /cvs/e/e17/libs/eet/src/lib/eet_lib.c,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -3 -r1.86 -r1.87
--- eet_lib.c	26 Jan 2008 05:50:09 -0000	1.86
+++ eet_lib.c	27 Jan 2008 12:56:44 -0000	1.87
@@ -456,7 +456,7 @@
 }
 
 static Eet_File*
-eet_internal_read (Eet_File *ef)
+eet_internal_read(Eet_File *ef)
 {
    const unsigned char	*dyn_buf = NULL;
    const unsigned char	*p = NULL;

E CVS: libs/eet englebass

From: Enlightenment CVS <noreply@cv...> - 2008-01-27 13:08

Enlightenment CVS committal

Author  : englebass
Project : e17
Module  : libs/eet

Dir     : e17/libs/eet/src/lib


Modified Files:
	Eet.h 


Log Message:
formatting

===================================================================
RCS file: /cvs/e/e17/libs/eet/src/lib/Eet.h,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -3 -r1.43 -r1.44
--- Eet.h	21 Jan 2008 01:09:51 -0000	1.43
+++ Eet.h	27 Jan 2008 13:08:30 -0000	1.44
@@ -237,7 +237,7 @@
 
    /**
 
-        * Read a specified entry from an eet file and return data
+    * Read a specified entry from an eet file and return data
     * @param ef A valid eet file handle opened for reading.
     * @param name Name of the entry. eg: "/base/file_i_want".
     * @param size_ret Number of bytes read from entry and returned.

E CVS: libs/eet englebass

From: Enlightenment CVS <noreply@cv...> - 2008-01-27 13:17

Enlightenment CVS committal

Author  : englebass
Project : e17
Module  : libs/eet

Dir     : e17/libs/eet/src/lib


Modified Files:
	eet_data.c eet_image.c eet_lib.c eet_memfile.c 


Log Message:
include files in the correct order

===================================================================
RCS file: /cvs/e/e17/libs/eet/src/lib/eet_data.c,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -3 -r1.61 -r1.62
--- eet_data.c	27 Jan 2008 12:55:29 -0000	1.61
+++ eet_data.c	27 Jan 2008 13:17:22 -0000	1.62
@@ -1,7 +1,7 @@
 #include <math.h>
 
-#include "Eet.h"
 #include "Eet_private.h"
+#include "Eet.h"
 
 /*
  * routines for doing data -> struct and struct -> data conversion
===================================================================
RCS file: /cvs/e/e17/libs/eet/src/lib/eet_image.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -3 -r1.13 -r1.14
--- eet_image.c	27 Jan 2008 12:56:44 -0000	1.13
+++ eet_image.c	27 Jan 2008 13:17:22 -0000	1.14
@@ -1,5 +1,5 @@
-#include "Eet.h"
 #include "Eet_private.h"
+#include "Eet.h"
 
 /*---*/
 
===================================================================
RCS file: /cvs/e/e17/libs/eet/src/lib/eet_lib.c,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -3 -r1.87 -r1.88
--- eet_lib.c	27 Jan 2008 12:56:44 -0000	1.87
+++ eet_lib.c	27 Jan 2008 13:17:22 -0000	1.88
@@ -2,14 +2,13 @@
  * vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2
  */
 
-#include <config.h>
+#include "Eet_private.h"
+#include "Eet.h"
+
 #include <sys/types.h>
 #ifdef HAVE_SYS_MMAN_H
 # include <sys/mman.h>
 #endif
-
-#include "Eet.h"
-#include "Eet_private.h"
 
 #ifdef HAVE_REALPATH
 #undef HAVE_REALPATH
===================================================================
RCS file: /cvs/e/e17/libs/eet/src/lib/eet_memfile.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -3 -r1.12 -r1.13
--- eet_memfile.c	5 Nov 2006 12:14:08 -0000	1.12
+++ eet_memfile.c	27 Jan 2008 13:17:22 -0000	1.13
@@ -1,11 +1,11 @@
-#include "Eet.h"
 #include "Eet_private.h"
+#include "Eet.h"
 
 FILE *
 _eet_memfile_read_open(const void *data, size_t size)
 {
 #ifdef HAVE_FMEMOPEN
-   return (FILE *)fmemopen((void*)data, size, "rb");
+   return fmemopen((void*)data, size, "rb");
 #else
    FILE *f;

E CVS: libs/eet englebass

From: Enlightenment CVS <noreply@cv...> - 2008-04-17 14:10

Enlightenment CVS committal

Author  : englebass
Project : e17
Module  : libs/eet

Dir     : e17/libs/eet/src/lib


Modified Files:
	eet_data.c 


Log Message:
formatting

===================================================================
RCS file: /cvs/e/e17/libs/eet/src/lib/eet_data.c,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -3 -r1.72 -r1.73
--- eet_data.c	10 Apr 2008 08:57:03 -0000	1.72
+++ eet_data.c	17 Apr 2008 14:09:48 -0000	1.73
@@ -1973,17 +1973,21 @@
 	     switch (chnk.group_type)
 	       {
 		case EET_G_UNKNOWN:
-		  dumpfunc(dumpdata, "struct");break;
+		  dumpfunc(dumpdata, "struct");
+		  break;
 		case EET_G_ARRAY:
-		  dumpfunc(dumpdata, "array");break;
+		  dumpfunc(dumpdata, "array");
+		  break;
 		case EET_G_VAR_ARRAY:
-		  dumpfunc(dumpdata, "var_array");break;
+		  dumpfunc(dumpdata, "var_array");
+		  break;
 		case EET_G_LIST:
-		  dumpfunc(dumpdata, "list");break;
+		  dumpfunc(dumpdata, "list");
+		  break;
 		case EET_G_HASH:
 		  dumpfunc(dumpdata, "hash");break;
 		default:
-		  dumpfunc(dumpdata, "???");break;
+		  dumpfunc(dumpdata, "???");
 		  break;
 	       }
 	     dumpfunc(dumpdata, " {\n");

E CVS: libs/eet englebass

From: Enlightenment CVS <noreply@cv...> - 2008-06-19 12:26

Enlightenment CVS committal

Author  : englebass
Project : e17
Module  : libs/eet

Dir     : e17/libs/eet


Modified Files:
	.cvsignore 


Log Message:
ignore++

===================================================================
RCS file: /cvs/e/e17/libs/eet/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -3 -r1.13 -r1.14
--- .cvsignore	28 Apr 2008 09:23:43 -0000	1.13
+++ .cvsignore	19 Jun 2008 12:26:09 -0000	1.14
@@ -37,3 +37,4 @@
 m4/ltsugar.m4
 m4/ltversion.m4
 m4/lt~obsolete.m4
+compile

E CVS: libs/eet englebass

From: Enlightenment CVS <noreply@cv...> - 2008-06-19 12:26

Enlightenment CVS committal

Author  : englebass
Project : e17
Module  : libs/eet

Dir     : e17/libs/eet/src/tests


Added Files:
	.cvsignore 


Log Message:
ignore++

E CVS: libs/eet englebass

From: Enlightenment CVS <noreply@cv...> - 2008-08-06 04:58

Enlightenment CVS committal

Author  : englebass
Project : e17
Module  : libs/eet

Dir     : e17/libs/eet/src/tests


Modified Files:
	.cvsignore 


Log Message:
ignore

===================================================================
RCS file: /cvs/e/e17/libs/eet/src/tests/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- .cvsignore	19 Jun 2008 12:26:45 -0000	1.1
+++ .cvsignore	6 Aug 2008 04:58:43 -0000	1.2
@@ -2,3 +2,4 @@
 .libs
 Makefile
 Makefile.in
+eet_suite

E CVS: libs/eet englebass

From: Enlightenment CVS <noreply@cv...> - 2008-08-06 04:58

Enlightenment CVS committal

Author  : englebass
Project : e17
Module  : libs/eet

Dir     : e17/libs/eet/src/lib


Modified Files:
	.cvsignore 


Log Message:
ignore

===================================================================
RCS file: /cvs/e/e17/libs/eet/src/lib/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- .cvsignore	29 Jul 2005 16:41:03 -0000	1.3
+++ .cvsignore	6 Aug 2008 04:58:43 -0000	1.4
@@ -7,3 +7,4 @@
 Makefile.in
 *.lo
 libeet.la
+*.gcno

E CVS: libs/eet englebass

From: Enlightenment CVS <noreply@cv...> - 2008-08-10 09:25

Enlightenment CVS committal

Author  : englebass
Project : e17
Module  : libs/eet

Dir     : e17/libs/eet/src/lib


Modified Files:
	eet_data.c 


Log Message:
formatting

===================================================================
RCS file: /cvs/e/e17/libs/eet/src/lib/eet_data.c,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -3 -r1.91 -r1.92
--- eet_data.c	26 Jul 2008 12:54:39 -0000	1.91
+++ eet_data.c	10 Aug 2008 09:25:21 -0000	1.92
@@ -2178,7 +2178,8 @@
 		  dumpfunc(dumpdata, "list");
 		  break;
 		case EET_G_HASH:
-		  dumpfunc(dumpdata, "hash");break;
+		  dumpfunc(dumpdata, "hash");
+		  break;
 		default:
 		  dumpfunc(dumpdata, "???");
 		  break;

E CVS: libs/eet englebass

From: Enlightenment CVS <noreply@cv...> - 2008-08-10 09:33

Enlightenment CVS committal

Author  : englebass
Project : e17
Module  : libs/eet

Dir     : e17/libs/eet/src/lib


Modified Files:
	eet_data.c 


Log Message:
formatting

===================================================================
RCS file: /cvs/e/e17/libs/eet/src/lib/eet_data.c,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -3 -r1.92 -r1.93
--- eet_data.c	10 Aug 2008 09:25:21 -0000	1.92
+++ eet_data.c	10 Aug 2008 09:33:55 -0000	1.93
@@ -2718,8 +2718,7 @@
 	     str = (char **)(((char *)data));
 	     if (*str)
 	       {
-		  if (ed == NULL
-		      || edd->func.str_direct_alloc == NULL)
+		  if ((ed == NULL) || (edd->func.str_direct_alloc == NULL))
 		    {
 		       *str = edd->func.str_alloc(*str);
 		       _eet_freelist_str_add(*str);