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

Updated libdispatch/ files with copyright notice.

Browse Source
This commit is contained in:
Ward Fisher 2018-12-06 14:29:57 -07:00
parent 72d56fb601
commit 25417880f7
45 changed files with 175 additions and 179 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libdispatch/CMakeLists.txt
View File

@ -1,3 +1,9 @@
# Copyright 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014,
# 2015, 2016, 2017, 2018
# University Corporation for Atmospheric Research/Unidata.
# See netcdf-c/COPYRIGHT file for more info.
SET(libdispatch_SOURCES dparallel.c dcopy.c dfile.c ddim.c datt.c dattinq.c dattput.c dattget.c derror.c dvar.c dvarget.c dvarput.c dvarinq.c ddispatch.c nclog.c dstring.c dutf8.c dinternal.c doffsets.c ncuri.c nclist.c ncbytes.c nchashmap.c nctime.c nc.c nclistmgr.c utf8proc.h utf8proc.c dwinpath.c dutil.c drc.c dauth.c dreadonly.c dnotnc4.c dnotnc3.c crc32.c daux.c)
IF(USE_NETCDF4)

2
libdispatch/Makefile.am
View File

@ -1,5 +1,5 @@
## This is a automake file, part of Unidata's netCDF package.
# Copyright 2005, see the COPYRIGHT file for more information.
# Copyright 2008, see the COPYRIGHT file for more information.
# This Makefile controls the building of the dispatch layer of the
# netCDF library. The dispatch layer decides whether to call the

32
libdispatch/datt.c
View File

@ -1,6 +1,6 @@
/** \file
Copyright 2010 University Corporation for Atmospheric
Research/Unidata. See \ref copyright file for more info.
Copyright 2018 University Corporation for Atmospheric
Research/Unidata. See \ref copyright file for more info.
These functions read and write attributes.
*/
@ -22,7 +22,7 @@ created, while the netCDF dataset is in define mode. Additional
attributes may be added later by reentering define mode.
A netCDF attribute has a netCDF variable to which it is assigned, a
name, a type, a length, and a sequence of one or more values.
name, a type, a length, and a sequence of one or more values.
An attribute is designated by its variable ID and name. When an
attribute name is not known, it may be designated by its variable ID
@ -50,7 +50,7 @@ Operations supported on attributes are:
- Copy attribute from one netCDF variable to another.
- Get name of attribute from its number.
- Rename an attribute.
- Delete an attribute.
- Delete an attribute.
*/
/*! \{*/ /* All these functions are part of the above defgroup... */
@ -69,16 +69,16 @@ new name is longer than the original name, the netCDF dataset must be
in define mode. You cannot rename an attribute to have the same name
as another attribute of the same variable.
\param ncid NetCDF or group ID, from a previous call to nc_open(),
nc_create(), nc_def_grp(), or associated inquiry functions such as
\param ncid NetCDF or group ID, from a previous call to nc_open(),
nc_create(), nc_def_grp(), or associated inquiry functions such as
nc_inq_ncid().
\param varid Variable ID of the attribute's variable, or ::NC_GLOBAL for
a global attribute.
\param name Attribute \ref object_name.
\param name Attribute \ref object_name.
\param newname The new attribute \ref object_name.
\param newname The new attribute \ref object_name.
<h1>Example</h1>
@ -90,8 +90,8 @@ dataset named foo.nc:
#include <netcdf.h>
...
int status;
int ncid;
int rh_id;
int ncid;
int rh_id;
...
status = nc_open("foo.nc", NC_NOWRITE, &ncid);
if (status != NC_NOERR) handle_error(status);
@ -134,13 +134,13 @@ The function nc_del_att() deletes a netCDF attribute from an open
netCDF dataset. The netCDF dataset must be in define mode.
\param ncid NetCDF or group ID, from a previous call to nc_open(),
nc_create(), nc_def_grp(), or associated inquiry functions such as
nc_create(), nc_def_grp(), or associated inquiry functions such as
nc_inq_ncid().
\param varid Variable ID of the attribute's variable, or ::NC_GLOBAL
for a global attribute.
\param name Attribute name.
\param name Attribute name.
<h1>Example</h1>
@ -150,9 +150,9 @@ Units for a variable rh in an existing netCDF dataset named foo.nc:
\code
#include <netcdf.h>
...
int status;
int ncid;
int rh_id;
int status;
int ncid;
int rh_id;
...
status = nc_open("foo.nc", NC_WRITE, &ncid);
if (status != NC_NOERR) handle_error(status);
@ -160,7 +160,7 @@ Units for a variable rh in an existing netCDF dataset named foo.nc:
status = nc_inq_varid (ncid, "rh", &rh_id);
if (status != NC_NOERR) handle_error(status);
...
status = nc_redef(ncid);
status = nc_redef(ncid);
if (status != NC_NOERR) handle_error(status);
status = nc_del_att(ncid, rh_id, "Units");
if (status != NC_NOERR) handle_error(status);

2
libdispatch/dattget.c
View File

@ -3,7 +3,7 @@ Attribute functions
These functions read and write attributes.
Copyright 2010 University Corporation for Atmospheric
Copyright 2018 University Corporation for Atmospheric
Research/Unidata. See \ref copyright file for more info. */
#include "ncdispatch.h"

40
libdispatch/dattinq.c
View File

@ -3,7 +3,7 @@ Attribute inquiry functions
These functions find out about attributes.
Copyright 2011 University Corporation for Atmospheric
Copyright 2018 University Corporation for Atmospheric
Research/Unidata. See \ref copyright file for more info. */
#include "ncdispatch.h"
@ -20,7 +20,7 @@ Return information about a netCDF attribute.
The function nc_inq_att returns the attribute's type and length.
\param ncid NetCDF or group ID, from a previous call to nc_open(),
nc_create(), nc_def_grp(), or associated inquiry functions such as
nc_create(), nc_def_grp(), or associated inquiry functions such as
nc_inq_ncid().
\param varid Variable ID of the attribute's variable, or ::NC_GLOBAL
@ -49,12 +49,12 @@ foo.nc:
\code
#include <netcdf.h>
...
int status;
int ncid;
int rh_id;
nc_type vr_type, t_type;
size_t vr_len, t_len;
int status;
int ncid;
int rh_id;
nc_type vr_type, t_type;
size_t vr_len, t_len;
...
status = nc_open("foo.nc", NC_NOWRITE, &ncid);
if (status != NC_NOERR) handle_error(status);
@ -80,7 +80,7 @@ foo.nc:
\author Glenn Davis, Ed Hartnett, Dennis Heimbigner
*/
int
nc_inq_att(int ncid, int varid, const char *name, nc_type *xtypep,
nc_inq_att(int ncid, int varid, const char *name, nc_type *xtypep,
size_t *lenp)
{
NC* ncp;
@ -94,13 +94,13 @@ nc_inq_att(int ncid, int varid, const char *name, nc_type *xtypep,
Find an attribute ID.
\param ncid NetCDF or group ID, from a previous call to nc_open(),
nc_create(), nc_def_grp(), or associated inquiry functions such as
nc_create(), nc_def_grp(), or associated inquiry functions such as
nc_inq_ncid().
\param varid Variable ID of the attribute's variable, or ::NC_GLOBAL for
a global attribute.
\param name Attribute \ref object_name.
\param name Attribute \ref object_name.
\param idp Pointer to location for returned attribute number that
specifies which attribute this is for this variable (or which global
@ -171,7 +171,7 @@ nc_inq_attid(int ncid, int varid, const char *name, int *idp)
Find the name of an attribute.
\param ncid NetCDF or group ID, from a previous call to nc_open(),
nc_create(), nc_def_grp(), or associated inquiry functions such as
nc_create(), nc_def_grp(), or associated inquiry functions such as
nc_inq_ncid().
\param varid Variable ID of the attribute's variable, or ::NC_GLOBAL
@ -183,7 +183,7 @@ number of attributes for the variable, as returned from a call to
nc_inq_varnatts().
\param name Pointer to the location for the returned attribute \ref
object_name.
object_name.
\section nc_inq_attname_example Example
@ -263,7 +263,7 @@ nc_inq_attname(int ncid, int varid, int attnum, char *name)
Find number of global or group attributes.
\param ncid NetCDF or group ID, from a previous call to nc_open(),
nc_create(), nc_def_grp(), or associated inquiry functions such as
nc_create(), nc_def_grp(), or associated inquiry functions such as
nc_inq_ncid().
\param nattsp Pointer where number of global or group attributes will be
@ -271,7 +271,7 @@ written. \ref ignored_if_null.
\section nc_inq_natts_example Example
Here is an example from
Here is an example from
\code
@ -311,13 +311,13 @@ nc_inq_natts(int ncid, int *nattsp)
Find the type of an attribute.
\param ncid NetCDF or group ID, from a previous call to nc_open(),
nc_create(), nc_def_grp(), or associated inquiry functions such as
nc_create(), nc_def_grp(), or associated inquiry functions such as
nc_inq_ncid().
\param varid Variable ID of the attribute's variable, or ::NC_GLOBAL
for a global or group attribute.
\param name Attribute \ref object_name.
\param name Attribute \ref object_name.
\param xtypep Pointer to location for returned attribute \ref data_type.
@ -368,17 +368,17 @@ nc_inq_atttype(int ncid, int varid, const char *name, nc_type *xtypep)
Find the length of an attribute.
\param ncid NetCDF or group ID, from a previous call to nc_open(),
nc_create(), nc_def_grp(), or associated inquiry functions such as
nc_create(), nc_def_grp(), or associated inquiry functions such as
nc_inq_ncid().
\param varid Variable ID of the attribute's variable, or ::NC_GLOBAL
for a global or group attribute.
\param name Attribute \ref object_name.
\param name Attribute \ref object_name.
\param lenp Pointer to location for returned number of values
currently stored in the attribute. Before using the value as a C
string, make sure it is null-terminated. \ref ignored_if_null.
string, make sure it is null-terminated. \ref ignored_if_null.
\section nc_inq_attlen_example Example

2
libdispatch/dattput.c
View File

@ -3,7 +3,7 @@ Functions to write attributes.
These functions read and write attributes.
Copyright 2010 University Corporation for Atmospheric
Copyright 2018 University Corporation for Atmospheric
Research/Unidata. See \ref copyright file for more info. */
#include "ncdispatch.h"

4
libdispatch/dauth.c
View File

@ -1,6 +1,6 @@
/*
Copyright (c) 1998-2017 University Corporation for Atmospheric Research/Unidata
See LICENSE.txt for license information.
Copyright (c) 1998-2018 University Corporation for Atmospheric Research/Unidata
See COPYRIGHT for license information.
*/

32
libdispatch/daux.c
View File

@ -1,6 +1,6 @@
/*
Copyright (c) 1998-2017 University Corporation for Atmospheric Research/Unidata
See LICENSE.txt for license information.
Copyright (c) 1998-2018 University Corporation for Atmospheric Research/Unidata
See COPYRIGHT for license information.
*/
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
@ -31,7 +31,7 @@ struct NCAUX_FIELD {
char* name;
nc_type fieldtype;
size_t ndims;
int dimsizes[NC_MAX_VAR_DIMS];
int dimsizes[NC_MAX_VAR_DIMS];
size_t size;
size_t offset;
size_t alignment;
@ -96,7 +96,7 @@ ncaux_reclaim_data(int ncid, int xtype, void* memory, size_t count)
size_t typesize = 0;
size_t i;
Position offset;
if(ncid < 0 || xtype < 0
|| (memory == NULL && count > 0)
|| xtype == NC_NAT)
@ -110,7 +110,7 @@ ncaux_reclaim_data(int ncid, int xtype, void* memory, size_t count)
if((stat=reclaim_datar(ncid,xtype,typesize,&offset))) /* reclaim one instance */
break;
}
done:
return stat;
}
@ -120,7 +120,7 @@ static int
reclaim_datar(int ncid, int xtype, size_t typesize, Position* offset)
{
int stat = NC_NOERR;
switch (xtype) {
case NC_CHAR: case NC_BYTE: case NC_UBYTE:
case NC_SHORT: case NC_USHORT:
@ -147,7 +147,7 @@ reclaim_datar(int ncid, int xtype, size_t typesize, Position* offset)
}
return stat;
}
#ifdef USE_NETCDF4
static ptrdiff_t
@ -162,7 +162,7 @@ static int
reclaim_usertype(int ncid, int xtype, Position* offset)
{
int stat = NC_NOERR;
size_t size;
size_t size;
nc_type basetype;
size_t nfields;
int klass;
@ -250,7 +250,7 @@ reclaim_compound(int ncid, int xtype, size_t cmpdsize, size_t nfields, Position*
for(i=0;i<ndims;i++) arraycount *= dimsizes[i];
for(i=0;i<arraycount;i++) {
if((stat = reclaim_datar(ncid, fieldtype, fieldsize, offset))) goto done;
}
}
}
/* Return to beginning of the compound and move |compound| */
offset->offset = saveoffset;
@ -278,13 +278,13 @@ ncaux_begin_compound(int ncid, const char *name, int alignmode, void** tagp)
struct NCAUX_CMPD* cmpd = NULL;
if(tagp) *tagp = NULL;
cmpd = (struct NCAUX_CMPD*)calloc(1,sizeof(struct NCAUX_CMPD));
if(cmpd == NULL) {status = NC_ENOMEM; goto fail;}
cmpd->ncid = ncid;
cmpd->mode = alignmode;
cmpd->nfields = 0;
cmpd->name = strdup(name);
cmpd->name = strdup(name);
if(cmpd->name == NULL) {status = NC_ENOMEM; goto fail;}
if(tagp) {
@ -350,7 +350,7 @@ ncaux_add_field(void* tag, const char *name, nc_type field_type,
field = &cmpd->fields[cmpd->nfields+1];
field->name = strdup(name);
field->fieldtype = field_type;
if(field->name == NULL) {status = NC_ENOMEM; goto done;}
if(field->name == NULL) {status = NC_ENOMEM; goto done;}
field->ndims = (size_t)ndims;
memcpy(field->dimsizes,dimsizes,sizeof(int)*field->ndims);
cmpd->nfields++;
@ -458,7 +458,7 @@ findfirstfield(int ncid, nc_type xtype)
int status = NC_NOERR;
nc_type fieldtype = xtype;
if(xtype <= NC_MAX_ATOMIC_TYPE) goto done;
status = nc_inq_compound_fieldtype(ncid, xtype, 0, &fieldtype);
if(status != NC_NOERR) goto done;
fieldtype = findfirstfield(ncid,fieldtype);
@ -494,7 +494,7 @@ computefieldinfo(struct NCAUX_CMPD* cmpd)
/* Assign the sizes for the fields */
for(i=0;i<cmpd->nfields;i++) {
struct NCAUX_FIELD* field = &cmpd->fields[i];
struct NCAUX_FIELD* field = &cmpd->fields[i];
status = nc_inq_type(cmpd->ncid,field->fieldtype,NULL,&field->size);
if(status != NC_NOERR) goto done;
totaldimsize = dimproduct(field->ndims,field->dimsizes);
@ -513,7 +513,7 @@ computefieldinfo(struct NCAUX_CMPD* cmpd)
break;
case NC_ENUM:
field->alignment = ncaux_type_alignment(firsttype,cmpd->ncid);
break;
break;
case NC_VLEN: /*fall thru*/
case NC_COMPOUND:
field->alignment = ncaux_type_alignment(firsttype,cmpd->ncid);
@ -535,5 +535,3 @@ done:
}
#endif /*USE_NETCDF4*/

68
libdispatch/dcompound.c
View File

@ -1,7 +1,7 @@
/*! \file
Functions for Compound Types
Copyright 2011 University Corporation for Atmospheric
Copyright 2018 University Corporation for Atmospheric
Research/Unidata. See \ref copyright file for more info. */
#include "ncdispatch.h"
@ -21,9 +21,9 @@ nc_insert_compound(). Call nc_insert_compound() once for each field
you wish to insert into the compound type.
\param ncid \ref ncid
\param size The size, in bytes, of the compound type.
\param size The size, in bytes, of the compound type.
\param name \ref object_name of the created type.
\param typeidp The type ID of the new type is copied here.
\param typeidp The type ID of the new type is copied here.
\returns ::NC_NOERR No error.
\returns ::NC_EBADID Bad \ref ncid.
@ -35,7 +35,7 @@ you wish to insert into the compound type.
\returns ::NC_ENOTNC4 This file was created with the strict netcdf-3 flag, therefore netcdf-4 operations are not allowed. (see nc_open).
\returns ::NC_EHDFERR An error was reported by the HDF5 layer.
\returns ::NC_EPERM Attempt to write to a read-only file.
\returns ::NC_ENOTINDEFINE Not in define mode.
\returns ::NC_ENOTINDEFINE Not in define mode.
\section nc_def_compound_example Example
@ -46,7 +46,7 @@ int i1;
int i2;
};
struct s1 data[DIM_LEN], data_in[DIM_LEN];
if (nc_create(FILE_NAME, NC_NETCDF4, &ncid)) ERR;
if (nc_def_compound(ncid, sizeof(struct s1), SVC_REC, &typeid)) ERR;
if (nc_insert_compound(ncid, typeid, BATTLES_WITH_KLINGONS,
@ -60,7 +60,7 @@ if (nc_close(ncid)) ERR;
\endcode
*/
int
nc_def_compound(int ncid, size_t size, const char *name,
nc_def_compound(int ncid, size_t size, const char *name,
nc_type *typeidp)
{
NC* ncp;
@ -82,7 +82,7 @@ nc_def_compound(), or nc_inq_var().
\param offset Offset in byte from the beginning of the compound type
for this field.
\param field_typeid The type of the field to be inserted.
\param field_typeid The type of the field to be inserted.
\returns ::NC_NOERR No error.
\returns ::NC_EBADID Bad \ref ncid.
@ -93,10 +93,10 @@ for this field.
\returns ::NC_ENOTNC4 Not an netCDF-4 file, or classic model enabled.
\returns ::NC_EHDFERR An error was reported by the HDF5 layer.
\returns ::NC_EPERM Attempt to write to a read-only file.
\returns ::NC_ENOTINDEFINE Not in define mode.
\returns ::NC_ENOTINDEFINE Not in define mode.
*/
int
nc_insert_compound(int ncid, nc_type xtype, const char *name,
nc_insert_compound(int ncid, nc_type xtype, const char *name,
size_t offset, nc_type field_typeid)
{
NC *ncp;
@ -119,7 +119,7 @@ nc_def_compound(), or nc_inq_var().
\param offset Offset in byte from the beginning of the compound type
for this field.
\param field_typeid The type of the field to be inserted.
\param field_typeid The type of the field to be inserted.
\param ndims Number of dimensions in array.
@ -135,11 +135,11 @@ for this field.
\returns ::NC_ENOTNC4 Not an netCDF-4 file, or classic model enabled.
\returns ::NC_EHDFERR An error was reported by the HDF5 layer.
\returns ::NC_EPERM Attempt to write to a read-only file.
\returns ::NC_ENOTINDEFINE Not in define mode.
\returns ::NC_ENOTINDEFINE Not in define mode.
*/
int
nc_insert_array_compound(int ncid, nc_type xtype, const char *name,
size_t offset, nc_type field_typeid,
nc_insert_array_compound(int ncid, nc_type xtype, const char *name,
size_t offset, nc_type field_typeid,
int ndims, const int *dim_sizes)
{
NC* ncp;
@ -172,7 +172,7 @@ placed here. \ref ignored_if_null.
\returns ::NC_EHDFERR An error was reported by the HDF5 layer.
*/
int
nc_inq_compound(int ncid, nc_type xtype, char *name,
nc_inq_compound(int ncid, nc_type xtype, char *name,
size_t *sizep, size_t *nfieldsp)
{
int class = 0;
@ -206,7 +206,7 @@ nc_inq_compound_name(int ncid, nc_type xtype, char *name)
}
/** \ingroup user_types
Learn the size of a compound type.
Learn the size of a compound type.
\param ncid \ref ncid
@ -229,7 +229,7 @@ nc_inq_compound_size(int ncid, nc_type xtype, size_t *sizep)
}
/** \ingroup user_types
Learn the number of fields in a compound type.
Learn the number of fields in a compound type.
\param ncid \ref ncid
@ -252,7 +252,7 @@ nc_inq_compound_nfields(int ncid, nc_type xtype, size_t *nfieldsp)
}
/** \ingroup user_types
Get information about one of the fields of a compound type.
Get information about one of the fields of a compound type.
\param ncid \ref ncid
@ -284,9 +284,9 @@ field. \ref ignored_if_null.
\returns ::NC_EHDFERR An error was reported by the HDF5 layer.
*/
int
nc_inq_compound_field(int ncid, nc_type xtype, int fieldid,
char *name, size_t *offsetp,
nc_type *field_typeidp, int *ndimsp,
nc_inq_compound_field(int ncid, nc_type xtype, int fieldid,
char *name, size_t *offsetp,
nc_type *field_typeidp, int *ndimsp,
int *dim_sizesp)
{
NC* ncp;
@ -298,7 +298,7 @@ nc_inq_compound_field(int ncid, nc_type xtype, int fieldid,
}
/** \ingroup user_types
Get information about one of the fields of a compound type.
Get information about one of the fields of a compound type.
\param ncid \ref ncid
@ -318,7 +318,7 @@ ignored_if_null.
\returns ::NC_EHDFERR An error was reported by the HDF5 layer.
*/
int
nc_inq_compound_fieldname(int ncid, nc_type xtype, int fieldid,
nc_inq_compound_fieldname(int ncid, nc_type xtype, int fieldid,
char *name)
{
NC* ncp;
@ -330,7 +330,7 @@ nc_inq_compound_fieldname(int ncid, nc_type xtype, int fieldid,
}
/** \ingroup user_types
Get information about one of the fields of a compound type.
Get information about one of the fields of a compound type.
\param ncid \ref ncid
@ -350,7 +350,7 @@ ignored_if_null.
\returns ::NC_EHDFERR An error was reported by the HDF5 layer.
*/
int
nc_inq_compound_fieldoffset(int ncid, nc_type xtype, int fieldid,
nc_inq_compound_fieldoffset(int ncid, nc_type xtype, int fieldid,
size_t *offsetp)
{
NC* ncp;
@ -360,7 +360,7 @@ nc_inq_compound_fieldoffset(int ncid, nc_type xtype, int fieldid,
}
/** \ingroup user_types
Get information about one of the fields of a compound type.
Get information about one of the fields of a compound type.
\param ncid \ref ncid
@ -380,7 +380,7 @@ field. \ref ignored_if_null.
\returns ::NC_EHDFERR An error was reported by the HDF5 layer.
*/
int
nc_inq_compound_fieldtype(int ncid, nc_type xtype, int fieldid,
nc_inq_compound_fieldtype(int ncid, nc_type xtype, int fieldid,
nc_type *field_typeidp)
{
NC* ncp;
@ -390,7 +390,7 @@ nc_inq_compound_fieldtype(int ncid, nc_type xtype, int fieldid,
}
/** \ingroup user_types
Get information about one of the fields of a compound type.
Get information about one of the fields of a compound type.
\param ncid \ref ncid
@ -410,7 +410,7 @@ field. \ref ignored_if_null.
\returns ::NC_EHDFERR An error was reported by the HDF5 layer.
*/
int
nc_inq_compound_fieldndims(int ncid, nc_type xtype, int fieldid,
nc_inq_compound_fieldndims(int ncid, nc_type xtype, int fieldid,
int *ndimsp)
{
NC* ncp;
@ -420,7 +420,7 @@ nc_inq_compound_fieldndims(int ncid, nc_type xtype, int fieldid,
}
/** \ingroup user_types
Get information about one of the fields of a compound type.
Get information about one of the fields of a compound type.
\param ncid \ref ncid
@ -440,7 +440,7 @@ field. \ref ignored_if_null.
\returns ::NC_EHDFERR An error was reported by the HDF5 layer.
*/
int
nc_inq_compound_fielddim_sizes(int ncid, nc_type xtype, int fieldid,
nc_inq_compound_fielddim_sizes(int ncid, nc_type xtype, int fieldid,
int *dim_sizesp)
{
NC *ncp;
@ -472,7 +472,7 @@ field. \ref ignored_if_null.
\returns ::NC_EHDFERR An error was reported by the HDF5 layer.
*/
int
nc_inq_compound_fieldindex(int ncid, nc_type xtype, const char *name,
nc_inq_compound_fieldindex(int ncid, nc_type xtype, const char *name,
int *fieldidp)
{
NC* ncp;
@ -481,9 +481,3 @@ nc_inq_compound_fieldindex(int ncid, nc_type xtype, const char *name,
return ncp->dispatch->inq_compound_fieldindex(ncid,xtype,name,fieldidp);
}
/*! \} */ /* End of named group ...*/

8
libdispatch/dcopy.c
View File

@ -1,6 +1,6 @@
/**
* @file
* Copyright 2010 University Corporation for Atmospheric
* Copyright 2018 University Corporation for Atmospheric
* Research/Unidata. See COPYRIGHT file for more info.
*
* This file has the var and att copy functions.
@ -13,7 +13,7 @@
#ifdef USE_NETCDF4
/**
* @internal Compare two netcdf types for equality. Must have the
* ncids as well, to find user-defined types.
* ncids as well, to find user-defined types.
*
* @param ncid1 File ID.
* @param typeid1 Type ID.
@ -152,7 +152,7 @@ NC_compare_nc_types(int ncid1, int typeid1, int ncid2, int typeid2,
/**
* @internal Recursively hunt for a netCDF type id. (Code from
* nc4internal.c); Return matching typeid or 0 if not found.
* nc4internal.c); Return matching typeid or 0 if not found.
*
* @param ncid1 File ID.
* @param tid1 Type ID.
@ -226,7 +226,7 @@ NC_rec_find_nc_type(int ncid1, nc_type tid1, int ncid2, nc_type* tid2)
/**
* @internal Given a type in one file, find its equal (if any) in
* another file. It sounds so simple, but it's a real pain!
* another file. It sounds so simple, but it's a real pain!
*
* @param ncid1 File ID.
* @param xtype1 Type ID.

2
libdispatch/ddim.c
View File

@ -3,7 +3,7 @@ Dimension functions
These functions define and inquire about dimensions.
Copyright 2010 University Corporation for Atmospheric
Copyright 2018 University Corporation for Atmospheric
Research/Unidata. See COPYRIGHT file for more info.
*/

6
libdispatch/ddispatch.c
View File

@ -1,5 +1,5 @@
/*
Copyright (c) 1998-2017 University Corporation for Atmospheric Research/Unidata
Copyright (c) 1998-2018 University Corporation for Atmospheric Research/Unidata
See LICENSE.txt for license information.
*/
@ -212,7 +212,7 @@ NC_urlmodel(const char* path, int mode, char** newurl)
found = 1;
break;
}
}
}
if(found) {
model = protolist->model;
/* Substitute the protocol in any case */
@ -231,7 +231,7 @@ NC_urlmodel(const char* path, int mode, char** newurl)
model = NC_FORMATX_DAP2;
else if((match=ncurilookup(url,"dap4")) != NULL || strcmp(proto,"dap4") == 0)
model = NC_FORMATX_DAP4;
else
else
model = 0; /* Still don't know */
}
if(model == 0) {/* Last resort: use the mode */

2
libdispatch/denum.c
View File

@ -1,7 +1,7 @@
/*! \file
Functions for Enum Types
Copyright 2011 University Corporation for Atmospheric
Copyright 2018 University Corporation for Atmospheric
Research/Unidata. See \ref copyright file for more info. */
#include "ncdispatch.h"

2
libdispatch/derror.c
View File

@ -3,7 +3,7 @@ Error messages and library version.
These functions return the library version, and error messages.
Copyright 2010 University Corporation for Atmospheric
Copyright 2018 University Corporation for Atmospheric
Research/Unidata. See COPYRIGHT file for more info.
*/

2
libdispatch/dfile.c
View File

@ -6,7 +6,7 @@
* These functions end up calling functions in one of the dispatch
* layers (netCDF-4, dap server, etc).
*
* Copyright 2010 University Corporation for Atmospheric
* Copyright 2018 University Corporation for Atmospheric
* Research/Unidata. See COPYRIGHT file for more info.
*/

2
libdispatch/dfilter.c
View File

@ -1,5 +1,5 @@
/*
* Copyright 1996, University Corporation for Atmospheric Research
* Copyright 2018, University Corporation for Atmospheric Research
* See netcdf/COPYRIGHT file for copying and redistribution conditions.
*/

2
libdispatch/dgroup.c
View File

@ -1,7 +1,7 @@
/*! \file
Functions for netCDF-4 features.
Copyright 2010 University Corporation for Atmospheric
Copyright 2018 University Corporation for Atmospheric
Research/Unidata. See \ref copyright file for more info. */
#include "ncdispatch.h"

2
libdispatch/dinternal.c
View File

@ -1,7 +1,7 @@
/*! \internal
Public functions from dispatch table.
Copyright 2010 University Corporation for Atmospheric
Copyright 2018 University Corporation for Atmospheric
Research/Unidata. See COPYRIGHT file for more info.
*/

2
libdispatch/doffsets.c
View File

@ -1,5 +1,5 @@
/*********************************************************************
* Copyright 1993, UCAR/Unidata
* Copyright 2018, UCAR/Unidata
* See netcdf/COPYRIGHT file for copying and redistribution conditions.
* $Header: /upc/share/CVS/netcdf-3/ncgen/offsets.c,v 1.1 2009/09/25 18:22:40 dmh Exp $
*********************************************************************/

2
libdispatch/dopaque.c
View File

@ -1,7 +1,7 @@
/*! \file
Functions for Opaque Types
Copyright 2011 University Corporation for Atmospheric
Copyright 2018 University Corporation for Atmospheric
Research/Unidata. See \ref copyright file for more info. */
#include "ncdispatch.h"

2
libdispatch/dparallel.c
View File

@ -1,4 +1,4 @@
/* Copyright 2010 University Corporation for Atmospheric
/* Copyright 2018 University Corporation for Atmospheric
Research/Unidata. See COPYRIGHT file for more info. */
/**
* @file

4
libdispatch/drc.c
View File

@ -1,6 +1,6 @@
/*
Copyright (c) 1998-2017 University Corporation for Atmospheric Research/Unidata
See LICENSE.txt for license information.
Copyright (c) 1998-2018 University Corporation for Atmospheric Research/Unidata
See COPYRIGHT for license information.
*/
#include "config.h"

2
libdispatch/dstring.c
View File

@ -1,5 +1,5 @@
/*
* Copyright 1996, University Corporation for Atmospheric Research
* Copyright 2018, University Corporation for Atmospheric Research
* See netcdf/COPYRIGHT file for copying and redistribution conditions.
*/
/* $Id: string.c,v 1.76 2010/05/26 21:43:33 dmh Exp $ */

2
libdispatch/dtype.c
View File

@ -1,7 +1,7 @@
/*! \file
Functions for User-Defined Types
Copyright 2011 University Corporation for Atmospheric
Copyright 2018 University Corporation for Atmospheric
Research/Unidata. See \ref copyright file for more info. */
#include "ncdispatch.h"

2
libdispatch/dutf8.c
View File

@ -1,5 +1,5 @@
/*
* Copyright 2017, University Corporation for Atmospheric Research
* Copyright 2018, University Corporation for Atmospheric Research
* See netcdf/COPYRIGHT file for copying and redistribution conditions.
*/

2
libdispatch/dutil.c
View File

@ -1,5 +1,5 @@
/*********************************************************************
* Copyright 2016, UCAR/Unidata
* Copyright 2018, UCAR/Unidata
* See netcdf/COPYRIGHT file for copying and redistribution conditions.
*********************************************************************/

2
libdispatch/dv2i.c
View File

@ -1,7 +1,7 @@
/** \file
The V2 API Functions.
Copyright 1996, University Corporation for Atmospheric Research
Copyright 2018, University Corporation for Atmospheric Research
See \ref copyright file for copying and redistribution conditions.
*/

2
libdispatch/dvar.c
View File

@ -1102,7 +1102,7 @@ Warning: this function is only defined if the type of the variable
is an atomic integer or float type.
This function may only be called after the variable is defined, but
before nc_enddef is called.
before nc_enddef is called.
@param[in] ncid NetCDF ID, from a previous call to nc_open or
nc_create.

2
libdispatch/dvarget.c
View File

@ -1,7 +1,7 @@
/*! \file
Functions for getting data from variables.
Copyright 2011 University Corporation for Atmospheric
Copyright 2018 University Corporation for Atmospheric
Research/Unidata. See \ref copyright file for more info.
*/

2
libdispatch/dvarput.c
View File

@ -1,7 +1,7 @@
/*! \file dvarput.c
Functions for writing data to variables.
Copyright 2010 University Corporation for Atmospheric
Copyright 2018 University Corporation for Atmospheric
Research/Unidata. See COPYRIGHT file for more info.
*/

2
libdispatch/dvlen.c
View File

@ -1,7 +1,7 @@
/*! \file
Functions for VLEN Types
Copyright 2011 University Corporation for Atmospheric
Copyright 2018 University Corporation for Atmospheric
Research/Unidata. See \ref copyright file for more info. */
#include "ncdispatch.h"

2
libdispatch/dwinpath.c
View File

@ -1,5 +1,5 @@
/*
* Copyright 1996, University Corporation for Atmospheric Research
* Copyright 2018, University Corporation for Atmospheric Research
* See netcdf/COPYRIGHT file for copying and redistribution conditions.
*/

16
libdispatch/json.c
View File

@ -1,11 +1,11 @@
/* Copyright 2016, UCAR/Unidata.
See the LICENSE file for more information.
/* Copyright 2018, UCAR/Unidata.
See the COPYRIGHT file for more information.
*/
#ifndef NCJSON_INC
#define NCJSON_INC 1
#define NCJ_DICT 1
#define NCJ_DICT 1
#define NCJ_LIST 2
#define NCJ_WORD 3
#define NCJ_NUMBER 4
@ -77,7 +77,7 @@ done:
static int
NCJyytext(NCJparser* parser, char* start, ptrdiff_t pdlen)
{
size_t len = (size_t)pdlen;
size_t len = (size_t)pdlen;
if(parser->yytext == NULL)
parser->yytext = (char*)malloc(len+1);
else
@ -133,13 +133,13 @@ NCJlex(NCJparser* parser)
for(;;) {
c = *parser->pos++;
if(c == NCJ_QUOTE || c == NCJ_NUL) break;
last++;
last++;
}
if(c == NCJ_NUL) {
parser->errno = NCJ_ESTRING;
token = NCJ_ERR;
goto done;
}
}
if(!NCJyytext(parser,start,(next - start))) goto done;
token = NCJ_STRING;
} else { /* single char token */
@ -147,7 +147,7 @@ NCJlex(NCJparser* parser)
}
done:
if(parser->errno) token = NCJ_ERR;
return token;
return token;
}
/* Simple recursive descent */
@ -174,7 +174,7 @@ NCJparseR(NCJparser* parser, NCjson** listp)
default:
parser->errno = NCJ_EBADTOKEN;
}
return NULL;
return NULL;
}
static NCjson*

2
libdispatch/nc.c
View File

@ -1,5 +1,5 @@
/*
* Copyright 1996, University Corporation for Atmospheric Research
* Copyright 2018, University Corporation for Atmospheric Research
* See netcdf/COPYRIGHT file for copying and redistribution conditions.
*/

2
libdispatch/ncbytes.c
View File

@ -1,4 +1,4 @@
/* Copyright 2009, UCAR/Unidata and OPeNDAP, Inc.
/* Copyright 2018, UCAR/Unidata and OPeNDAP, Inc.
See the COPYRIGHT file for more information. */
#include <stdlib.h>

2
libdispatch/nchashmap.c
View File

@ -1,5 +1,5 @@
/*
Copyright (c) 1998-2017 University Corporation for Atmospheric Research/Unidata
Copyright (c) 1998-2018 University Corporation for Atmospheric Research/Unidata
See LICENSE.txt for license information.
*/

12
libdispatch/nclist.c
View File

@ -1,4 +1,4 @@
/* Copyright 2009, UCAR/Unidata and OPeNDAP, Inc.
/* Copyright 2018, UCAR/Unidata and OPeNDAP, Inc.
See the COPYRIGHT file for more information. */
#include <stdlib.h>
#include <stdio.h>
@ -113,7 +113,7 @@ nclistset(NClist* l, size_t index, void* elem)
if(l == NULL) return FALSE;
if(!nclistsetalloc(l,index+1)) return FALSE;
if(index >= l->length) {
if(!nclistsetlength(l,index+1)) return FALSE;
if(!nclistsetlength(l,index+1)) return FALSE;
}
l->content[index] = elem;
return TRUE;
@ -147,7 +147,7 @@ void*
nclistpop(NClist* l)
{
if(l == NULL || l->length == 0) return NULL;
l->length--;
l->length--;
return l->content[l->length];
}
@ -168,7 +168,7 @@ nclistremove(NClist* l, size_t i)
elem = l->content[i];
for(i+=1;i<len;i++) l->content[i-1] = l->content[i];
l->length--;
return elem;
return elem;
}
/* Duplicate and return the content (null terminate) */
@ -212,7 +212,7 @@ nclistelemremove(NClist* l, void* elem)
}
/* Extends nclist to include a unique operator
/* Extends nclist to include a unique operator
which remove duplicate values; NULL values removed
return value is always 1.
*/
@ -229,7 +229,7 @@ nclistunique(NClist* l)
for(j=i+1;j<len;j++) {
if(content[i] == content[j]) {
/* compress out jth element */
for(k=j+1;k<len;k++) content[k-1] = content[k];
for(k=j+1;k<len;k++) content[k-1] = content[k];
len--;
}
}

5
libdispatch/nclistmgr.c
View File

@ -1,5 +1,5 @@
/*********************************************************************
Copyright 2010, UCAR/Unidata See netcdf/COPYRIGHT file for
Copyright 2018, UCAR/Unidata See netcdf/COPYRIGHT file for
copying and redistribution conditions.
*********************************************************************/
@ -111,7 +111,7 @@ find_in_NCList_by_name(const char* path)
if(strcmp(nc_filelist[i]->path,path)==0) {
f = nc_filelist[i];
break;
}
}
}
}
return f;
@ -126,4 +126,3 @@ iterate_NCList(int index, NC** ncp)
if(ncp) *ncp = nc_filelist[index];
return NC_NOERR;
}

2
libdispatch/nclog.c
View File

@ -1,5 +1,5 @@
/*********************************************************************
* Copyright 2010, UCAR/Unidata
* Copyright 2018, UCAR/Unidata
* See netcdf/COPYRIGHT file for copying and redistribution conditions.
* $Header$
*********************************************************************/

52
libdispatch/nctime.c
View File

@ -1,10 +1,10 @@
/*********************************************************************
* Copyright 2008, University Corporation for Atmospheric Research
* Copyright 2018, University Corporation for Atmospheric Research
* See netcdf/COPYRIGHT file for copying and redistribution conditions.
* $Id: nctime.c,v 1.9 2010/05/05 22:15:39 dmh Exp $
*********************************************************************/
/*
/*
* This code was extracted with permission from the CDMS time
* conversion and arithmetic routines developed by Bob Drach, Lawrence
* Livermore National Laboratory as part of the cdtime library. Russ
@ -58,7 +58,7 @@ static void
cdError(char *fmt, ...)
{
va_list args;
cuErrorOccurred = 1;
if(cuErrOpts & CU_VERBOSE){
va_start(args,fmt);
@ -84,11 +84,11 @@ static int days_sum[12] = {0,31,59,90,120,151,181,212,243,273,304,334};
* date->year (long) (year since 0 BC)
* date->timeType (CdTimetype) (time type)
* date->baseYear base year for relative times
* Output:
* date->month (short) (month in year)
* Output:
* date->month (short) (month in year)
* date->day (short) (day in month)
*
*
*
* Derived from NRL NEONS V3.6.
*/
@ -131,14 +131,14 @@ CdMonthDay(int *doy, CdTime *date)
}
/* Compute day-of-year from year, month and day
*
*
* Input:
* date->year (long) (year since 0 BC)
* date->month (short) (month in year)
* date->day (short) (day in month)
* date->baseYear base year for relative times
* Output: doy (int) (day-of-year)
*
*
* Derived from NRL NEONS V3.6
*/
@ -152,7 +152,7 @@ CdDayOfYear(CdTime *date, int *doy)
month = date->month;
if (month < 1 || month > 12) {
cdError( "Day-of-year error; month: %d\n", month);
month = 1;
month = 1;
}
if(!(date->timeType & CdChronCal)) /* Ignore year for Clim calendar */
@ -173,14 +173,14 @@ CdDayOfYear(CdTime *date, int *doy)
/* Convert epochal time (hours since 00 jan 1, 1970)
* to human time (structured)
*
* Input:
*
* Input:
* etime = epochal time representation
* timeType = time type (e.g., CdChron, CdClim, etc.) as defined in cdms.h
* baseYear = base real, used for relative time types only
*
*
* Output: htime = human (structured) time representation
*
*
* Derived from NRL Neons V3.6
*/
void
@ -404,7 +404,7 @@ cdDiffGregorian(cdCompTime ca, cdCompTime cb){
/* Return -1, 0, 1 as ca is less than, equal to, */
/* or greater than cb, respectively. */
static int
static int
cdCompCompare(cdCompTime ca, cdCompTime cb){
int test;
@ -469,7 +469,7 @@ CdDivDelTime(double begEtm, double endEtm, CdDeltaTime delTime, CdTimeType timeT
long delMonths, range;
CdTime bhtime, ehtime;
int hoursInYear;
extern void Cde2h(double etime, CdTimeType timeType, long baseYear, CdTime *htime);
switch(delTime.units){
@ -610,11 +610,11 @@ cdToOldTimetype(cdCalenType newtype, CdTimeType* oldtype)
}
/* Convert human time to epochal time (hours since 00 jan 1, 1970)
*
*
* Input: htime = human time representation
*
*
* Output: etime = epochal time representation
*
*
* Derived from NRL Neons V3.6
*/
void
@ -628,7 +628,7 @@ Cdh2e(CdTime *htime, double *etime)
int daysInYear; /* days in non-leap year */
CdDayOfYear(htime,&doy);
day_cnt = 0;
baseYear = ((htime->timeType) & CdBase1970) ? 1970 : htime->baseYear;
@ -641,7 +641,7 @@ Cdh2e(CdTime *htime, double *etime)
daysInLeapYear = ((htime->timeType) & Cd365) ? 366 : 360;
daysInYear = ((htime->timeType) & Cd365) ? 365 : 360;
}
if (year > baseYear) {
for (ytemp = year - 1; ytemp >= baseYear; ytemp--) {
day_cnt += ISLEAP(ytemp,htime->timeType) ? daysInLeapYear : daysInYear;
@ -650,7 +650,7 @@ Cdh2e(CdTime *htime, double *etime)
for (ytemp = year; ytemp < baseYear; ytemp++) {
day_cnt -= ISLEAP(ytemp,htime->timeType) ? daysInLeapYear : daysInYear;
}
}
}
*etime = (double) (day_cnt + doy - 1) * 24. + htime->hour;
return;
}
@ -687,7 +687,7 @@ cdChar2Comp(cdCalenType timetype, char* chartime, cdCompTime* comptime)
comptime->month = CD_NULL_MONTH;
comptime->day = CD_NULL_DAY;
comptime->hour = CD_NULL_HOUR;
if(timetype & cdStandardCal){
nconv = sscanf(chartime,"%ld-%hd-%hd %d:%d:%lf",&year,&month,&day,&ihr,&imin,&sec);
if(nconv==EOF || nconv==0){
@ -787,7 +787,7 @@ cdComp2Rel(cdCalenType timetype, cdCompTime comptime, char* relunits, double* re
cdUnitTime unit;
double base_etm, etm, delta;
long ndel, hoursInYear;
/* Parse the relunits */
if(cdParseRelunits(timetype, relunits, &unit, &base_comptime))
return;
@ -807,7 +807,7 @@ cdComp2Rel(cdCalenType timetype, cdCompTime comptime, char* relunits, double* re
default: break;
}
}
/* Convert basetime to epochal */
humantime.year = base_comptime.year;
humantime.month = base_comptime.month;
@ -1071,7 +1071,7 @@ cdRel2Comp(cdCalenType timetype, char* relunits, double reltime, cdCompTime* com
/* Convert back to human, then comptime. */
else if(baseunits == cdHour){
Cde2h(base_etm+delta, old_timetype, 1970, &humantime);
}
comptime->year = humantime.year;
comptime->month = humantime.month;
@ -1091,7 +1091,7 @@ cdComp2Iso(cdCalenType timetype, int separator, cdCompTime comptime, char* time)
if(cdValidateTime(timetype,comptime))
return;
ihr = (int)comptime.hour;
dtmp = 60.0 * (comptime.hour - (double)ihr);
imin = (int)dtmp;

2
libdispatch/ncuri.c
View File

@ -1,5 +1,5 @@
/*********************************************************************
* Copyright 2010, UCAR/Unidata
* Copyright 2018, UCAR/Unidata
* See netcdf/COPYRIGHT file for copying and redistribution conditions.
* $Header$
*********************************************************************/

5
libdispatch/netcdf.m4
View File

@ -1,12 +1,12 @@
/*
Copyright 2010 University Corporation for Atmospheric
Copyright 2018 University Corporation for Atmospheric
Research/Unidata. See COPYRIGHT file for more info.
This file defines most of the netcdf API in terms of the dispatch
functions along with a few functions that are overlays over the
dispatch functions.
"$Id: netcdf.m4,v 1.16 2010/06/01 15:34:50 ed Exp $"
"$Id: netcdf.m4,v 1.16 2010/06/01 15:34:50 ed Exp $"
*/
#include "ncdispatch.h"
@ -588,4 +588,3 @@ NC_PUT_ATT(ulonglong,unsigned long long)
#ifdef USE_NETCDF4
/*NC_PUT_ATT(string,char*) defined separately */
#endif /*USE_NETCDF4*/

2
libdispatch/stubdef.c
View File

@ -1,5 +1,5 @@
/*********************************************************************
* Copyright 1993, UCAR/Unidata
* Copyright 2018, UCAR/Unidata
* See netcdf/COPYRIGHT file for copying and redistribution conditions.
*********************************************************************/

2
libdispatch/test_ncuri.c
View File

@ -1,5 +1,5 @@
/*********************************************************************
* Copyright 2016, UCAR/Unidata
* Copyright 2018, UCAR/Unidata
* See netcdf/COPYRIGHT file for copying and redistribution conditions.
*********************************************************************/

4
libdispatch/test_pathcvt.c
View File

@ -1,5 +1,5 @@
/*********************************************************************
* Copyright 2016, UCAR/Unidata
* Copyright 2018, UCAR/Unidata
* See netcdf/COPYRIGHT file for copying and redistribution conditions.
*********************************************************************/
@ -50,7 +50,7 @@ main(int argc, char** argv)
}
#ifdef VERBOSE
fprintf(stderr,"NCpathcvt:: input: |%s| actual=|%s|\n",test->path,cvt);
#endif
#endif
free(cvt);
}