add isc_stdio_tell, add missing comma

(cherry picked from commit 793a8c9aa29986422e7bae75dc5e65f201081a57)

diff --git a/lib/isc/win32/socket.c b/lib/isc/win32/socket.c
index 00c040532460b0dfa2db8db5ee0712951f830f06..a9fc21f7e7a3c0c1bdc964a3a89e51f98acac2b9 100644 (file)
--- a/lib/isc/win32/socket.c
+++ b/lib/isc/win32/socket.c
@@ -3048,7 +3048,7 @@ isc__socket_sendtov(isc_socket_t *sock, isc_bufferlist_t *buflist,
 isc_result_t
 isc__socket_sendtov2(isc_socket_t *sock, isc_bufferlist_t *buflist,
                     isc_task_t *task, isc_taskaction_t action, const void *arg,
-                    isc_sockaddr_t *address, struct in6_pktinfo *pktinfo
+                    isc_sockaddr_t *address, struct in6_pktinfo *pktinfo,
                     unsigned int flags)
 {
        isc_socketevent_t *dev;

diff --git a/lib/isc/win32/stdio.c b/lib/isc/win32/stdio.c
index 50e473835e9483ae9408477f5db3eb62a622fb71..6f65fdbf7e9c06ed5ff83fca6f6862f8277ddd22 100644 (file)
--- a/lib/isc/win32/stdio.c
+++ b/lib/isc/win32/stdio.c
@@ -23,6 +23,7 @@
 #include <errno.h>
 
 #include <isc/stdio.h>
+#include <isc/util.h>
 
 #include "errno2result.h"
 
@@ -63,6 +64,28 @@ isc_stdio_seek(FILE *f, off_t offset, int whence) {
                return (isc__errno2result(errno));
 }
 
+isc_result_t
+isc_stdio_tell(FILE *f, off_t *offsetp) {
+#ifndef _WIN64
+       long r;
+#else
+       __int64 r;
+#endif
+
+       REQUIRE(offsetp != NULL);
+
+#ifndef _WIN64
+       r = ftell(f);
+#else
+       r = _ftelli64(f);
+#endif
+       if (r >= 0) {
+               *offsetp = r;
+               return (ISC_R_SUCCESS);
+       } else
+               return (isc__errno2result(errno));
+}
+
 isc_result_t
 isc_stdio_read(void *ptr, size_t size, size_t nmemb, FILE *f, size_t *nret) {
        isc_result_t result = ISC_R_SUCCESS;