Fix off_t(on windows off_t defined with long, not longlong) (#264)

sinnren · bakurise · web-flow · commit fa3b994c01cc · 2023-07-10T21:43:35.000+08:00
Co-authored-by: fenlog &lt;bakurise@qq.com&gt;
diff --git a/trantor/net/inner/TcpConnectionImpl.cc b/trantor/net/inner/TcpConnectionImpl.cc
@@ -878,7 +878,7 @@ void TcpConnectionImpl::sendFile(FILE *fp, size_t offset, size_t length)
     BufferNodePtr node = std::make_shared<BufferNode>();
     node->sendFp_ = fp;
 #endif
-    node->offset_ = static_cast<off_t>(offset);
+    node->offset_ = offset;
     node->fileBytesToSend_ = length;
     if (loop_->isInLoopThread())
     {
@@ -1159,7 +1159,7 @@ void TcpConnectionImpl::sendFileInLoop(const BufferNodePtr &filePtr)
             if (nSend >= 0)
             {
                 filePtr->fileBytesToSend_ -= nSend;
-                filePtr->offset_ += static_cast<off_t>(nSend);
+                filePtr->offset_ += nSend;
                 if (static_cast<size_t>(nSend) < static_cast<size_t>(n))
                 {
                     if (!ioChannelPtr_->isWriting())

Original file line number	Diff line number	Diff line change
`@@ -878,7 +878,7 @@ void TcpConnectionImpl::sendFile(FILE *fp, size_t offset, size_t length)`
`878`	`878`	`BufferNodePtr node = std::make_shared<BufferNode>();`
`879`	`879`	`node->sendFp_ = fp;`
`880`	`880`	`#endif`
`881`		`- node->offset_ = static_cast<off_t>(offset);`
	`881`	`+ node->offset_ = offset;`
`882`	`882`	`node->fileBytesToSend_ = length;`
`883`	`883`	`if (loop_->isInLoopThread())`
`884`	`884`	`{`
`@@ -1159,7 +1159,7 @@ void TcpConnectionImpl::sendFileInLoop(const BufferNodePtr &filePtr)`
`1159`	`1159`	`if (nSend >= 0)`
`1160`	`1160`	`{`
`1161`	`1161`	`filePtr->fileBytesToSend_ -= nSend;`
`1162`		`- filePtr->offset_ += static_cast<off_t>(nSend);`
	`1162`	`+ filePtr->offset_ += nSend;`
`1163`	`1163`	`if (static_cast<size_t>(nSend) < static_cast<size_t>(n))`
`1164`	`1164`	`{`
`1165`	`1165`	`if (!ioChannelPtr_->isWriting())`