Enlightenment CVS committal
Author : tsauerbeck
Project : e17
Module : libs/eet
Dir : e17/libs/eet/src/lib
Modified Files:
Eet.h eet_lib.c
Log Message:
renamed EET_FILE_MODE_RW to EET_FILE_MODE_READ_WRITE
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/eet/src/lib/Eet.h,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -3 -r1.21 -r1.22
--- Eet.h 7 Feb 2005 19:11:55 -0000 1.21
+++ Eet.h 3 Mar 2005 17:26:45 -0000 1.22
@@ -52,7 +52,7 @@
EET_FILE_MODE_INVALID = -1,
EET_FILE_MODE_READ,
EET_FILE_MODE_WRITE,
- EET_FILE_MODE_RW
+ EET_FILE_MODE_READ_WRITE
};
typedef enum _Eet_File_Mode Eet_File_Mode;
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/eet/src/lib/eet_lib.c,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -3 -r1.29 -r1.30
--- eet_lib.c 7 Feb 2005 18:11:49 -0000 1.29
+++ eet_lib.c 3 Mar 2005 17:26:45 -0000 1.30
@@ -240,7 +240,7 @@
return;
if (!ef->header) return;
if (!ef->header->directory) return;
- if ((ef->mode != EET_FILE_MODE_WRITE) && (ef->mode != EET_FILE_MODE_RW))
return;
+ if ((ef->mode != EET_FILE_MODE_WRITE) && (ef->mode !=
EET_FILE_MODE_READ_WRITE)) return;
if (!ef->writes_pending) return;
/* calculate total size in bytes of directory block */
@@ -365,7 +365,7 @@
ef = NULL;
if (mode == EET_FILE_MODE_READ)
ef = eet_cache_find(buf, eet_readers, eet_readers_num);
- else if ((mode == EET_FILE_MODE_WRITE) || (mode == EET_FILE_MODE_RW))
+ else if ((mode == EET_FILE_MODE_WRITE) || (mode ==
EET_FILE_MODE_READ_WRITE))
ef = eet_cache_find(buf, eet_writers, eet_writers_num);
/* we found one */
if (ef)
@@ -387,7 +387,7 @@
ef->mode = mode;
/* try open the file based on mode */
- if ((ef->mode == EET_FILE_MODE_READ) || (ef->mode == EET_FILE_MODE_RW))
+ if ((ef->mode == EET_FILE_MODE_READ) || (ef->mode ==
EET_FILE_MODE_READ_WRITE))
ef->fp = fopen(ef->path, "rb");
else if (ef->mode == EET_FILE_MODE_WRITE)
{
@@ -409,7 +409,7 @@
}
/* if we opened for read or read-write */
- if ((mode == EET_FILE_MODE_READ) || (mode == EET_FILE_MODE_RW))
+ if ((mode == EET_FILE_MODE_READ) || (mode == EET_FILE_MODE_READ_WRITE))
{
unsigned char buf[12];
unsigned char *dyn_buf, *p;
@@ -628,7 +628,7 @@
}
/* we need to delete the original file in read-write mode and re-open for
writing */
- if (ef->mode == EET_FILE_MODE_RW)
+ if (ef->mode == EET_FILE_MODE_READ_WRITE)
{
fclose(ef->fp);
unlink(ef->real_path);
@@ -638,7 +638,7 @@
/* add to cache */
if (ef->mode == EET_FILE_MODE_READ)
eet_cache_add(ef, &eet_readers, &eet_readers_num);
- else if ((ef->mode == EET_FILE_MODE_WRITE) || (ef->mode ==
EET_FILE_MODE_RW))
+ else if ((ef->mode == EET_FILE_MODE_WRITE) || (ef->mode ==
EET_FILE_MODE_READ_WRITE))
eet_cache_add(ef, &eet_writers, &eet_writers_num);
return ef;
}
@@ -666,7 +666,7 @@
/* remove from cache */
if (ef->mode == EET_FILE_MODE_READ)
eet_cache_del(ef, &eet_readers, &eet_readers_num);
- else if ((ef->mode == EET_FILE_MODE_WRITE) || (ef->mode ==
EET_FILE_MODE_RW))
+ else if ((ef->mode == EET_FILE_MODE_WRITE) || (ef->mode ==
EET_FILE_MODE_READ_WRITE))
eet_cache_del(ef, &eet_writers, &eet_writers_num);
/* flush any writes */
eet_flush(ef);
@@ -727,7 +727,7 @@
/* check to see its' an eet file pointer */
if ((!ef) || (ef->magic != EET_MAGIC_FILE) || (!name) ||
((ef->mode != EET_FILE_MODE_READ) &&
- (ef->mode != EET_FILE_MODE_RW)))
+ (ef->mode != EET_FILE_MODE_READ_WRITE)))
{
if (size_ret) *size_ret = 0;
return NULL;
@@ -858,7 +858,7 @@
if ((!ef) || (ef->magic != EET_MAGIC_FILE)
|| (!name) || (!data) || (size <= 0) ||
((ef->mode != EET_FILE_MODE_WRITE) &&
- (ef->mode != EET_FILE_MODE_RW)))
+ (ef->mode != EET_FILE_MODE_READ_WRITE)))
return 0;
@@ -928,7 +928,7 @@
memcpy(data2, data, size);
/* Does this node already exist? */
- if (ef->mode == EET_FILE_MODE_RW)
+ if (ef->mode == EET_FILE_MODE_READ_WRITE)
{
int i;
for (i = 0; i < node_size; i++)
@@ -987,7 +987,7 @@
return 0;
/* deleting keys is only possible in RW mode */
- if (ef->mode != EET_FILE_MODE_RW) return 0;
+ if (ef->mode != EET_FILE_MODE_READ_WRITE) return 0;
if (!ef->header) return 0;
@@ -1028,7 +1028,7 @@
if ((!ef) || (ef->magic != EET_MAGIC_FILE) || (!glob) ||
(!ef->header) || (!ef->header->directory) ||
((ef->mode != EET_FILE_MODE_READ) &&
- (ef->mode != EET_FILE_MODE_RW)))
+ (ef->mode != EET_FILE_MODE_READ_WRITE)))
{
if (count_ret) *count_ret = 0;
return NULL;
-------------------------------------------------------
SF email is sponsored by - The IT Product Guide
Read honest & candid reviews on hundreds of IT Products from real users.
Discover which products truly live up to the hype. Start reading now.
http://ads.osdn.com/?ad_id=6595&alloc_id=14396&op=click
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
