fi

src/tus_file.c

@@ -1101,7 +1101,7 @@ typedef int suck_truncate_f(void *, off_t);
 
 struct tus_suck {
 	union {
-		struct tus_suck_fd fd;
+		struct tus_suck_fd sfd;
 	} priv;
 	objiterate_f	*func;
 	suck_truncate_f	*trunc;
@@ -1135,9 +1135,9 @@ tus_suck_finish(struct tus_suck_common *sc,
 static int v_matchproto_(objiterate_f)
 tus_suck_fd_f(void *priv, unsigned flush, const void *ptr, ssize_t len)
 {
-	struct tus_suck_fd *suck_fd;
+	struct tus_suck_fd *sfd;
 
-	CAST_OBJ_NOTNULL(suck_fd, priv, TUS_SUCK_FD_MAGIC);
+	CAST_OBJ_NOTNULL(sfd, priv, TUS_SUCK_FD_MAGIC);
 
 	// we could use writev(), but unclear if it is worth it
 	(void) flush;
@@ -1147,29 +1147,32 @@ tus_suck_fd_f(void *priv, unsigned flush, const void *ptr, ssize_t len)
 
 	assert(len > 0);
 
-	return (tus_suck_finish(&suck_fd->sc, write(suck_fd->fd, ptr, len),
+	return (tus_suck_finish(&sfd->sc, write(sfd->fd, ptr, len),
 				ptr, len));
 }
 
 static int
 tus_suck_fd_truncate_f(void *priv, off_t length)
 {
-	struct tus_suck_fd *suck_fd;
+	struct tus_suck_fd *sfd;
 
-	CAST_OBJ_NOTNULL(suck_fd, priv, TUS_SUCK_FD_MAGIC);
+	CAST_OBJ_NOTNULL(sfd, priv, TUS_SUCK_FD_MAGIC);
 
-	return (ftruncate(suck_fd->fd, length));
+	return (ftruncate(sfd->fd, length));
 }
 
 static inline struct tus_suck_common *
 tus_suck_fd_init(struct tus_suck *suck, struct tus_file_core *fcore)
 {
-	suck->priv.fd.magic = TUS_SUCK_FD_MAGIC;
-	suck->priv.fd.fd = tus_file_open(fcore);
-	assert(suck->priv.fd.fd >= 0);
+	struct tus_suck_fd *sfd;
+
+	sfd = &suck->priv.sfd;
+	sfd->magic = TUS_SUCK_FD_MAGIC;
+	sfd->fd = tus_file_open(fcore);
+	assert(sfd->fd >= 0);
 	suck->func = tus_suck_fd_f;
 	suck->trunc = tus_suck_fd_truncate_f;
-	return (&suck->priv.fd.sc);
+	return (&sfd->sc);
 }
 
 /* ------------------------------------------------------------