version 1.3, 2012/03/15 01:52:23
|
version 1.5.6.2, 2012/05/23 14:06:08
|
Line 62 cf_(struct tagBufIO *buf)
|
Line 62 cf_(struct tagBufIO *buf)
|
} |
} |
|
|
if (buf->buf_mode == BUFIO_MODE_INFINIT) |
if (buf->buf_mode == BUFIO_MODE_INFINIT) |
free(buf->buf_base); | io_free(buf->buf_base); |
else if (buf->buf_unmap) |
else if (buf->buf_unmap) |
buf->buf_unmap(buf); |
buf->buf_unmap(buf); |
|
|
free(buf); | io_free(buf); |
return 0; |
return 0; |
} |
} |
|
|
|
#ifdef __NetBSD__ |
|
static off_t |
|
sf_lim(struct tagBufIO *buf, off_t pos, int w) |
|
#else |
static fpos_t |
static fpos_t |
sf_lim(struct tagBufIO *buf, fpos_t pos, int w) |
sf_lim(struct tagBufIO *buf, fpos_t pos, int w) |
|
#endif |
{ |
{ |
if (!buf) |
if (!buf) |
goto err; |
goto err; |
Line 134 wf_lim(struct tagBufIO *buf, const char *dat, int siz)
|
Line 139 wf_lim(struct tagBufIO *buf, const char *dat, int siz)
|
return siz; |
return siz; |
} |
} |
|
|
|
#ifdef __NetBSD__ |
|
static off_t |
|
sf_inf(struct tagBufIO *buf, off_t pos, int w) |
|
#else |
static fpos_t |
static fpos_t |
sf_inf(struct tagBufIO *buf, fpos_t pos, int w) |
sf_inf(struct tagBufIO *buf, fpos_t pos, int w) |
|
#endif |
{ |
{ |
void *b; |
void *b; |
|
|
Line 147 sf_inf(struct tagBufIO *buf, fpos_t pos, int w)
|
Line 157 sf_inf(struct tagBufIO *buf, fpos_t pos, int w)
|
if (pos < 0) |
if (pos < 0) |
goto err; |
goto err; |
if (buf->buf_size < pos) { |
if (buf->buf_size < pos) { |
b = realloc(buf->buf_base, pos); | b = io_realloc(buf->buf_base, pos); |
if (!b) { |
if (!b) { |
LOGERR; |
LOGERR; |
return -1; |
return -1; |
Line 163 sf_inf(struct tagBufIO *buf, fpos_t pos, int w)
|
Line 173 sf_inf(struct tagBufIO *buf, fpos_t pos, int w)
|
if ((buf->buf_offset + pos) < 0) |
if ((buf->buf_offset + pos) < 0) |
goto err; |
goto err; |
if (buf->buf_size < (buf->buf_offset + pos)) { |
if (buf->buf_size < (buf->buf_offset + pos)) { |
b = realloc(buf->buf_base, buf->buf_offset + pos); | b = io_realloc(buf->buf_base, buf->buf_offset + pos); |
if (!b) { |
if (!b) { |
LOGERR; |
LOGERR; |
return -1; |
return -1; |
Line 180 sf_inf(struct tagBufIO *buf, fpos_t pos, int w)
|
Line 190 sf_inf(struct tagBufIO *buf, fpos_t pos, int w)
|
if ((buf->buf_size + pos) < 0) |
if ((buf->buf_size + pos) < 0) |
goto err; |
goto err; |
if (buf->buf_size < (buf->buf_size + pos)) { |
if (buf->buf_size < (buf->buf_size + pos)) { |
b = realloc(buf->buf_base, buf->buf_size + pos); | b = io_realloc(buf->buf_base, buf->buf_size + pos); |
if (!b) { |
if (!b) { |
LOGERR; |
LOGERR; |
return -1; |
return -1; |
Line 214 wf_inf(struct tagBufIO *buf, const char *dat, int siz)
|
Line 224 wf_inf(struct tagBufIO *buf, const char *dat, int siz)
|
} |
} |
|
|
if (buf->buf_offset + siz > buf->buf_size) { |
if (buf->buf_offset + siz > buf->buf_size) { |
b = realloc(buf->buf_base, buf->buf_offset + siz); | b = io_realloc(buf->buf_base, buf->buf_offset + siz); |
if (!b) { |
if (!b) { |
LOGERR; |
LOGERR; |
return -1; |
return -1; |
Line 233 wf_inf(struct tagBufIO *buf, const char *dat, int siz)
|
Line 243 wf_inf(struct tagBufIO *buf, const char *dat, int siz)
|
|
|
|
|
/* |
/* |
* io_fmemopen() File buffered stream operations over memory block | * io_fmemopen() - File buffered stream operations over memory block |
* |
* |
* @base = Base address of memory block, if =NULL Infinit length(auto-grow) |
* @base = Base address of memory block, if =NULL Infinit length(auto-grow) |
* @basesize = Size of memory block |
* @basesize = Size of memory block |
Line 250 io_fmemopen(void ** __restrict base, off_t basesize)
|
Line 260 io_fmemopen(void ** __restrict base, off_t basesize)
|
return NULL; |
return NULL; |
} |
} |
|
|
buf = malloc(sizeof(struct tagBufIO)); | buf = io_malloc(sizeof(struct tagBufIO)); |
if (!buf) { |
if (!buf) { |
LOGERR; |
LOGERR; |
return NULL; |
return NULL; |
Line 258 io_fmemopen(void ** __restrict base, off_t basesize)
|
Line 268 io_fmemopen(void ** __restrict base, off_t basesize)
|
memset(buf, 0, sizeof(struct tagBufIO)); |
memset(buf, 0, sizeof(struct tagBufIO)); |
|
|
if (!*base) { |
if (!*base) { |
*base = malloc(basesize); | *base = io_malloc(basesize); |
if (!*base) { |
if (!*base) { |
LOGERR; |
LOGERR; |
free(buf); | io_free(buf); |
return NULL; |
return NULL; |
} else |
} else |
memset(*base, 0, basesize); |
memset(*base, 0, basesize); |
Line 273 io_fmemopen(void ** __restrict base, off_t basesize)
|
Line 283 io_fmemopen(void ** __restrict base, off_t basesize)
|
buf->buf_base = *base; |
buf->buf_base = *base; |
buf->buf_size = basesize; |
buf->buf_size = basesize; |
|
|
|
#ifdef __NetBSD__ |
if (buf->buf_mode == BUFIO_MODE_INFINIT) |
if (buf->buf_mode == BUFIO_MODE_INFINIT) |
f = funopen(buf, (int (*)(void *, char *, int)) rf_lim, |
f = funopen(buf, (int (*)(void *, char *, int)) rf_lim, |
(int (*)(void *, char const *, int)) wf_inf, |
(int (*)(void *, char const *, int)) wf_inf, |
|
(off_t (*)(void *, off_t, int)) sf_inf, |
|
(int (*)(void *)) cf_); |
|
else |
|
f = funopen(buf, (int (*)(void *, char *, int)) rf_lim, |
|
(int (*)(void *, char const *, int)) wf_lim, |
|
(off_t (*)(void *, off_t, int)) sf_lim, |
|
(int (*)(void *)) cf_); |
|
#else |
|
if (buf->buf_mode == BUFIO_MODE_INFINIT) |
|
f = funopen(buf, (int (*)(void *, char *, int)) rf_lim, |
|
(int (*)(void *, char const *, int)) wf_inf, |
(fpos_t (*)(void *, fpos_t, int)) sf_inf, |
(fpos_t (*)(void *, fpos_t, int)) sf_inf, |
(int (*)(void *)) cf_); |
(int (*)(void *)) cf_); |
else |
else |
Line 283 io_fmemopen(void ** __restrict base, off_t basesize)
|
Line 305 io_fmemopen(void ** __restrict base, off_t basesize)
|
(int (*)(void *, char const *, int)) wf_lim, |
(int (*)(void *, char const *, int)) wf_lim, |
(fpos_t (*)(void *, fpos_t, int)) sf_lim, |
(fpos_t (*)(void *, fpos_t, int)) sf_lim, |
(int (*)(void *)) cf_); |
(int (*)(void *)) cf_); |
|
#endif |
if (!f) { |
if (!f) { |
LOGERR; |
LOGERR; |
if (buf->buf_mode == BUFIO_MODE_INFINIT) { |
if (buf->buf_mode == BUFIO_MODE_INFINIT) { |
free(*base); | io_free(*base); |
*base = NULL; |
*base = NULL; |
} |
} |
free(buf); | io_free(buf); |
return NULL; |
return NULL; |
} |
} |
|
|
Line 297 io_fmemopen(void ** __restrict base, off_t basesize)
|
Line 320 io_fmemopen(void ** __restrict base, off_t basesize)
|
} |
} |
|
|
/* |
/* |
* io_fmapopen() File buffered stream operations over MMAP block | * io_fmapopen() - File buffered stream operations over MMAP block |
* |
* |
* @csFile = Filename for MMAP, if =NULL private MMAP block |
* @csFile = Filename for MMAP, if =NULL private MMAP block |
* @mode = File open mode |
* @mode = File open mode |
Line 350 io_fmapopen(const char *csFile, int mode, int perm, in
|
Line 373 io_fmapopen(const char *csFile, int mode, int perm, in
|
} |
} |
|
|
|
|
buf = malloc(sizeof(struct tagBufIO)); | buf = io_malloc(sizeof(struct tagBufIO)); |
if (!buf) { |
if (!buf) { |
LOGERR; |
LOGERR; |
munmap(base, basesize); |
munmap(base, basesize); |
Line 363 io_fmapopen(const char *csFile, int mode, int perm, in
|
Line 386 io_fmapopen(const char *csFile, int mode, int perm, in
|
buf->buf_size = basesize; |
buf->buf_size = basesize; |
buf->buf_unmap = unmap_cf; |
buf->buf_unmap = unmap_cf; |
|
|
|
#ifdef __NetBSD__ |
f = funopen(buf, (int (*)(void *, char *, int)) rf_lim, |
f = funopen(buf, (int (*)(void *, char *, int)) rf_lim, |
(int (*)(void *, char const *, int)) wf_lim, |
(int (*)(void *, char const *, int)) wf_lim, |
|
(off_t (*)(void *, off_t, int)) sf_lim, |
|
(int (*)(void *)) cf_); |
|
#else |
|
f = funopen(buf, (int (*)(void *, char *, int)) rf_lim, |
|
(int (*)(void *, char const *, int)) wf_lim, |
(fpos_t (*)(void *, fpos_t, int)) sf_lim, |
(fpos_t (*)(void *, fpos_t, int)) sf_lim, |
(int (*)(void *)) cf_); |
(int (*)(void *)) cf_); |
|
#endif |
if (!f) { |
if (!f) { |
LOGERR; |
LOGERR; |
free(buf); | io_free(buf); |
munmap(base, basesize); |
munmap(base, basesize); |
return NULL; |
return NULL; |
} |
} |
Line 378 io_fmapopen(const char *csFile, int mode, int perm, in
|
Line 408 io_fmapopen(const char *csFile, int mode, int perm, in
|
} |
} |
|
|
/* |
/* |
* io_dumbFile() Create empry or dumb file with fixed size | * io_dumbFile() - Create empry or dumb file with fixed size |
* |
* |
* @csFile = Filename for create |
* @csFile = Filename for create |
* @mode = File access permissions |
* @mode = File access permissions |
Line 411 err:
|
Line 441 err:
|
} |
} |
|
|
/* |
/* |
* io_fd2buf() Convert open file handle to buffered file I/O | * io_fd2buf() - Convert open file handle to buffered file I/O |
* |
* |
* @fd = File handle |
* @fd = File handle |
* @mode = Permissions for new buffered file I/O |
* @mode = Permissions for new buffered file I/O |