mirror/netcdf-c
2
0
Fork 0
mirror of https://github.com/Unidata/netcdf-c.git synced 2025-03-31 17:50:26 +08:00
Code Issues Packages Projects Releases Wiki Activity

Refactored old ENOERR code into NC_NOERR error code in libsrc. This is done in support of https://github.com/Unidata/netcdf-c/issues/213.

Browse Source
This commit is contained in:
Ward Fisher 2016-03-07 10:58:02 -07:00
parent e10ad6bed8
commit fb2ff0c24b
8 changed files with 579 additions and 579 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
libsrc/ffio.c
View File

@ -12,8 +12,8 @@
#include <stdlib.h>
#include <stdio.h> /* DEBUG */
#include <errno.h>
#ifndef ENOERR
#define ENOERR 0
#ifndef NC_NOERR
#define NC_NOERR 0
#endif
#include <fcntl.h>
#include <unistd.h>
@ -81,7 +81,7 @@ fgrow(const int fd, const off_t len)
if (fffcntl(fd, FC_STAT, &sb, &sw) < 0)
return errno;
if (len < sb.st_size)
return ENOERR;
return NC_NOERR;
{
const long dumb = 0;
/* cache current position */
@ -96,7 +96,7 @@ fgrow(const int fd, const off_t len)
return errno;
}
/* else */
return ENOERR;
return NC_NOERR;
}
@ -113,7 +113,7 @@ fgrow2(const int fd, const off_t len)
if (fffcntl(fd, FC_STAT, &sb, &sw) < 0)
return errno;
if (len <= sb.st_size)
return ENOERR;
return NC_NOERR;
{
const char dumb = 0;
/* we don't use ftruncate() due to problem with FAT32 file systems */
@ -128,7 +128,7 @@ fgrow2(const int fd, const off_t len)
if (ffseek(fd, pos, SEEK_SET) < 0)
return errno;
}
return ENOERR;
return NC_NOERR;
}
/* End OS */
/* Begin ffio */
@ -157,7 +157,7 @@ ffio_pgout(ncio *const nciop,
}
*posp += extent;
return ENOERR;
return NC_NOERR;
}
@ -189,14 +189,14 @@ ffio_pgin(ncio *const nciop,
if(nread != extent)
{
status = errno;
if(nread == -1 || status != ENOERR)
if(nread == -1 || status != NC_NOERR)
return status;
/* else it's okay we read 0. */
}
*nreadp = nread;
*posp += nread;
return ENOERR;
return NC_NOERR;
}
/* */
@ -215,7 +215,7 @@ static int
ncio_ffio_rel(ncio *const nciop, off_t offset, int rflags)
{
ncio_ffio *ffp = (ncio_ffio *)nciop->pvt;
int status = ENOERR;
int status = NC_NOERR;
assert(ffp->bf_offset <= offset);
assert(ffp->bf_cnt != 0);
@ -248,7 +248,7 @@ ncio_ffio_get(ncio *const nciop,
void **const vpp)
{
ncio_ffio *ffp = (ncio_ffio *)nciop->pvt;
int status = ENOERR;
int status = NC_NOERR;
#ifdef X_ALIGN
size_t rem;
#endif
@ -299,7 +299,7 @@ ncio_ffio_get(ncio *const nciop,
extent,
ffp->bf_base,
&ffp->bf_cnt, &ffp->pos);
if(status != ENOERR)
if(status != NC_NOERR)
return status;
ffp->bf_offset = offset;
@ -317,7 +317,7 @@ ncio_ffio_get(ncio *const nciop,
#else
*vpp = (char *)ffp->bf_base;
#endif
return ENOERR;
return NC_NOERR;
}
@ -325,7 +325,7 @@ static int
ncio_ffio_move(ncio *const nciop, off_t to, off_t from,
size_t nbytes, int rflags)
{
int status = ENOERR;
int status = NC_NOERR;
off_t lower = from;
off_t upper = to;
char *base;
@ -335,7 +335,7 @@ ncio_ffio_move(ncio *const nciop, off_t to, off_t from,
rflags &= RGN_NOLOCK; /* filter unwanted flags */
if(to == from)
return ENOERR; /* NOOP */
return NC_NOERR; /* NOOP */
if(to > from)
{
@ -356,7 +356,7 @@ ncio_ffio_move(ncio *const nciop, off_t to, off_t from,
status = ncio_ffio_get(nciop, lower, extent, RGN_WRITE|rflags,
(void **)&base);
if(status != ENOERR)
if(status != NC_NOERR)
return status;
if(to > from)
@ -382,7 +382,7 @@ ncio_ffio_sync_noffflush(ncio *const nciop)
/* run some innocuous ffio routine to get if any errno */
if(fffcntl(nciop->fd, FC_STAT, &si, &ffstatus) < 0)
return ffstatus.sw_error;
return ENOERR;
return NC_NOERR;
}
/* this tests to see if the global FFIO layer is being called for
* returns ~0 if it is, else returns 0
@ -408,7 +408,7 @@ ncio_ffio_sync(ncio *const nciop)
if(ffflush(nciop->fd) < 0)
#endif
return errno;
return ENOERR;
return NC_NOERR;
}
static void
@ -448,7 +448,7 @@ ncio_ffio_init2(ncio *const nciop, size_t *sizehintp)
return ENOMEM;
}
/* else */
return ENOERR;
return NC_NOERR;
}
@ -551,7 +551,7 @@ ncio_ffio_assign(const char *filename) {
/* put things into known states */
memset(buffer,'\0',BUFLEN);
errno = ENOERR;
errno = NC_NOERR;
/* set up Fortran character pointers */
#ifdef __crayx1
@ -673,13 +673,13 @@ ffio_create(const char *path, int ioflags,
}
status = ncio_ffio_init2(nciop, sizehintp);
if(status != ENOERR)
if(status != NC_NOERR)
goto unwind_open;
if(initialsz != 0)
{
status = fgrow(fd, (off_t)initialsz);
if(status != ENOERR)
if(status != NC_NOERR)
goto unwind_open;
}
@ -689,12 +689,12 @@ ffio_create(const char *path, int ioflags,
igeto, igetsz,
RGN_WRITE,
igetvpp);
if(status != ENOERR)
if(status != NC_NOERR)
goto unwind_open;
}
*nciopp = nciop;
return ENOERR;
return NC_NOERR;
unwind_open:
(void) ffclose(fd);
@ -765,7 +765,7 @@ ffio_open(const char *path,
}
status = ncio_ffio_init2(nciop, sizehintp);
if(status != ENOERR)
if(status != NC_NOERR)
goto unwind_open;
if(igetsz != 0)
@ -774,12 +774,12 @@ ffio_open(const char *path,
igeto, igetsz,
0,
igetvpp);
if(status != ENOERR)
if(status != NC_NOERR)
goto unwind_open;
}
*nciopp = nciop;
return ENOERR;
return NC_NOERR;
unwind_open:
(void) ffclose(fd);
@ -809,7 +809,7 @@ ncio_ffio_filesize(ncio *nciop, off_t *filesizep)
if(reset != current)
return EINVAL;
return ENOERR;
return NC_NOERR;
}
@ -823,7 +823,7 @@ ncio_ffio_filesize(ncio *nciop, off_t *filesizep)
static int
ncio_ffio_pad_length(ncio *nciop, off_t length)
{
int status = ENOERR;
int status = NC_NOERR;
if(nciop == NULL)
return EINVAL;
@ -832,13 +832,13 @@ ncio_ffio_pad_length(ncio *nciop, off_t length)
return EPERM; /* attempt to write readonly file */
status = nciop->sync(nciop);
if(status != ENOERR)
if(status != NC_NOERR)
return status;
status = fgrow2(nciop->fd, length);
if(status != ENOERR)
if(status != NC_NOERR)
return errno;
return ENOERR;
return NC_NOERR;
}
@ -851,7 +851,7 @@ ncio_ffio_close(ncio *nciop, int doUnlink)
* 2002-07-10.
*/
int status = ENOERR;
int status = NC_NOERR;
if(nciop == NULL)
return EINVAL;

2
libsrc/ncx.h
View File

@ -199,7 +199,7 @@ typedef char schar;
*
* Storage for a single element of internal type is at `ip' argument.
*
* These functions return 0 (ENOERR) when no error occurred,
* These functions return 0 (NC_NOERR) when no error occurred,
* or NC_ERANGE when the value being converted is too large.
* When NC_ERANGE occurs, an undefined (implementation dependent)
* conversion may have occurred.

150
libsrc/ncx.m4
View File

@ -451,7 +451,7 @@ ncx_get_$1_$2(const void *xp, $2 *ip)
get_ix_$1(xp, &xx);
*ip = ($2) xx;
GETF_CheckBND($1, $2)
return ENOERR;
return NC_NOERR;
}
')dnl
@ -467,7 +467,7 @@ ncx_get_$1_$2(const void *xp, $2 *ip)
ifelse(`$3', `1',
``#'if IXsizeof($1) == Isizeof($2) && IXmax($1) == Upcase($2)_MAX
get_ix_$1(xp, (ix_$1 *)ip);
return ENOERR;
return NC_NOERR;
`#'else
')dnl
ix_$1 xx;
@ -477,7 +477,7 @@ GETI_CheckBND($1, $2)
GETI_CheckNeg($1, $2)
ifelse(`$3', `1', ``#'endif
')dnl
return ENOERR;
return NC_NOERR;
}
')dnl
@ -493,7 +493,7 @@ ncx_put_$1_$2(void *xp, const $2 *ip)
ix_$1 xx = (ix_$1)*ip;
put_ix_$1(xp, &xx);
PUTF_CheckBND($1, $2)
return ENOERR;
return NC_NOERR;
}
')dnl
@ -509,7 +509,7 @@ ncx_put_$1_$2(void *xp, const $2 *ip)
ifelse(`$3', `1',
``#'if IXsizeof($1) == Isizeof($2) && IXmax($1) == Upcase($2)_MAX
put_ix_$1(xp, (const ix_$1 *)ip);
return ENOERR;
return NC_NOERR;
`#'else
')dnl
ix_$1 xx = (ix_$1)*ip;
@ -518,7 +518,7 @@ PUTI_CheckBND($1, $2)
PUTI_CheckNeg($1, $2)
ifelse(`$3', `1', ``#'endif
')dnl
return ENOERR;
return NC_NOERR;
}
')dnl
@ -593,7 +593,7 @@ ncx_put_short_schar(void *xp, const schar *ip)
else
*cp++ = 0;
*cp = (uchar)(signed)*ip;
return ENOERR;
return NC_NOERR;
}
static int
@ -602,7 +602,7 @@ ncx_put_short_uchar(void *xp, const uchar *ip)
uchar *cp = (uchar *) xp;
*cp++ = 0;
*cp = *ip;
return ENOERR;
return NC_NOERR;
}
static NCX_PUT1I(short, short, 1)
@ -681,7 +681,7 @@ ncx_put_ushort_schar(void *xp, const schar *ip)
*cp = (uchar)(signed)*ip;
if (*ip < 0) return NC_ERANGE;
return ENOERR;
return NC_NOERR;
}
static int
@ -690,7 +690,7 @@ ncx_put_ushort_uchar(void *xp, const uchar *ip)
uchar *cp = (uchar *) xp;
*cp++ = 0;
*cp = *ip;
return ENOERR;
return NC_NOERR;
}
static NCX_PUT1I(ushort, short, 0)
@ -778,7 +778,7 @@ ncx_put_int_schar(void *xp, const schar *ip)
*cp++ = 0x00;
}
*cp = (uchar)(signed)*ip;
return ENOERR;
return NC_NOERR;
}
static int
@ -789,7 +789,7 @@ ncx_put_int_uchar(void *xp, const uchar *ip)
*cp++ = 0x00;
*cp++ = 0x00;
*cp = *ip;
return ENOERR;
return NC_NOERR;
}
static NCX_PUT1I(int, short, 1)
@ -868,7 +868,7 @@ ncx_put_uint_schar(void *xp, const schar *ip)
if (*ip < 0) return NC_ERANGE;
return ENOERR;
return NC_NOERR;
}
static int
@ -879,7 +879,7 @@ ncx_put_uint_uchar(void *xp, const uchar *ip)
*cp++ = 0x00;
*cp++ = 0x00;
*cp = *ip;
return ENOERR;
return NC_NOERR;
}
#if X_SIZEOF_UINT != SIZEOF_UINT
@ -1310,7 +1310,7 @@ ncx_get_float_float(const void *xp, float *ip)
{
/* TODO */
get_ix_float(xp, ip);
return ENOERR;
return NC_NOERR;
}
#endif
@ -1335,7 +1335,7 @@ ncx_put_float_float(void *xp, const float *ip)
if(*ip > X_FLOAT_MAX || *ip < X_FLOAT_MIN)
return NC_ERANGE;
#endif
return ENOERR;
return NC_NOERR;
}
#endif
@ -1645,7 +1645,7 @@ ncx_get_double_ulonglong(const void *xp, unsigned long long *ip)
*ip = (unsigned long long) xx;
if(xx > ULONG_LONG_MAX || xx < 0)
return NC_ERANGE;
return ENOERR;
return NC_NOERR;
}
static int
@ -1664,7 +1664,7 @@ ncx_get_double_float(const void *xp, float *ip)
return NC_ERANGE;
}
*ip = (float) xx;
return ENOERR;
return NC_NOERR;
}
#if X_SIZEOF_DOUBLE != SIZEOF_DOUBLE || defined(NO_IEEE_FLOAT)
@ -1673,7 +1673,7 @@ ncx_get_double_double(const void *xp, double *ip)
{
/* TODO */
get_ix_double(xp, ip);
return ENOERR;
return NC_NOERR;
}
#endif
@ -1695,7 +1695,7 @@ ncx_put_double_float(void *xp, const float *ip)
if((double)(*ip) > X_DOUBLE_MAX || (double)(*ip) < X_DOUBLE_MIN)
return NC_ERANGE;
#endif
return ENOERR;
return NC_NOERR;
}
#if X_SIZEOF_DOUBLE != SIZEOF_DOUBLE || defined(NO_IEEE_FLOAT)
@ -1707,7 +1707,7 @@ ncx_put_double_double(void *xp, const double *ip)
if(*ip > X_DOUBLE_MAX || *ip < X_DOUBLE_MIN)
return NC_ERANGE;
#endif
return ENOERR;
return NC_NOERR;
}
#endif
@ -1874,7 +1874,7 @@ ncx_put_size_t(void **xpp, const size_t *ulp)
*cp = (uchar)((*ulp) & 0x000000ff);
*xpp = (void *)((char *)(*xpp) + X_SIZEOF_SIZE_T);
return ENOERR;
return NC_NOERR;
}
int
@ -1889,7 +1889,7 @@ ncx_get_size_t(const void **xpp, size_t *ulp)
*ulp |= *cp;
*xpp = (const void *)((const char *)(*xpp) + X_SIZEOF_SIZE_T);
return ENOERR;
return NC_NOERR;
}
/* x_off_t */
@ -1936,7 +1936,7 @@ ncx_put_off_t(void **xpp, const off_t *lp, size_t sizeof_off_t)
#endif
}
*xpp = (void *)((char *)(*xpp) + sizeof_off_t);
return ENOERR;
return NC_NOERR;
}
int
@ -1993,7 +1993,7 @@ ncx_get_off_t(const void **xpp, off_t *lp, size_t sizeof_off_t)
#endif
}
*xpp = (const void *)((const char *)(*xpp) + sizeof_off_t);
return ENOERR;
return NC_NOERR;
}
/*----< ncx_get_int32() >--------------------------------------------------*/
@ -2110,7 +2110,7 @@ define(`NCX_GETN_Byte_Body',dnl
`dnl
(void) memcpy(tp, *xpp, nelems);
*xpp = (void *)((schar *)(*xpp) + nelems);
return ENOERR;
return NC_NOERR;
')dnl
dnl dnl dnl
dnl
@ -2126,7 +2126,7 @@ define(`NCX_PAD_GETN_Byte_Body',dnl
(void) memcpy(tp, *xpp, nelems);
*xpp = (void *)((char *)(*xpp) + nelems + rndup);
return ENOERR;
return NC_NOERR;
')dnl
dnl dnl dnl
dnl
@ -2137,7 +2137,7 @@ define(`NCX_GETN_CHAR',dnl
int
ncx_getn_$1_$2(const void **xpp, size_t nelems, $2 *tp)
{
int status = ENOERR;
int status = NC_NOERR;
$1 *xp = ($1 *)(*xpp);
while(nelems-- != 0)
@ -2159,7 +2159,7 @@ define(`NCX_PAD_GETN_CHAR',dnl
int
ncx_pad_getn_$1_$2(const void **xpp, size_t nelems, $2 *tp)
{
int status = ENOERR;
int status = NC_NOERR;
size_t rndup = nelems % X_ALIGN;
$1 *xp = ($1 *) *xpp;
@ -2186,14 +2186,14 @@ int
ncx_getn_$1_$2(const void **xpp, size_t nelems, $2 *tp)
{
const char *xp = (const char *) *xpp;
int status = ENOERR;
int status = NC_NOERR;
$1 xx;
for( ; nelems != 0; nelems--, xp += Xsizeof($1), tp++)
{
const int lstatus = ncx_get_$1_$1(xp, &xx);
*tp = ($2)xx;
if(lstatus != ENOERR)
if(lstatus != NC_NOERR)
status = lstatus;
}
@ -2254,16 +2254,16 @@ ncx_getn_$1_$2(const void **xpp, size_t nelems, $2 *tp)
tp += ni;
*xpp = (void*)xp;
}
return nrange == 0 ? ENOERR : NC_ERANGE;
return nrange == 0 ? NC_NOERR : NC_ERANGE;
#else /* not SX */
const char *xp = (const char *) *xpp;
int status = ENOERR;
int status = NC_NOERR;
for( ; nelems != 0; nelems--, xp += Xsizeof($1), tp++)
{
const int lstatus = ncx_get_$1_$2(xp, tp);
if(lstatus != ENOERR)
if(lstatus != NC_NOERR)
status = lstatus;
}
@ -2284,12 +2284,12 @@ ncx_pad_getn_$1_$2(const void **xpp, size_t nelems, $2 *tp)
const size_t rndup = nelems % 2;
const char *xp = (const char *) *xpp;
int status = ENOERR;
int status = NC_NOERR;
for( ; nelems != 0; nelems--, xp += Xsizeof($1), tp++)
{
const int lstatus = ncx_get_$1_$2(xp, tp);
if(lstatus != ENOERR)
if(lstatus != NC_NOERR)
status = lstatus;
}
@ -2308,7 +2308,7 @@ define(`NCX_PUTN_Byte_Body',dnl
(void) memcpy(*xpp, tp, nelems);
*xpp = (void *)((char *)(*xpp) + nelems);
return ENOERR;
return NC_NOERR;
')dnl
dnl dnl dnl
dnl
@ -2329,7 +2329,7 @@ define(`NCX_PAD_PUTN_Byte_Body',dnl
*xpp = (void *)((char *)(*xpp) + rndup);
}
return ENOERR;
return NC_NOERR;
`dnl
')dnl
dnl dnl dnl
@ -2341,7 +2341,7 @@ define(`NCX_PUTN_CHAR',dnl
int
ncx_putn_$1_$2(void **xpp, size_t nelems, const $2 *tp)
{
int status = ENOERR;
int status = NC_NOERR;
$1 *xp = ($1 *) *xpp;
while(nelems-- != 0)
@ -2364,7 +2364,7 @@ define(`NCX_PAD_PUTN_CHAR',dnl
int
ncx_pad_putn_$1_$2(void **xpp, size_t nelems, const $2 *tp)
{
int status = ENOERR;
int status = NC_NOERR;
size_t rndup = nelems % X_ALIGN;
$1 *xp = ($1 *) *xpp;
@ -2399,7 +2399,7 @@ int
ncx_putn_$1_$2(void **xpp, size_t nelems, const $2 *tp)
{
char *xp = (char *) *xpp;
int status = ENOERR;
int status = NC_NOERR;
$1 xx;
for( ; nelems != 0; nelems--, xp += Xsizeof($1), tp++)
@ -2407,7 +2407,7 @@ ncx_putn_$1_$2(void **xpp, size_t nelems, const $2 *tp)
xx = ($1) *tp;
{
int lstatus = ncx_put_$1_$1(xp, &xx);
if(lstatus != ENOERR)
if(lstatus != NC_NOERR)
status = lstatus;
}
}
@ -2486,17 +2486,17 @@ ifelse( $1$2, intfloat,dnl
tp += ni;
*xpp = (void*)xp;
}
return nrange == 0 ? ENOERR : NC_ERANGE;
return nrange == 0 ? NC_NOERR : NC_ERANGE;
#else /* not SX */
char *xp = (char *) *xpp;
int status = ENOERR;
int status = NC_NOERR;
for( ; nelems != 0; nelems--, xp += Xsizeof($1), tp++)
{
int lstatus = ncx_put_$1_$2(xp, tp);
if(lstatus != ENOERR)
if(lstatus != NC_NOERR)
status = lstatus;
}
@ -2517,12 +2517,12 @@ ncx_pad_putn_$1_$2(void **xpp, size_t nelems, const $2 *tp)
const size_t rndup = nelems % 2;
char *xp = (char *) *xpp;
int status = ENOERR;
int status = NC_NOERR;
for( ; nelems != 0; nelems--, xp += Xsizeof($1), tp++)
{
int lstatus = ncx_put_$1_$2(xp, tp);
if(lstatus != ENOERR)
if(lstatus != NC_NOERR)
status = lstatus;
}
@ -2729,7 +2729,7 @@ ncx_getn_short_short(const void **xpp, size_t nelems, short *tp)
swapn2b(tp, *xpp, nelems);
# endif
*xpp = (const void *)((const char *)(*xpp) + nelems * X_SIZEOF_SHORT);
return ENOERR;
return NC_NOERR;
}
#else
NCX_GETN(short, short)
@ -2766,7 +2766,7 @@ ncx_putn_short_short(void **xpp, size_t nelems, const short *tp)
swapn2b(*xpp, tp, nelems);
# endif
*xpp = (void *)((char *)(*xpp) + nelems * X_SIZEOF_SHORT);
return ENOERR;
return NC_NOERR;
}
#else
NCX_PUTN(short, short)
@ -2806,7 +2806,7 @@ ncx_getn_ushort_ushort(const void **xpp, size_t nelems, unsigned short *tp)
swapn2b(tp, *xpp, nelems);
# endif
*xpp = (const void *)((const char *)(*xpp) + nelems * X_SIZEOF_USHORT);
return ENOERR;
return NC_NOERR;
}
#else
NCX_GETN(ushort, ushort)
@ -2843,7 +2843,7 @@ ncx_putn_ushort_ushort(void **xpp, size_t nelems, const unsigned short *tp)
swapn2b(*xpp, tp, nelems);
# endif
*xpp = (void *)((char *)(*xpp) + nelems * X_SIZEOF_USHORT);
return ENOERR;
return NC_NOERR;
}
#else
NCX_PUTN(ushort, ushort)
@ -2883,7 +2883,7 @@ ncx_getn_int_int(const void **xpp, size_t nelems, int *tp)
swapn4b(tp, *xpp, nelems);
# endif
*xpp = (const void *)((const char *)(*xpp) + nelems * X_SIZEOF_INT);
return ENOERR;
return NC_NOERR;
}
#else
NCX_GETN(int, int)
@ -2909,7 +2909,7 @@ ncx_putn_int_int(void **xpp, size_t nelems, const int *tp)
swapn4b(*xpp, tp, nelems);
# endif
*xpp = (void *)((char *)(*xpp) + nelems * X_SIZEOF_INT);
return ENOERR;
return NC_NOERR;
}
#else
NCX_PUTN(int, int)
@ -2937,7 +2937,7 @@ ncx_getn_uint_uint(const void **xpp, size_t nelems, unsigned int *tp)
swapn4b(tp, *xpp, nelems);
# endif
*xpp = (const void *)((const char *)(*xpp) + nelems * X_SIZEOF_UINT);
return ENOERR;
return NC_NOERR;
}
#else
NCX_GETN(uint, uint)
@ -2963,7 +2963,7 @@ ncx_putn_uint_uint(void **xpp, size_t nelems, const unsigned int *tp)
swapn4b(*xpp, tp, nelems);
# endif
*xpp = (void *)((char *)(*xpp) + nelems * X_SIZEOF_UINT);
return ENOERR;
return NC_NOERR;
}
#else
NCX_PUTN(uint, uint)
@ -2992,7 +2992,7 @@ ncx_getn_float_float(const void **xpp, size_t nelems, float *tp)
swapn4b(tp, *xpp, nelems);
# endif
*xpp = (const void *)((const char *)(*xpp) + nelems * X_SIZEOF_FLOAT);
return ENOERR;
return NC_NOERR;
}
#elif vax
int
@ -3007,19 +3007,19 @@ GET_VAX_DFLOAT_Body(`(*xpp)')
ip++;
*xpp = (char *)(*xpp) + X_SIZEOF_FLOAT;
}
return ENOERR;
return NC_NOERR;
}
#else
int
ncx_getn_float_float(const void **xpp, size_t nelems, float *tp)
{
const char *xp = *xpp;
int status = ENOERR;
int status = NC_NOERR;
for( ; nelems != 0; nelems--, xp += X_SIZEOF_FLOAT, tp++)
{
const int lstatus = ncx_get_float_float(xp, tp);
if(lstatus != ENOERR)
if(lstatus != NC_NOERR)
status = lstatus;
}
@ -3049,7 +3049,7 @@ ncx_putn_float_float(void **xpp, size_t nelems, const float *tp)
swapn4b(*xpp, tp, nelems);
# endif
*xpp = (void *)((char *)(*xpp) + nelems * X_SIZEOF_FLOAT);
return ENOERR;
return NC_NOERR;
}
#elif vax
int
@ -3064,19 +3064,19 @@ PUT_VAX_DFLOAT_Body(`(*xpp)')
ip++;
*xpp = (char *)(*xpp) + X_SIZEOF_FLOAT;
}
return ENOERR;
return NC_NOERR;
}
#else
int
ncx_putn_float_float(void **xpp, size_t nelems, const float *tp)
{
char *xp = *xpp;
int status = ENOERR;
int status = NC_NOERR;
for( ; nelems != 0; nelems--, xp += X_SIZEOF_FLOAT, tp++)
{
int lstatus = ncx_put_float_float(xp, tp);
if(lstatus != ENOERR)
if(lstatus != NC_NOERR)
status = lstatus;
}
@ -3107,7 +3107,7 @@ ncx_getn_double_double(const void **xpp, size_t nelems, double *tp)
swapn8b(tp, *xpp, nelems);
# endif
*xpp = (const void *)((const char *)(*xpp) + nelems * X_SIZEOF_DOUBLE);
return ENOERR;
return NC_NOERR;
}
#elif vax
int
@ -3121,7 +3121,7 @@ GET_VAX_DDOUBLE_Body(`(*xpp)')
ip++;
*xpp = (char *)(*xpp) + X_SIZEOF_DOUBLE;
}
return ENOERR;
return NC_NOERR;
}
/* vax */
#else
@ -3129,12 +3129,12 @@ int
ncx_getn_double_double(const void **xpp, size_t nelems, double *tp)
{
const char *xp = *xpp;
int status = ENOERR;
int status = NC_NOERR;
for( ; nelems != 0; nelems--, xp += X_SIZEOF_DOUBLE, tp++)
{
const int lstatus = ncx_get_double_double(xp, tp);
if(lstatus != ENOERR)
if(lstatus != NC_NOERR)
status = lstatus;
}
@ -3163,7 +3163,7 @@ ncx_putn_double_double(void **xpp, size_t nelems, const double *tp)
swapn8b(*xpp, tp, nelems);
# endif
*xpp = (void *)((char *)(*xpp) + nelems * X_SIZEOF_DOUBLE);
return ENOERR;
return NC_NOERR;
}
#elif vax
int
@ -3177,7 +3177,7 @@ PUT_VAX_DDOUBLE_Body(`(*xpp)')
ip++;
*xpp = (char *)(*xpp) + X_SIZEOF_DOUBLE;
}
return ENOERR;
return NC_NOERR;
}
/* vax */
#else
@ -3185,12 +3185,12 @@ int
ncx_putn_double_double(void **xpp, size_t nelems, const double *tp)
{
char *xp = *xpp;
int status = ENOERR;
int status = NC_NOERR;
for( ; nelems != 0; nelems--, xp += X_SIZEOF_DOUBLE, tp++)
{
int lstatus = ncx_put_double_double(xp, tp);
if(lstatus != ENOERR)
if(lstatus != NC_NOERR)
status = lstatus;
}
@ -3222,7 +3222,7 @@ ncx_getn_longlong_longlong(const void **xpp, size_t nelems, long long *tp)
swapn8b(tp, *xpp, nelems);
# endif
*xpp = (const void *)((const char *)(*xpp) + nelems * X_SIZEOF_LONGLONG);
return ENOERR;
return NC_NOERR;
}
#else
NCX_GETN(longlong, longlong)
@ -3248,7 +3248,7 @@ ncx_putn_longlong_longlong(void **xpp, size_t nelems, const long long *tp)
swapn8b(*xpp, tp, nelems);
# endif
*xpp = (void *)((char *)(*xpp) + nelems * X_SIZEOF_LONGLONG);
return ENOERR;
return NC_NOERR;
}
#else
NCX_PUTN(longlong, longlong)
@ -3276,7 +3276,7 @@ ncx_getn_ulonglong_ulonglong(const void **xpp, size_t nelems, unsigned long long
swapn8b(tp, *xpp, nelems);
# endif
*xpp = (const void *)((const char *)(*xpp) + nelems * X_SIZEOF_ULONGLONG);
return ENOERR;
return NC_NOERR;
}
#else
NCX_GETN(ulonglong, ulonglong)
@ -3302,7 +3302,7 @@ ncx_putn_ulonglong_ulonglong(void **xpp, size_t nelems, const unsigned long long
swapn8b(*xpp, tp, nelems);
# endif
*xpp = (void *)((char *)(*xpp) + nelems * X_SIZEOF_ULONGLONG);
return ENOERR;
return NC_NOERR;
}
#else
NCX_PUTN(ulonglong, ulonglong)

520
libsrc/ncx_cray.c
View File

File diff suppressed because it is too large Load Diff

114
libsrc/posixio.c
View File

@ -23,8 +23,8 @@
#include <stdlib.h>
#include <errno.h>
#ifndef ENOERR
#define ENOERR 0
#ifndef NC_NOERR
#define NC_NOERR 0
#endif
#include <sys/types.h>
@ -195,7 +195,7 @@ fgrow(const int fd, const off_t len)
if (fstat(fd, &sb) < 0)
return errno;
if (len < sb.st_size)
return ENOERR;
return NC_NOERR;
{
const long dumb = 0;
/* we don't use ftruncate() due to problem with FAT32 file systems */
@ -210,7 +210,7 @@ fgrow(const int fd, const off_t len)
if (lseek(fd, pos, SEEK_SET) < 0)
return errno;
}
return ENOERR;
return NC_NOERR;
}
@ -236,7 +236,7 @@ fgrow2(const int fd, const off_t len)
size_t file_len = nc_get_filelen(fd);
if(file_len < 0) return errno;
if(len <= file_len)
return ENOERR;
return NC_NOERR;
{
const char dumb = 0;
/* we don't use ftruncate() due to problem with FAT32 file systems */
@ -251,7 +251,7 @@ fgrow2(const int fd, const off_t len)
if (lseek(fd, pos, SEEK_SET) < 0)
return errno;
}
return ENOERR;
return NC_NOERR;
}
/* End OS */
/* Begin px */
@ -307,7 +307,7 @@ px_pgout(ncio *const nciop,
return errno;
*posp += extent;
return ENOERR;
return NC_NOERR;
}
/*! Read in a page of data.
@ -378,7 +378,7 @@ px_pgin(ncio *const nciop,
if(nread != (ssize_t)extent) {
status = errno;
if( nread == -1 || (status != EINTR && status != ENOERR))
if( nread == -1 || (status != EINTR && status != NC_NOERR))
return status;
/* else it's okay we read less than asked for */
(void) memset((char *)vp + nread, 0, (ssize_t)extent - nread);
@ -387,7 +387,7 @@ px_pgin(ncio *const nciop,
*nreadp = nread;
*posp += nread;
return ENOERR;
return NC_NOERR;
}
/* This struct is for POSIX systems, with NC_SHARE not in effect. If
@ -449,7 +449,7 @@ px_rel(ncio_px *const pxp, off_t offset, int rflags)
}
pxp->bf_refcount--;
return ENOERR;
return NC_NOERR;
}
/* This function indicates the file region starting at offset may be
@ -520,7 +520,7 @@ px_get(ncio *const nciop, ncio_px *const pxp,
int rflags,
void **const vpp)
{
int status = ENOERR;
int status = NC_NOERR;
const off_t blkoffset = _RNDDOWN(offset, (off_t)pxp->blksz);
off_t diff = (size_t)(offset - blkoffset);
@ -563,7 +563,7 @@ px_get(ncio *const nciop, ncio_px *const pxp,
middle,
&pxp->bf_cnt,
&pxp->pos);
if(status != ENOERR)
if(status != NC_NOERR)
return status;
pxp->bf_extent = 2 * pxp->blksz;
pxp->bf_cnt += pxp->blksz;
@ -598,7 +598,7 @@ px_get(ncio *const nciop, ncio_px *const pxp,
pxp->blksz,
pxp->bf_base,
&pxp->pos);
if(status != ENOERR)
if(status != NC_NOERR)
return status;
}
pxp->bf_cnt -= pxp->blksz;
@ -617,7 +617,7 @@ px_get(ncio *const nciop, ncio_px *const pxp,
pxp->blksz,
pxp->bf_base,
&pxp->pos);
if(status != ENOERR)
if(status != NC_NOERR)
return status;
}
}
@ -635,7 +635,7 @@ px_get(ncio *const nciop, ncio_px *const pxp,
middle,
&pxp->bf_cnt,
&pxp->pos);
if(status != ENOERR)
if(status != NC_NOERR)
return status;
pxp->bf_extent = 2 * pxp->blksz;
pxp->bf_cnt += pxp->blksz;
@ -663,7 +663,7 @@ px_get(ncio *const nciop, ncio_px *const pxp,
pxp->bf_cnt - pxp->blksz,
middle,
&pxp->pos);
if(status != ENOERR)
if(status != NC_NOERR)
return status;
}
pxp->bf_cnt = pxp->blksz;
@ -682,7 +682,7 @@ px_get(ncio *const nciop, ncio_px *const pxp,
pxp->bf_base,
&pxp->bf_cnt,
&pxp->pos);
if(status != ENOERR)
if(status != NC_NOERR)
return status;
pxp->bf_offset = blkoffset;
if(upper_cnt != 0)
@ -707,7 +707,7 @@ px_get(ncio *const nciop, ncio_px *const pxp,
pxp->bf_cnt,
pxp->bf_base,
&pxp->pos);
if(status != ENOERR)
if(status != NC_NOERR)
return status;
pxp->bf_rflags = 0;
}
@ -719,7 +719,7 @@ pgin:
pxp->bf_base,
&pxp->bf_cnt,
&pxp->pos);
if(status != ENOERR)
if(status != NC_NOERR)
return status;
pxp->bf_offset = blkoffset;
pxp->bf_extent = blkextent;
@ -738,7 +738,7 @@ done:
#else
*vpp = (void *)((signed char*)pxp->bf_base + diff);
#endif
return ENOERR;
return NC_NOERR;
}
/* Request that the region (offset, extent) be made available through
@ -795,7 +795,7 @@ px_double_buffer(ncio *const nciop, off_t to, off_t from,
size_t nbytes, int rflags)
{
ncio_px *const pxp = (ncio_px *)nciop->pvt;
int status = ENOERR;
int status = NC_NOERR;
void *src;
void *dest;
@ -805,7 +805,7 @@ fprintf(stderr, "\tdouble_buffr %ld %ld %ld\n",
#endif
status = px_get(nciop, pxp, to, nbytes, RGN_WRITE,
&dest);
if(status != ENOERR)
if(status != NC_NOERR)
return status;
if(pxp->slave == NULL)
@ -832,7 +832,7 @@ fprintf(stderr, "\tdouble_buffr %ld %ld %ld\n",
pxp->slave->pos = pxp->pos;
status = px_get(nciop, pxp->slave, from, nbytes, 0,
&src);
if(status != ENOERR)
if(status != NC_NOERR)
return status;
if(pxp->pos != pxp->slave->pos)
{
@ -867,7 +867,7 @@ ncio_px_move(ncio *const nciop, off_t to, off_t from,
size_t nbytes, int rflags)
{
ncio_px *const pxp = (ncio_px *)nciop->pvt;
int status = ENOERR;
int status = NC_NOERR;
off_t lower;
off_t upper;
char *base;
@ -875,7 +875,7 @@ ncio_px_move(ncio *const nciop, off_t to, off_t from,
size_t extent;
if(to == from)
return ENOERR; /* NOOP */
return NC_NOERR; /* NOOP */
if(fIsSet(rflags, RGN_WRITE) && !fIsSet(nciop->ioflags, NC_WRITE))
return EPERM; /* attempt to write readonly file */
@ -917,7 +917,7 @@ if(to > from)
status = px_double_buffer(nciop, toh, frm,
loopextent, rflags) ;
if(status != ENOERR)
if(status != NC_NOERR)
return status;
remaining -= loopextent;
@ -933,7 +933,7 @@ else
status = px_double_buffer(nciop, to, from,
loopextent, rflags) ;
if(status != ENOERR)
if(status != NC_NOERR)
return status;
remaining -= loopextent;
@ -943,7 +943,7 @@ else
from += loopextent;
}
}
return ENOERR;
return NC_NOERR;
}
#if INSTRUMENT
@ -952,7 +952,7 @@ fprintf(stderr, "\tncio_px_move small\n");
status = px_get(nciop, pxp, lower, extent, RGN_WRITE|rflags,
(void **)&base);
if(status != ENOERR)
if(status != NC_NOERR)
return status;
if(to > from)
@ -973,14 +973,14 @@ static int
ncio_px_sync(ncio *const nciop)
{
ncio_px *const pxp = (ncio_px *)nciop->pvt;
int status = ENOERR;
int status = NC_NOERR;
if(fIsSet(pxp->bf_rflags, RGN_MODIFIED))
{
assert(pxp->bf_refcount <= 0);
status = px_pgout(nciop, pxp->bf_offset,
pxp->bf_cnt,
pxp->bf_base, &pxp->pos);
if(status != ENOERR)
if(status != NC_NOERR)
return status;
pxp->bf_rflags = 0;
}
@ -1074,7 +1074,7 @@ ncio_px_init2(ncio *const nciop, size_t *sizehintp, int isNew)
pxp->bf_extent = bufsz;
(void) memset(pxp->bf_base, 0, pxp->bf_extent);
}
return ENOERR;
return NC_NOERR;
}
@ -1144,7 +1144,7 @@ static int
ncio_spx_rel(ncio *const nciop, off_t offset, int rflags)
{
ncio_spx *const pxp = (ncio_spx *)nciop->pvt;
int status = ENOERR;
int status = NC_NOERR;
assert(pxp->bf_offset <= offset);
assert(pxp->bf_cnt != 0);
@ -1193,7 +1193,7 @@ ncio_spx_get(ncio *const nciop,
void **const vpp)
{
ncio_spx *const pxp = (ncio_spx *)nciop->pvt;
int status = ENOERR;
int status = NC_NOERR;
#ifdef X_ALIGN
size_t rem;
#endif
@ -1243,7 +1243,7 @@ ncio_spx_get(ncio *const nciop,
extent,
pxp->bf_base,
&pxp->bf_cnt, &pxp->pos);
if(status != ENOERR)
if(status != NC_NOERR)
return status;
pxp->bf_offset = offset;
@ -1256,7 +1256,7 @@ ncio_spx_get(ncio *const nciop,
#else
*vpp = pxp->bf_base;
#endif
return ENOERR;
return NC_NOERR;
}
@ -1267,7 +1267,7 @@ strategy(ncio *const nciop, off_t to, off_t offset,
size_t extent, int rflags)
{
static ncio_spx pxp[1];
int status = ENOERR;
int status = NC_NOERR;
#ifdef X_ALIGN
size_t rem;
#endif
@ -1317,7 +1317,7 @@ fprintf(stderr, "strategy %ld at %ld to %ld\n",
extent,
pxp->bf_base,
&pxp->bf_cnt, &pxp->pos);
if(status != ENOERR)
if(status != NC_NOERR)
return status;
pxp->bf_offset = to; /* TODO: XALIGN */
@ -1350,7 +1350,7 @@ static int
ncio_spx_move(ncio *const nciop, off_t to, off_t from,
size_t nbytes, int rflags)
{
int status = ENOERR;
int status = NC_NOERR;
off_t lower = from;
off_t upper = to;
char *base;
@ -1360,7 +1360,7 @@ ncio_spx_move(ncio *const nciop, off_t to, off_t from,
rflags &= RGN_NOLOCK; /* filter unwanted flags */
if(to == from)
return ENOERR; /* NOOP */
return NC_NOERR; /* NOOP */
if(to > from)
{
@ -1381,7 +1381,7 @@ ncio_spx_move(ncio *const nciop, off_t to, off_t from,
status = ncio_spx_get(nciop, lower, extent, RGN_WRITE|rflags,
(void **)&base);
if(status != ENOERR)
if(status != NC_NOERR)
return status;
if(to > from)
@ -1402,7 +1402,7 @@ static int
ncio_spx_sync(ncio *const nciop)
{
/* NOOP */
return ENOERR;
return NC_NOERR;
}
static void
@ -1450,7 +1450,7 @@ ncio_spx_init2(ncio *const nciop, const size_t *const sizehintp)
return ENOMEM;
}
/* else */
return ENOERR;
return NC_NOERR;
}
@ -1650,13 +1650,13 @@ posixio_create(const char *path, int ioflags,
else
status = ncio_px_init2(nciop, sizehintp, 1);
if(status != ENOERR)
if(status != NC_NOERR)
goto unwind_open;
if(initialsz != 0)
{
status = fgrow(fd, (off_t)initialsz);
if(status != ENOERR)
if(status != NC_NOERR)
goto unwind_open;
}
@ -1666,12 +1666,12 @@ posixio_create(const char *path, int ioflags,
igeto, igetsz,
RGN_WRITE,
igetvpp);
if(status != ENOERR)
if(status != NC_NOERR)
goto unwind_open;
}
*nciopp = nciop;
return ENOERR;
return NC_NOERR;
unwind_open:
(void) close(fd);
@ -1782,7 +1782,7 @@ posixio_open(const char *path,
else
status = ncio_px_init2(nciop, sizehintp, 0);
if(status != ENOERR)
if(status != NC_NOERR)
goto unwind_open;
if(igetsz != 0)
@ -1791,12 +1791,12 @@ posixio_open(const char *path,
igeto, igetsz,
0,
igetvpp);
if(status != ENOERR)
if(status != NC_NOERR)
goto unwind_open;
}
*nciopp = nciop;
return ENOERR;
return NC_NOERR;
unwind_open:
(void) close(fd); /* assert fd >= 0 */
@ -1833,7 +1833,7 @@ ncio_px_filesize(ncio *nciop, off_t *filesizep)
return errno;
*filesizep = sb.st_size;
#endif
return ENOERR;
return NC_NOERR;
}
/*
@ -1847,7 +1847,7 @@ static int
ncio_px_pad_length(ncio *nciop, off_t length)
{
int status = ENOERR;
int status = NC_NOERR;
if(nciop == NULL)
return EINVAL;
@ -1856,13 +1856,13 @@ ncio_px_pad_length(ncio *nciop, off_t length)
return EPERM; /* attempt to write readonly file */
status = nciop->sync(nciop);
if(status != ENOERR)
if(status != NC_NOERR)
return status;
status = fgrow2(nciop->fd, length);
if(status != ENOERR)
if(status != NC_NOERR)
return status;
return ENOERR;
return NC_NOERR;
}
@ -1879,7 +1879,7 @@ ncio_px_pad_length(ncio *nciop, off_t length)
static int
ncio_px_close(ncio *nciop, int doUnlink)
{
int status = ENOERR;
int status = NC_NOERR;
if(nciop == NULL)
return EINVAL;
if(nciop->fd > 0) {
@ -1895,7 +1895,7 @@ ncio_px_close(ncio *nciop, int doUnlink)
static int
ncio_spx_close(ncio *nciop, int doUnlink)
{
int status = ENOERR;
int status = NC_NOERR;
if(nciop == NULL)
return EINVAL;
if(nciop->fd > 0) {

12
libsrc/t_ncio.c
View File

@ -11,8 +11,8 @@
#include <ctype.h>
#include <assert.h>
#include "ncio.h"
#ifndef ENOERR
#define ENOERR 0
#ifndef NC_NOERR
#define NC_NOERR 0
#endif
@ -199,7 +199,7 @@ main(int ac, char *av[])
off_t offset;
size_t extent;
void *vp;
int status = ENOERR;
int status = NC_NOERR;
int verbose = 0;
int flags = 0;
int create = 0;
@ -271,7 +271,7 @@ main(int ac, char *av[])
status = ncio_open(path, flags,
igeto, igetsz, &sizehint,
&nciop, &vp);
if(status != ENOERR)
if(status != NC_NOERR)
{
fprintf(stderr, "ncio_open: %s: %s\n",
path, strerror(status));
@ -281,7 +281,7 @@ main(int ac, char *av[])
status = ncio_create(path, flags, initialsz,
igeto, igetsz, &sizehint,
&nciop, &vp);
if(status != ENOERR)
if(status != NC_NOERR)
{
fprintf(stderr, "ncio_create: %s: %s\n",
path, strerror(status));
@ -361,7 +361,7 @@ main(int ac, char *av[])
}
status = ncio_close(nciop, doUnlink);
if(status != ENOERR)
if(status != NC_NOERR)
{
fprintf(stderr, "ncio_close(%s): %s: %s\n",
doUnlink ? "doUnlink" : "",

220
libsrc/v1hpg.c
View File

@ -64,7 +64,7 @@ rel_v1hs(v1hs *gsp)
{
int status;
if(gsp->offset == OFF_NONE || gsp->base == NULL)
return ENOERR;
return NC_NOERR;
status = ncio_rel(gsp->nciop, gsp->offset,
gsp->flags == RGN_WRITE ? RGN_MODIFIED : 0);
gsp->end = NULL;
@ -112,7 +112,7 @@ fault_v1hs(v1hs *gsp, size_t extent)
#else
gsp->end = (char *)gsp->base + gsp->extent;
#endif
return ENOERR;
return NC_NOERR;
}
@ -130,10 +130,10 @@ fprintf(stderr, "nextread %lu, remaining %lu\n",
#endif
#ifdef __arm__
if((signed char *)gsp->pos + nextread <= (signed char *)gsp->end)
return ENOERR;
return NC_NOERR;
#else
if((char *)gsp->pos + nextread <= (char *)gsp->end)
return ENOERR;
return NC_NOERR;
#endif
return fault_v1hs(gsp, nextread);
@ -150,7 +150,7 @@ v1h_put_size_t(v1hs *psp, const size_t *sp)
status = check_v1hs(psp, X_SIZEOF_INT64);
else
status = check_v1hs(psp, X_SIZEOF_SIZE_T);
if(status != ENOERR)
if(status != NC_NOERR)
return status;
if (psp->version == 5)
return ncx_put_int64(&psp->pos, *sp);
@ -167,7 +167,7 @@ v1h_get_size_t(v1hs *gsp, size_t *sp)
status = check_v1hs(gsp, X_SIZEOF_INT64);
else
status = check_v1hs(gsp, X_SIZEOF_SIZE_T);
if(status != ENOERR)
if(status != NC_NOERR)
return status;
if (gsp->version == 5) {
long long tmp=0;
@ -189,7 +189,7 @@ v1h_put_nc_type(v1hs *psp, const nc_type *typep)
{
const int itype = (int) *typep;
int status = check_v1hs(psp, X_SIZEOF_INT);
if(status != ENOERR)
if(status != NC_NOERR)
return status;
status = ncx_put_int_int(psp->pos, &itype);
@ -209,7 +209,7 @@ v1h_get_nc_type(v1hs *gsp, nc_type *typep)
{
int type = 0;
int status = check_v1hs(gsp, X_SIZEOF_INT);
if(status != ENOERR)
if(status != NC_NOERR)
return status;
status = ncx_get_int_int(gsp->pos, &type);
#ifdef __arm__
@ -217,7 +217,7 @@ v1h_get_nc_type(v1hs *gsp, nc_type *typep)
#else
gsp->pos = (void *)((char *)gsp->pos + X_SIZEOF_INT);
#endif
if(status != ENOERR)
if(status != NC_NOERR)
return status;
assert(type == NC_BYTE
@ -236,7 +236,7 @@ v1h_get_nc_type(v1hs *gsp, nc_type *typep)
/* else */
*typep = (nc_type) type;
return ENOERR;
return NC_NOERR;
}
/* End nc_type */
@ -250,7 +250,7 @@ v1h_put_NCtype(v1hs *psp, NCtype type)
{
const int itype = (int) type;
int status = check_v1hs(psp, X_SIZEOF_INT);
if(status != ENOERR)
if(status != NC_NOERR)
return status;
status = ncx_put_int_int(psp->pos, &itype);
#ifdef __arm__
@ -267,7 +267,7 @@ v1h_get_NCtype(v1hs *gsp, NCtype *typep)
{
int type = 0;
int status = check_v1hs(gsp, X_SIZEOF_INT);
if(status != ENOERR)
if(status != NC_NOERR)
return status;
status = ncx_get_int_int(gsp->pos, &type);
@ -276,11 +276,11 @@ v1h_get_NCtype(v1hs *gsp, NCtype *typep)
#else
gsp->pos = (void *)((char *)gsp->pos + X_SIZEOF_INT);
#endif
if(status != ENOERR)
if(status != NC_NOERR)
return status;
/* else */
*typep = (NCtype) type;
return ENOERR;
return NC_NOERR;
}
/* End NCtype */
@ -322,16 +322,16 @@ v1h_put_NC_string(v1hs *psp, const NC_string *ncstrp)
#endif
status = v1h_put_size_t(psp, &ncstrp->nchars);
if(status != ENOERR)
if(status != NC_NOERR)
return status;
status = check_v1hs(psp, _RNDUP(ncstrp->nchars, X_ALIGN));
if(status != ENOERR)
if(status != NC_NOERR)
return status;
status = ncx_pad_putn_text(&psp->pos, ncstrp->nchars, ncstrp->cp);
if(status != ENOERR)
if(status != NC_NOERR)
return status;
return ENOERR;
return NC_NOERR;
}
@ -344,7 +344,7 @@ v1h_get_NC_string(v1hs *gsp, NC_string **ncstrpp)
NC_string *ncstrp;
status = v1h_get_size_t(gsp, &nchars);
if(status != ENOERR)
if(status != NC_NOERR)
return status;
ncstrp = new_NC_string(nchars, NULL);
@ -362,17 +362,17 @@ v1h_get_NC_string(v1hs *gsp, NC_string **ncstrpp)
status = check_v1hs(gsp, _RNDUP(ncstrp->nchars, X_ALIGN));
#endif
if(status != ENOERR)
if(status != NC_NOERR)
goto unwind_alloc;
status = ncx_pad_getn_text((const void **)(&gsp->pos),
nchars, ncstrp->cp);
if(status != ENOERR)
if(status != NC_NOERR)
goto unwind_alloc;
*ncstrpp = ncstrp;
return ENOERR;
return NC_NOERR;
unwind_alloc:
free_NC_string(ncstrp);
@ -409,14 +409,14 @@ v1h_put_NC_dim(v1hs *psp, const NC_dim *dimp)
int status;
status = v1h_put_NC_string(psp, dimp->name);
if(status != ENOERR)
if(status != NC_NOERR)
return status;
status = v1h_put_size_t(psp, &dimp->size);
if(status != ENOERR)
if(status != NC_NOERR)
return status;
return ENOERR;
return NC_NOERR;
}
/* Read a NC_dim from the header */
@ -428,7 +428,7 @@ v1h_get_NC_dim(v1hs *gsp, NC_dim **dimpp)
NC_dim *dimp;
status = v1h_get_NC_string(gsp, &ncstrp);
if(status != ENOERR)
if(status != NC_NOERR)
return status;
dimp = new_x_NC_dim(ncstrp);
@ -439,7 +439,7 @@ v1h_get_NC_dim(v1hs *gsp, NC_dim **dimpp)
}
status = v1h_get_size_t(gsp, &dimp->size);
if(status != ENOERR)
if(status != NC_NOERR)
{
free_NC_dim(dimp); /* frees name */
return status;
@ -447,7 +447,7 @@ v1h_get_NC_dim(v1hs *gsp, NC_dim **dimpp)
*dimpp = dimp;
return ENOERR;
return NC_NOERR;
unwind_name:
free_NC_string(ncstrp);
@ -501,20 +501,20 @@ v1h_put_NC_dimarray(v1hs *psp, const NC_dimarray *ncap)
const size_t nosz = 0;
status = v1h_put_NCtype(psp, NC_UNSPECIFIED);
if(status != ENOERR)
if(status != NC_NOERR)
return status;
status = v1h_put_size_t(psp, &nosz);
if(status != ENOERR)
if(status != NC_NOERR)
return status;
return ENOERR;
return NC_NOERR;
}
/* else */
status = v1h_put_NCtype(psp, NC_DIMENSION);
if(status != ENOERR)
if(status != NC_NOERR)
return status;
status = v1h_put_size_t(psp, &ncap->nelems);
if(status != ENOERR)
if(status != NC_NOERR)
return status;
{
@ -527,7 +527,7 @@ v1h_put_NC_dimarray(v1hs *psp, const NC_dimarray *ncap)
return status;
}
}
return ENOERR;
return NC_NOERR;
}
@ -543,15 +543,15 @@ v1h_get_NC_dimarray(v1hs *gsp, NC_dimarray *ncap)
assert(ncap->value == NULL);
status = v1h_get_NCtype(gsp, &type);
if(status != ENOERR)
if(status != NC_NOERR)
return status;
status = v1h_get_size_t(gsp, &ncap->nelems);
if(status != ENOERR)
if(status != NC_NOERR)
return status;
if(ncap->nelems == 0)
return ENOERR;
return NC_NOERR;
/* else */
if(type != NC_DIMENSION)
return EINVAL;
@ -576,7 +576,7 @@ v1h_get_NC_dimarray(v1hs *gsp, NC_dimarray *ncap)
}
}
return ENOERR;
return NC_NOERR;
}
@ -628,7 +628,7 @@ v1h_put_NC_attrV(v1hs *psp, const NC_attr *attrp)
nbytes = MIN(perchunk, remaining);
status = check_v1hs(psp, nbytes);
if(status != ENOERR)
if(status != NC_NOERR)
return status;
(void) memcpy(psp->pos, value, nbytes);
@ -644,7 +644,7 @@ v1h_put_NC_attrV(v1hs *psp, const NC_attr *attrp)
} while(remaining != 0);
return ENOERR;
return NC_NOERR;
}
/* Write a NC_attr to the header */
@ -654,22 +654,22 @@ v1h_put_NC_attr(v1hs *psp, const NC_attr *attrp)
int status;
status = v1h_put_NC_string(psp, attrp->name);
if(status != ENOERR)
if(status != NC_NOERR)
return status;
status = v1h_put_nc_type(psp, &attrp->type);
if(status != ENOERR)
if(status != NC_NOERR)
return status;
status = v1h_put_size_t(psp, &attrp->nelems);
if(status != ENOERR)
if(status != NC_NOERR)
return status;
status = v1h_put_NC_attrV(psp, attrp);
if(status != ENOERR)
if(status != NC_NOERR)
return status;
return ENOERR;
return NC_NOERR;
}
@ -691,7 +691,7 @@ v1h_get_NC_attrV(v1hs *gsp, NC_attr *attrp)
nget = MIN(perchunk, remaining);
status = check_v1hs(gsp, nget);
if(status != ENOERR)
if(status != NC_NOERR)
return status;
(void) memcpy(value, gsp->pos, nget);
@ -707,7 +707,7 @@ v1h_get_NC_attrV(v1hs *gsp, NC_attr *attrp)
} while(remaining != 0);
return ENOERR;
return NC_NOERR;
}
@ -722,15 +722,15 @@ v1h_get_NC_attr(v1hs *gsp, NC_attr **attrpp)
NC_attr *attrp;
status = v1h_get_NC_string(gsp, &strp);
if(status != ENOERR)
if(status != NC_NOERR)
return status;
status = v1h_get_nc_type(gsp, &type);
if(status != ENOERR)
if(status != NC_NOERR)
goto unwind_name;
status = v1h_get_size_t(gsp, &nelems);
if(status != ENOERR)
if(status != NC_NOERR)
goto unwind_name;
attrp = new_x_NC_attr(strp, type, nelems);
@ -741,7 +741,7 @@ v1h_get_NC_attr(v1hs *gsp, NC_attr **attrpp)
}
status = v1h_get_NC_attrV(gsp, attrp);
if(status != ENOERR)
if(status != NC_NOERR)
{
free_NC_attr(attrp); /* frees strp */
return status;
@ -749,7 +749,7 @@ v1h_get_NC_attr(v1hs *gsp, NC_attr **attrpp)
*attrpp = attrp;
return ENOERR;
return NC_NOERR;
unwind_name:
free_NC_string(strp);
@ -803,20 +803,20 @@ v1h_put_NC_attrarray(v1hs *psp, const NC_attrarray *ncap)
const size_t nosz = 0;
status = v1h_put_NCtype(psp, NC_UNSPECIFIED);
if(status != ENOERR)
if(status != NC_NOERR)
return status;
status = v1h_put_size_t(psp, &nosz);
if(status != ENOERR)
if(status != NC_NOERR)
return status;
return ENOERR;
return NC_NOERR;
}
/* else */
status = v1h_put_NCtype(psp, NC_ATTRIBUTE);
if(status != ENOERR)
if(status != NC_NOERR)
return status;
status = v1h_put_size_t(psp, &ncap->nelems);
if(status != ENOERR)
if(status != NC_NOERR)
return status;
{
@ -829,7 +829,7 @@ v1h_put_NC_attrarray(v1hs *psp, const NC_attrarray *ncap)
return status;
}
}
return ENOERR;
return NC_NOERR;
}
@ -845,14 +845,14 @@ v1h_get_NC_attrarray(v1hs *gsp, NC_attrarray *ncap)
assert(ncap->value == NULL);
status = v1h_get_NCtype(gsp, &type);
if(status != ENOERR)
if(status != NC_NOERR)
return status;
status = v1h_get_size_t(gsp, &ncap->nelems);
if(status != ENOERR)
if(status != NC_NOERR)
return status;
if(ncap->nelems == 0)
return ENOERR;
return NC_NOERR;
/* else */
if(type != NC_ATTRIBUTE)
return EINVAL;
@ -877,7 +877,7 @@ v1h_get_NC_attrarray(v1hs *gsp, NC_attrarray *ncap)
}
}
return ENOERR;
return NC_NOERR;
}
/* End NC_attr */
@ -921,52 +921,52 @@ v1h_put_NC_var(v1hs *psp, const NC_var *varp)
int status;
status = v1h_put_NC_string(psp, varp->name);
if(status != ENOERR)
if(status != NC_NOERR)
return status;
status = v1h_put_size_t(psp, &varp->ndims);
if(status != ENOERR)
if(status != NC_NOERR)
return status;
if (psp->version == 5) {
status = check_v1hs(psp, ncx_len_int64(varp->ndims));
if(status != ENOERR)
if(status != NC_NOERR)
return status;
status = ncx_putn_longlong_int(&psp->pos,
varp->ndims, varp->dimids);
if(status != ENOERR)
if(status != NC_NOERR)
return status;
}
else {
status = check_v1hs(psp, ncx_len_int(varp->ndims));
if(status != ENOERR)
if(status != NC_NOERR)
return status;
status = ncx_putn_int_int(&psp->pos,
varp->ndims, varp->dimids);
if(status != ENOERR)
if(status != NC_NOERR)
return status;
}
status = v1h_put_NC_attrarray(psp, &varp->attrs);
if(status != ENOERR)
if(status != NC_NOERR)
return status;
status = v1h_put_nc_type(psp, &varp->type);
if(status != ENOERR)
if(status != NC_NOERR)
return status;
status = v1h_put_size_t(psp, &varp->len);
if(status != ENOERR)
if(status != NC_NOERR)
return status;
status = check_v1hs(psp, psp->version == 1 ? 4 : 8); /*begin*/
if(status != ENOERR)
if(status != NC_NOERR)
return status;
status = ncx_put_off_t(&psp->pos, &varp->begin, psp->version == 1 ? 4 : 8);
if(status != ENOERR)
if(status != NC_NOERR)
return status;
return ENOERR;
return NC_NOERR;
}
@ -980,11 +980,11 @@ v1h_get_NC_var(v1hs *gsp, NC_var **varpp)
NC_var *varp;
status = v1h_get_NC_string(gsp, &strp);
if(status != ENOERR)
if(status != NC_NOERR)
return status;
status = v1h_get_size_t(gsp, &ndims);
if(status != ENOERR)
if(status != NC_NOERR)
goto unwind_name;
varp = new_x_NC_var(strp, ndims);
@ -996,43 +996,43 @@ v1h_get_NC_var(v1hs *gsp, NC_var **varpp)
if (gsp->version == 5) {
status = check_v1hs(gsp, ncx_len_int64(ndims));
if(status != ENOERR)
if(status != NC_NOERR)
goto unwind_alloc;
status = ncx_getn_longlong_int((const void **)(&gsp->pos),
ndims, varp->dimids);
if(status != ENOERR)
if(status != NC_NOERR)
goto unwind_alloc;
}
else {
status = check_v1hs(gsp, ncx_len_int(ndims));
if(status != ENOERR)
if(status != NC_NOERR)
goto unwind_alloc;
status = ncx_getn_int_int((const void **)(&gsp->pos),
ndims, varp->dimids);
if(status != ENOERR)
if(status != NC_NOERR)
goto unwind_alloc;
}
status = v1h_get_NC_attrarray(gsp, &varp->attrs);
if(status != ENOERR)
if(status != NC_NOERR)
goto unwind_alloc;
status = v1h_get_nc_type(gsp, &varp->type);
if(status != ENOERR)
if(status != NC_NOERR)
goto unwind_alloc;
status = v1h_get_size_t(gsp, &varp->len);
if(status != ENOERR)
if(status != NC_NOERR)
goto unwind_alloc;
status = check_v1hs(gsp, gsp->version == 1 ? 4 : 8);
if(status != ENOERR)
if(status != NC_NOERR)
goto unwind_alloc;
status = ncx_get_off_t((const void **)&gsp->pos,
&varp->begin, gsp->version == 1 ? 4 : 8);
if(status != ENOERR)
if(status != NC_NOERR)
goto unwind_alloc;
*varpp = varp;
return ENOERR;
return NC_NOERR;
unwind_alloc:
free_NC_var(varp); /* frees name */
@ -1090,20 +1090,20 @@ v1h_put_NC_vararray(v1hs *psp, const NC_vararray *ncap)
const size_t nosz = 0;
status = v1h_put_NCtype(psp, NC_UNSPECIFIED);
if(status != ENOERR)
if(status != NC_NOERR)
return status;
status = v1h_put_size_t(psp, &nosz);
if(status != ENOERR)
if(status != NC_NOERR)
return status;
return ENOERR;
return NC_NOERR;
}
/* else */
status = v1h_put_NCtype(psp, NC_VARIABLE);
if(status != ENOERR)
if(status != NC_NOERR)
return status;
status = v1h_put_size_t(psp, &ncap->nelems);
if(status != ENOERR)
if(status != NC_NOERR)
return status;
{
@ -1116,7 +1116,7 @@ v1h_put_NC_vararray(v1hs *psp, const NC_vararray *ncap)
return status;
}
}
return ENOERR;
return NC_NOERR;
}
@ -1132,15 +1132,15 @@ v1h_get_NC_vararray(v1hs *gsp, NC_vararray *ncap)
assert(ncap->value == NULL);
status = v1h_get_NCtype(gsp, &type);
if(status != ENOERR)
if(status != NC_NOERR)
return status;
status = v1h_get_size_t(gsp, &ncap->nelems);
if(status != ENOERR)
if(status != NC_NOERR)
return status;
if(ncap->nelems == 0)
return ENOERR;
return NC_NOERR;
/* else */
if(type != NC_VARIABLE)
return EINVAL;
@ -1165,7 +1165,7 @@ v1h_get_NC_vararray(v1hs *gsp, NC_vararray *ncap)
}
}
return ENOERR;
return NC_NOERR;
}
@ -1199,7 +1199,7 @@ NC_computeshapes(NC3_INFO* ncp)
for( /*NADA*/; vpp < end; vpp++)
{
status = NC_var_shape(*vpp, &ncp->dims);
if(status != ENOERR)
if(status != NC_NOERR)
return(status);
if(IS_RECVAR(*vpp))
@ -1251,7 +1251,7 @@ NC_computeshapes(NC3_INFO* ncp)
ncp->begin_var > ncp->begin_rec)
return(NC_ENOTNC); /* not a netCDF file or corrupted */
return(ENOERR);
return(NC_NOERR);
}
/* How much space in the header is required for the NC data structure? */
@ -1280,7 +1280,7 @@ ncx_len_NC(const NC3_INFO* ncp, size_t sizeof_off_t)
int
ncx_put_NC(const NC3_INFO* ncp, void **xpp, off_t offset, size_t extent)
{
int status = ENOERR;
int status = NC_NOERR;
v1hs ps; /* the get stream */
assert(ncp != NULL);
@ -1339,7 +1339,7 @@ ncx_put_NC(const NC3_INFO* ncp, void **xpp, off_t offset, size_t extent)
status = ncx_putn_schar_schar(&ps.pos, sizeof(ncmagic), ncmagic);
else
status = ncx_putn_schar_schar(&ps.pos, sizeof(ncmagic1), ncmagic1);
if(status != ENOERR)
if(status != NC_NOERR)
goto release;
{
@ -1348,22 +1348,22 @@ ncx_put_NC(const NC3_INFO* ncp, void **xpp, off_t offset, size_t extent)
status = ncx_put_int64(&ps.pos, nrecs);
else
status = ncx_put_size_t(&ps.pos, &nrecs);
if(status != ENOERR)
if(status != NC_NOERR)
goto release;
}
assert((char *)ps.pos < (char *)ps.end);
status = v1h_put_NC_dimarray(&ps, &ncp->dims);
if(status != ENOERR)
if(status != NC_NOERR)
goto release;
status = v1h_put_NC_attrarray(&ps, &ncp->attrs);
if(status != ENOERR)
if(status != NC_NOERR)
goto release;
status = v1h_put_NC_vararray(&ps, &ncp->vars);
if(status != ENOERR)
if(status != NC_NOERR)
goto release;
release:
@ -1443,7 +1443,7 @@ nc_get_NC(NC3_INFO* ncp)
status = ncx_getn_schar_schar(
(const void **)(&gs.pos), sizeof(magic), magic);
if(status != ENOERR)
if(status != NC_NOERR)
goto unwind_get;
if(memcmp(magic, ncmagic, sizeof(ncmagic)-1) != 0)
@ -1481,7 +1481,7 @@ nc_get_NC(NC3_INFO* ncp)
}
else
status = ncx_get_size_t((const void **)(&gs.pos), &nrecs);
if(status != ENOERR)
if(status != NC_NOERR)
goto unwind_get;
NC_set_numrecs(ncp, nrecs);
}
@ -1492,21 +1492,21 @@ nc_get_NC(NC3_INFO* ncp)
assert((char *)gs.pos < (char *)gs.end);
#endif
status = v1h_get_NC_dimarray(&gs, &ncp->dims);
if(status != ENOERR)
if(status != NC_NOERR)
goto unwind_get;
status = v1h_get_NC_attrarray(&gs, &ncp->attrs);
if(status != ENOERR)
if(status != NC_NOERR)
goto unwind_get;
status = v1h_get_NC_vararray(&gs, &ncp->vars);
if(status != ENOERR)
if(status != NC_NOERR)
goto unwind_get;
ncp->xsz = ncx_len_NC(ncp, (gs.version == 1) ? 4 : 8);
status = NC_computeshapes(ncp);
if(status != ENOERR)
if(status != NC_NOERR)
goto unwind_get;
unwind_get:

74
libsrc/winceio.c
View File

@ -20,8 +20,8 @@
#define EEXIST NC_EEXIST
#endif
#ifndef ENOERR
#define ENOERR 0
#ifndef NC_NOERR
#define NC_NOERR 0
#endif
#include <string.h>
@ -65,7 +65,7 @@ blksize(int fd)
static int
fgrow(FILE* f, const off_t len)
{
int status = ENOERR;
int status = NC_NOERR;
long pos = ftell(f);
long size;
pos = ftell(f);
@ -74,7 +74,7 @@ fgrow(FILE* f, const off_t len)
size = ftell(f);
status = fseek(f,pos,SEEK_SET);
if(ferror(f)) return EIO;
if(len < size) return ENOERR;
if(len < size) return NC_NOERR;
else {
const long dumb = 0;
status = fseek(f, len-sizeof(dumb), SEEK_SET);
@ -84,7 +84,7 @@ fgrow(FILE* f, const off_t len)
status = fseek(f, pos, SEEK_SET);
if(ferror(f)) return EIO;
}
return ENOERR;
return NC_NOERR;
}
@ -96,7 +96,7 @@ fgrow(FILE* f, const off_t len)
static int
fgrow2(FILE* f, const off_t len)
{
int status = ENOERR;
int status = NC_NOERR;
long pos = ftell(f);
long size;
pos = ftell(f);
@ -105,7 +105,7 @@ fgrow2(FILE* f, const off_t len)
size = ftell(f);
status = fseek(f,pos,SEEK_SET);
if(ferror(f)) return EIO;
if(len < size) return ENOERR;
if(len < size) return NC_NOERR;
else {
const char dumb = 0;
status = fseek(f, len-sizeof(dumb), SEEK_SET);
@ -115,7 +115,7 @@ fgrow2(FILE* f, const off_t len)
status = fseek(f, pos, SEEK_SET);
if(ferror(f)) return EIO;
}
return ENOERR;
return NC_NOERR;
}
/* End OS */
/* Begin ffio */
@ -125,7 +125,7 @@ fileio_pgout(ncio *const nciop,
off_t const offset, const size_t extent,
const void *const vp, off_t *posp)
{
int status = ENOERR;
int status = NC_NOERR;
FILE* f = descriptors[nciop->fd];
#ifdef X_ALIGN
@ -142,7 +142,7 @@ fileio_pgout(ncio *const nciop,
fwrite(vp,1,extent,f);
if(ferror(f)) return EIO;
*posp += extent;
return ENOERR;
return NC_NOERR;
}
static int
@ -150,7 +150,7 @@ fileio_pgin(ncio *const nciop,
off_t const offset, const size_t extent,
void *const vp, size_t *nreadp, off_t *posp)
{
int status = ENOERR;
int status = NC_NOERR;
ssize_t nread;
int count;
@ -172,7 +172,7 @@ fileio_pgin(ncio *const nciop,
if(ferror(f)) return EIO;
*nreadp = nread;
*posp += nread;
return ENOERR;
return NC_NOERR;
}
/* */
@ -189,7 +189,7 @@ typedef struct ncio_ffio {
static int
ncio_fileio_rel(ncio *const nciop, off_t offset, int rflags)
{
int status = ENOERR;
int status = NC_NOERR;
FILE* f = descriptors[nciop->fd];
ncio_ffio *ffp = (ncio_ffio *)nciop->pvt;
@ -225,7 +225,7 @@ ncio_fileio_get(ncio *const nciop,
void **const vpp)
{
ncio_ffio *ffp = (ncio_ffio *)nciop->pvt;
int status = ENOERR;
int status = NC_NOERR;
FILE* f = descriptors[nciop->fd];
#ifdef X_ALIGN
size_t rem;
@ -277,7 +277,7 @@ ncio_fileio_get(ncio *const nciop,
extent,
ffp->bf_base,
&ffp->bf_cnt, &ffp->pos);
if(status != ENOERR)
if(status != NC_NOERR)
return status;
ffp->bf_offset = offset;
@ -295,7 +295,7 @@ ncio_fileio_get(ncio *const nciop,
#else
*vpp = (char *)ffp->bf_base;
#endif
return ENOERR;
return NC_NOERR;
}
@ -303,7 +303,7 @@ static int
ncio_fileio_move(ncio *const nciop, off_t to, off_t from,
size_t nbytes, int rflags)
{
int status = ENOERR;
int status = NC_NOERR;
off_t lower = from;
off_t upper = to;
char *base;
@ -314,7 +314,7 @@ ncio_fileio_move(ncio *const nciop, off_t to, off_t from,
rflags &= RGN_NOLOCK; /* filter unwanted flags */
if(to == from)
return ENOERR; /* NOOP */
return NC_NOERR; /* NOOP */
if(to > from)
{
@ -335,7 +335,7 @@ ncio_fileio_move(ncio *const nciop, off_t to, off_t from,
status = ncio_fileio_get(nciop, lower, extent, RGN_WRITE|rflags,
(void **)&base);
if(status != ENOERR)
if(status != NC_NOERR)
return status;
if(to > from)
@ -353,7 +353,7 @@ ncio_fileio_sync(ncio *const nciop)
{
FILE* f = descriptors[nciop->fd];
fflush(f);
return ENOERR;
return NC_NOERR;
}
static void
@ -394,7 +394,7 @@ ncio_fileio_init2(ncio *const nciop, size_t *sizehintp)
return ENOMEM;
}
/* else */
return ENOERR;
return NC_NOERR;
}
@ -486,7 +486,7 @@ ncio_create(const char *path, int ioflags,
#endif
FILE* f;
int i,fd;
int status = ENOERR;
int status = NC_NOERR;
if(initialsz < (size_t)igeto + igetsz)
initialsz = (size_t)igeto + igetsz;
@ -539,13 +539,13 @@ ncio_create(const char *path, int ioflags,
}
status = ncio_fileio_init2(nciop, sizehintp);
if(status != ENOERR)
if(status != NC_NOERR)
goto unwind_open;
if(initialsz != 0)
{
status = fgrow(f, (off_t)initialsz);
if(status != ENOERR)
if(status != NC_NOERR)
goto unwind_open;
}
@ -555,12 +555,12 @@ ncio_create(const char *path, int ioflags,
igeto, igetsz,
RGN_WRITE,
igetvpp);
if(status != ENOERR)
if(status != NC_NOERR)
goto unwind_open;
}
*nciopp = nciop;
return ENOERR;
return NC_NOERR;
unwind_open:
(void) fclose(descriptors[fd]);
@ -589,7 +589,7 @@ ncio_open(const char *path,
#endif
FILE* f;
int i,fd;
int status = ENOERR;
int status = NC_NOERR;
if(path == NULL || *path == 0)
return EINVAL;
@ -625,7 +625,7 @@ ncio_open(const char *path,
}
status = ncio_fileio_init2(nciop, sizehintp);
if(status != ENOERR)
if(status != NC_NOERR)
goto unwind_open;
if(igetsz != 0)
@ -634,12 +634,12 @@ ncio_open(const char *path,
igeto, igetsz,
0,
igetvpp);
if(status != ENOERR)
if(status != NC_NOERR)
goto unwind_open;
}
*nciopp = nciop;
return ENOERR;
return NC_NOERR;
unwind_open:
(void) fclose(descriptors[fd]);
@ -659,7 +659,7 @@ unwind_new:
int
ncio_filesize(ncio *nciop, off_t *filesizep)
{
int status = ENOERR;
int status = NC_NOERR;
off_t filesize, current, reset;
FILE* f;
@ -674,7 +674,7 @@ ncio_filesize(ncio *nciop, off_t *filesizep)
*filesizep = ftell(f);
status = fseek(f, current, SEEK_SET); /* reset */
if(ferror(f)) return EIO;
return ENOERR;
return NC_NOERR;
}
@ -688,7 +688,7 @@ ncio_filesize(ncio *nciop, off_t *filesizep)
int
ncio_pad_length(ncio *nciop, off_t length)
{
int status = ENOERR;
int status = NC_NOERR;
FILE* f;
if(nciop == NULL)
@ -700,20 +700,20 @@ ncio_pad_length(ncio *nciop, off_t length)
return EPERM; /* attempt to write readonly file */
status = nciop->sync(nciop);
if(status != ENOERR)
if(status != NC_NOERR)
return status;
status = fgrow2(f, length);
if(status != ENOERR)
if(status != NC_NOERR)
return errno;
return ENOERR;
return NC_NOERR;
}
int
ncio_close(ncio *nciop, int doUnlink)
{
int status = ENOERR;
int status = NC_NOERR;
FILE* f;
if(nciop == NULL)