Diffstat (limited to 'cache.c')
| -rw-r--r-- | cache.c | 33 |
1 files changed, 9 insertions, 24 deletions
@@ -66,16 +66,12 @@ static int open_slot(struct cache_slot *slot) } /* Close the active cache slot */ -static int close_slot(struct cache_slot *slot) +static void close_slot(struct cache_slot *slot) { - int err = 0; if (slot->cache_fd > 0) { - if (close(slot->cache_fd)) - err = errno; - else - slot->cache_fd = -1; + close(slot->cache_fd); + slot->cache_fd = -1; } - return err; } /* Print the content of the active cache slot (but skip the key). */ @@ -120,16 +116,12 @@ static int is_modified(struct cache_slot *slot) } /* Close an open lockfile */ -static int close_lock(struct cache_slot *slot) +static void close_lock(struct cache_slot *slot) { - int err = 0; if (slot->lock_fd > 0) { - if (close(slot->lock_fd)) - err = errno; - else - slot->lock_fd = -1; + close(slot->lock_fd); + slot->lock_fd = -1; } - return err; } /* Create a lockfile used to store the generated content for a cache @@ -142,8 +134,7 @@ static int lock_slot(struct cache_slot *slot) S_IRUSR|S_IWUSR); if (slot->lock_fd == -1) return errno; - if (write(slot->lock_fd, slot->key, slot->keylen + 1) < 0) - return errno; + write(slot->lock_fd, slot->key, slot->keylen + 1); return 0; } @@ -159,11 +150,7 @@ static int unlock_slot(struct cache_slot *slot, int replace_old_slot) err = rename(slot->lock_name, slot->cache_name); else err = unlink(slot->lock_name); - - if (err) - return errno; - - return 0; + return err; } /* Generate the content for the current cache slot by redirecting @@ -190,9 +177,7 @@ static int fill_slot(struct cache_slot *slot) return errno; /* Close the temporary filedescriptor */ - if (close(tmp)) - return errno; - + close(tmp); return 0; } |