Enlightenment CVS committal
Author : tsauerbeck
Project : e17
Module : libs/eet
Dir : e17/libs/eet/src/lib
Modified Files:
eet_lib.c
Log Message:
early check of the open mode, slightly more efficient
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/eet/src/lib/eet_lib.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -3 -r1.24 -r1.25
--- eet_lib.c 12 Jan 2005 14:23:16 -0000 1.24
+++ eet_lib.c 12 Jan 2005 19:59:11 -0000 1.25
@@ -1,3 +1,7 @@
+/*
+ * vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2
+ */
+
#include "Eet.h"
#include "Eet_private.h"
@@ -963,13 +967,16 @@
int
eet_delete(Eet_File *ef, char *name)
{
- int hash, node_size;
+ int hash, node_size, i;
int exists_already = 0;
/* check to see its' an eet file pointer */
if ((!ef) || (ef->magic != EET_MAGIC_FILE) || (!name))
return 0;
+ /* deleting keys is only possible in RW mode */
+ if (ef->mode != EET_FILE_MODE_RW) return 0;
+
if (!ef->header) return 0;
/* figure hash bucket */
@@ -977,22 +984,18 @@
node_size = ef->header->directory->hash[hash].size;
/* Does this node already exist? */
- if (ef->mode == EET_FILE_MODE_RW)
+ for (i = 0; i < node_size; i++)
{
- int i;
- for (i = 0; i < node_size; i++)
+ /* if it matches */
+ if (eet_string_match(ef->header->directory->hash[hash].node[i].name,
name))
{
- /* if it matches */
- if
(eet_string_match(ef->header->directory->hash[hash].node[i].name, name))
- {
- free(ef->header->directory->hash[hash].node[i].data);
- ef->header->directory->hash[hash].node[i].compression = -1;
- ef->header->directory->hash[hash].node[i].size = 0;
- ef->header->directory->hash[hash].node[i].data_size = 0;
- ef->header->directory->hash[hash].node[i].data = NULL;
- exists_already = 1;
- break;
- }
+ free(ef->header->directory->hash[hash].node[i].data);
+ ef->header->directory->hash[hash].node[i].compression = -1;
+ ef->header->directory->hash[hash].node[i].size = 0;
+ ef->header->directory->hash[hash].node[i].data_size = 0;
+ ef->header->directory->hash[hash].node[i].data = NULL;
+ exists_already = 1;
+ break;
}
}
/* flags that writes are pending */
-------------------------------------------------------
The SF.Net email is sponsored by: Beat the post-holiday blues
Get a FREE limited edition SourceForge.net t-shirt from ThinkGeek.
It's fun and FREE -- well, almost....http://www.thinkgeek.com/sfshirt
_______________________________________________
enlightenment-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs