NextGraph
/
lmdb
mirror of https://github.com/nextgraph-org/lmdb.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ITS#7652 fix I/O error checks

Browse Source 
partial revert of d6d2638acc and
26a25df5fc

The original code was already tested and working correctly.
vmware
Howard Chu 11 years ago
parent acf20f77f3
commit eff35fcb2a
1 changed files with 6 additions and 6 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 12
      libraries/liblmdb/mdb.c

12
libraries/liblmdb/mdb.c
Unescape View File

@ -2980,11 +2980,11 @@ mdb_env_init_meta(MDB_env *env, MDB_meta *meta)
OVERLAPPED ov; OVERLAPPED ov;
memset(&ov, 0, sizeof(ov)); memset(&ov, 0, sizeof(ov));
rc = WriteFile(env->me_fd, p, psize * 2, &len, &ov); rc = WriteFile(env->me_fd, p, psize * 2, &len, &ov);
rc = rc ? (len == psize * 2 ? MDB_SUCCESS : EIO) : ErrCode(); rc = (len == psize * 2 ? MDB_SUCCESS : ErrCode();
} }
#else #else
rc = pwrite(env->me_fd, p, psize * 2, 0); rc = pwrite(env->me_fd, p, psize * 2, 0);
rc = (rc == (int)psize * 2) ? MDB_SUCCESS : rc < 0 ? ErrCode() : EIO; rc = (rc == (int)psize * 2) ? MDB_SUCCESS : ErrCode();
#endif #endif
free(p); free(p);
return rc; return rc;
@ -4034,11 +4034,11 @@ mdb_env_copyfd(MDB_env *env, HANDLE fd)
{ {
DWORD len; DWORD len;
rc = WriteFile(fd, env->me_map, wsize, &len, NULL); rc = WriteFile(fd, env->me_map, wsize, &len, NULL);
rc = rc ? (len == wsize ? MDB_SUCCESS : EIO) : ErrCode(); rc = (len == wsize) ? MDB_SUCCESS : ErrCode();
} }
#else #else
rc = write(fd, env->me_map, wsize); rc = write(fd, env->me_map, wsize);
rc = rc == (int)wsize ? MDB_SUCCESS : rc < 0 ? ErrCode() : EIO; rc = (rc == (int)wsize) ? MDB_SUCCESS : ErrCode();
#endif #endif
if (env->me_txns) if (env->me_txns)
UNLOCK_MUTEX_W(env); UNLOCK_MUTEX_W(env);
@ -4056,7 +4056,7 @@ mdb_env_copyfd(MDB_env *env, HANDLE fd)
else else
w2 = wsize; w2 = wsize;
rc = WriteFile(fd, ptr, w2, &len, NULL); rc = WriteFile(fd, ptr, w2, &len, NULL);
rc = rc ? (len == w2 ? MDB_SUCCESS : EIO) : ErrCode(); rc = (len == w2) ? MDB_SUCCESS : ErrCode();
if (rc) break; if (rc) break;
wsize -= w2; wsize -= w2;
ptr += w2; ptr += w2;
@ -4070,7 +4070,7 @@ mdb_env_copyfd(MDB_env *env, HANDLE fd)
else else
w2 = wsize; w2 = wsize;
wres = write(fd, ptr, w2); wres = write(fd, ptr, w2);
rc = wres == (ssize_t)w2 ? MDB_SUCCESS : wres < 0 ? ErrCode() : EIO; rc = (wres > 0 ) ? MDB_SUCCESS : ErrCode();
if (rc) break; if (rc) break;
wsize -= wres; wsize -= wres;
ptr += wres; ptr += wres;

Write Preview
Loading…
Cancel
Save