Changeset 1697Tweet

Timestamp:

01/18/07 19:45:58 (6 years ago)

Author:

sam

Message:

• Minor improvement in the locking mechanism.

Location:

zzuf/trunk/src

Files:

• fd.c (modified) (3 diffs)
• lib-stream.c (modified) (1 diff)

zzuf/trunk/src/fd.c

@@ -61 +61 @@
 /* Create lock. This lock variable is used to disable file descriptor
  * creation wrappers. For instance on Mac OS X, fopen() calls open()
- * and we don’t want open() to do any zzuf-related stuff. */
-static int create_lock;
+ * and we don’t want open() to do any zzuf-related stuff, fopen() takes
+ * care of everything. */
+static int create_lock = 0;
 
 static int32_t seed = DEFAULT_SEED;
@@ -276 +277 @@
 
     if(fd == -1)
-        create_lock = 1;
+        create_lock++;
     else
-        files[fds[fd]].locked = 1;
+        files[fds[fd]].locked++;
 }
 
@@ -287 +288 @@
 
     if(fd == -1)
-        create_lock = 0;
+        create_lock--;
     else
-        files[fds[fd]].locked = 0;
+        files[fds[fd]].locked--;
 }
 

zzuf/trunk/src/lib-stream.c

@@ -555 +555 @@
         return __srefill_orig(fp);
 
-    tmp = _zz_islocked(fd);
     _zz_lock(fd);
     ret = __srefill_orig(fp);
     newpos = lseek(fd, 0, SEEK_CUR);
-    if(!tmp)
-        _zz_unlock(fd);
+    _zz_unlock(fd);
     if(ret != EOF)
     {