From 4af5727d181e7a77b358751202246382d8aefba6 Mon Sep 17 00:00:00 2001
From: Xavier Leroy <xavier.leroy@inria.fr>
Date: Wed, 18 Oct 2006 08:26:54 +0000
Subject: PR#4097: suite
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@7697 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
---
otherlibs/win32unix/write.c | 19 ++++++++++---------
1 file changed, 10 insertions(+), 9 deletions(-)
(limited to 'otherlibs/win32unix/write.c')
diff --git a/otherlibs/win32unix/write.c b/otherlibs/win32unix/write.c
index 284a4755b..ac7daa7b0 100644
--- a/otherlibs/win32unix/write.c
+++ b/otherlibs/win32unix/write.c
@@ -25,7 +25,7 @@ CAMLprim value unix_write(value fd, value buf, value vofs, value vlen)
intnat ofs, len, written;
DWORD numbytes, numwritten;
char iobuf[UNIX_BUFFER_SIZE];
- DWORD errcode = 0;
+ DWORD err = 0;
Begin_root (buf);
ofs = Long_val(vofs);
@@ -39,18 +39,18 @@ CAMLprim value unix_write(value fd, value buf, value vofs, value vlen)
SOCKET s = Socket_val(fd);
enter_blocking_section();
ret = send(s, iobuf, numbytes, 0);
- if (ret == SOCKET_ERROR) errcode = WSAGetLastError();
+ if (ret == SOCKET_ERROR) err = WSAGetLastError();
leave_blocking_section();
numwritten = ret;
} else {
HANDLE h = Handle_val(fd);
enter_blocking_section();
if (! WriteFile(h, iobuf, numbytes, &numwritten, NULL))
- errcode = GetLastError();
+ err = GetLastError();
leave_blocking_section();
}
- if (errcode) {
- win32_maperr(errcode);
+ if (err) {
+ win32_maperr(err);
uerror("write", Nothing);
}
written += numwritten;
@@ -66,6 +66,7 @@ CAMLprim value unix_single_write(value fd, value buf, value vofs, value vlen)
intnat ofs, len, written;
DWORD numbytes, numwritten;
char iobuf[UNIX_BUFFER_SIZE];
+ DWORD err;
Begin_root (buf);
ofs = Long_val(vofs);
@@ -79,18 +80,18 @@ CAMLprim value unix_single_write(value fd, value buf, value vofs, value vlen)
SOCKET s = Socket_val(fd);
enter_blocking_section();
ret = send(s, iobuf, numbytes, 0);
- if (ret == SOCKET_ERROR) errcode = WSAGetLastError();
+ if (ret == SOCKET_ERROR) err = WSAGetLastError();
leave_blocking_section();
numwritten = ret;
} else {
HANDLE h = Handle_val(fd);
enter_blocking_section();
if (! WriteFile(h, iobuf, numbytes, &numwritten, NULL))
- errcode = GetLastError();
+ err = GetLastError();
leave_blocking_section();
}
- if (errcode) {
- win32_maperr(errcode);
+ if (err) {
+ win32_maperr(err);
uerror("single_write", Nothing);
}
written = numwritten;
--
cgit v1.2.3-70-g09d2