Merge v2.056

This commit is contained in:
Alexey Prokhin
2011-11-01 10:47:30 +04:00
parent 423076dd82
commit b52c224d57
62 changed files with 6486 additions and 943 deletions

View File

@@ -12,7 +12,6 @@
#include <process.h>
#include "root.h"
#include "rmem.h"
static unsigned __stdcall startthread(void *p);
@@ -41,7 +40,7 @@ struct AsyncRead
AsyncRead *AsyncRead::create(size_t nfiles)
{
AsyncRead *aw = (AsyncRead *)mem.calloc(1, sizeof(AsyncRead) +
AsyncRead *aw = (AsyncRead *)calloc(1, sizeof(AsyncRead) +
(nfiles - 1) * sizeof(FileData));
aw->filesmax = nfiles;
return aw;
@@ -92,7 +91,7 @@ int AsyncRead::read(size_t i)
void AsyncRead::dispose(AsyncRead *aw)
{
delete aw;
free(aw);
}
@@ -119,7 +118,6 @@ unsigned __stdcall startthread(void *p)
#include <time.h>
#include "root.h"
#include "rmem.h"
void *startthread(void *arg);
@@ -155,7 +153,7 @@ struct AsyncRead
AsyncRead *AsyncRead::create(size_t nfiles)
{
AsyncRead *aw = (AsyncRead *)mem.calloc(1, sizeof(AsyncRead) +
AsyncRead *aw = (AsyncRead *)calloc(1, sizeof(AsyncRead) +
(nfiles - 1) * sizeof(FileData));
aw->filesmax = nfiles;
return aw;
@@ -228,7 +226,7 @@ void AsyncRead::dispose(AsyncRead *aw)
if (status != 0)
err_abort(status, "mutex destroy");
}
delete aw;
free(aw);
}
@@ -265,7 +263,6 @@ void *startthread(void *p)
#include <errno.h>
#include "root.h"
#include "rmem.h"
struct FileData
{
@@ -292,7 +289,7 @@ struct AsyncRead
AsyncRead *AsyncRead::create(size_t nfiles)
{
AsyncRead *aw = (AsyncRead *)mem.calloc(1, sizeof(AsyncRead) +
AsyncRead *aw = (AsyncRead *)calloc(1, sizeof(AsyncRead) +
(nfiles - 1) * sizeof(FileData));
aw->filesmax = nfiles;
return aw;
@@ -322,7 +319,7 @@ int AsyncRead::read(size_t i)
void AsyncRead::dispose(AsyncRead *aw)
{
delete aw;
free(aw);
}
#endif