diff --git a/src/textfile.c b/src/textfile.c
index d115ff6..089cce8 100644
--- a/src/textfile.c
+++ b/src/textfile.c
@@ -182,7 +182,7 @@
 {
 	struct stat st;
 	char *map, *off, *end, *str;
-	off_t size, pos; size_t base;
+	off_t size; size_t base;
 	int fd, len, err = 0;
 
 	fd = open(pathname, O_RDWR);
@@ -203,7 +203,7 @@
 
 	if (!size) {
 		if (value) {
-			pos = lseek(fd, size, SEEK_SET);
+			lseek(fd, size, SEEK_SET);
 			err = write_key_value(fd, key, value);
 		}
 		goto unlock;
@@ -221,7 +221,7 @@
 	if (!off) {
 		if (value) {
 			munmap(map, size);
-			pos = lseek(fd, size, SEEK_SET);
+			lseek(fd, size, SEEK_SET);
 			err = write_key_value(fd, key, value);
 		}
 		goto unlock;
@@ -249,7 +249,7 @@
 			err = errno;
 			goto unlock;
 		}
-		pos = lseek(fd, base, SEEK_SET);
+		lseek(fd, base, SEEK_SET);
 		if (value)
 			err = write_key_value(fd, key, value);
 
@@ -275,7 +275,7 @@
 		free(str);
 		goto unlock;
 	}
-	pos = lseek(fd, base, SEEK_SET);
+	lseek(fd, base, SEEK_SET);
 	if (value)
 		err = write_key_value(fd, key, value);
 
