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

Fix prev commit

Browse Source
vmware
Howard Chu 12 years ago
parent c68e5ae9be
commit ad573fe125
1 changed files with 4 additions and 5 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. 9
      libraries/liblmdb/mdb.c

9
libraries/liblmdb/mdb.c
Unescape View File

@ -3631,7 +3631,6 @@ mdb_env_copyfd(MDB_env *env, int fd)
int rc; int rc;
size_t wsize; size_t wsize;
char *ptr; char *ptr;
HANDLE newfd = INVALID_HANDLE_VALUE;
/* Do the lock/unlock of the reader mutex before starting the /* Do the lock/unlock of the reader mutex before starting the
* write txn. Otherwise other read txns could block writers. * write txn. Otherwise other read txns could block writers.
@ -3658,11 +3657,11 @@ mdb_env_copyfd(MDB_env *env, int fd)
#ifdef _WIN32 #ifdef _WIN32
{ {
DWORD len; DWORD len;
rc = WriteFile(newfd, env->me_map, wsize, &len, NULL); rc = WriteFile(fd, env->me_map, wsize, &len, NULL);
rc = (len == wsize) ? MDB_SUCCESS : ErrCode(); rc = (len == wsize) ? MDB_SUCCESS : ErrCode();
} }
#else #else
rc = write(newfd, env->me_map, wsize); rc = write(fd, env->me_map, wsize);
rc = (rc == (int)wsize) ? MDB_SUCCESS : ErrCode(); rc = (rc == (int)wsize) ? MDB_SUCCESS : ErrCode();
#endif #endif
if (env->me_txns) if (env->me_txns)
@ -3681,7 +3680,7 @@ mdb_env_copyfd(MDB_env *env, int fd)
w2 = MAX_WRITE; w2 = MAX_WRITE;
else else
w2 = wsize; w2 = wsize;
rc = WriteFile(newfd, ptr, w2, &len, NULL); rc = WriteFile(fd, ptr, w2, &len, NULL);
rc = (len == w2) ? MDB_SUCCESS : ErrCode(); rc = (len == w2) ? MDB_SUCCESS : ErrCode();
if (rc) break; if (rc) break;
wsize -= w2; wsize -= w2;
@ -3695,7 +3694,7 @@ mdb_env_copyfd(MDB_env *env, int fd)
w2 = MAX_WRITE; w2 = MAX_WRITE;
else else
w2 = wsize; w2 = wsize;
wres = write(newfd, ptr, w2); wres = write(fd, ptr, w2);
rc = (wres > 0) ? MDB_SUCCESS : ErrCode(); rc = (wres > 0) ? MDB_SUCCESS : ErrCode();
if (rc) break; if (rc) break;
wsize -= wres; wsize -= wres;

Write Preview
Loading…
Cancel
Save