| -rw-r--r-- | cache.c | 12 |
1 files changed, 6 insertions, 6 deletions
@@ -48,13 +48,13 @@ static int open_slot(struct cache_slot *slot) if (slot->cache_fd == -1) return errno; if (fstat(slot->cache_fd, &slot->cache_st)) return errno; - slot->bufsize = read(slot->cache_fd, slot->buf, sizeof(slot->buf)); + slot->bufsize = xread(slot->cache_fd, slot->buf, sizeof(slot->buf)); if (slot->bufsize < 0) return errno; bufz = memchr(slot->buf, 0, slot->bufsize); if (bufz) bufkeylen = bufz - slot->buf; @@ -78,22 +78,22 @@ static int close_slot(struct cache_slot *slot) return err; } /* Print the content of the active cache slot (but skip the key). */ static int print_slot(struct cache_slot *slot) { - ssize_t i, j = 0; + ssize_t i; i = lseek(slot->cache_fd, slot->keylen + 1, SEEK_SET); if (i != slot->keylen + 1) return errno; - while((i=read(slot->cache_fd, slot->buf, sizeof(slot->buf))) > 0) - j = write(STDOUT_FILENO, slot->buf, i); + while((i = xread(slot->cache_fd, slot->buf, sizeof(slot->buf))) > 0) + i = xwrite(STDOUT_FILENO, slot->buf, i); - if (j < 0) + if (i < 0) return errno; else return 0; } /* Check if the slot has expired */ @@ -139,13 +139,13 @@ static int close_lock(struct cache_slot *slot) static int lock_slot(struct cache_slot *slot) { slot->lock_fd = open(slot->lock_name, O_RDWR|O_CREAT|O_EXCL, S_IRUSR|S_IWUSR); if (slot->lock_fd == -1) return errno; - if (write(slot->lock_fd, slot->key, slot->keylen + 1) < 0) + if (xwrite(slot->lock_fd, slot->key, slot->keylen + 1) < 0) return errno; return 0; } /* Release the current lockfile. If `replace_old_slot` is set the * lockfile replaces the old cache slot, otherwise the lockfile is |