mirror/netcdf-c
2
0
Fork 0
mirror of https://github.com/Unidata/netcdf-c.git synced 2025-01-18 15:55:12 +08:00
Code Issues Packages Projects Releases Wiki Activity

More synchronization of copyright stanzas.

Browse Source
This commit is contained in:
Ward Fisher 2018-12-06 14:34:40 -07:00
parent 25417880f7
commit 87110139f6
28 changed files with 71 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libhdf5/nc4hdf.c
View File

@ -1,4 +1,4 @@
/* Copyright 2003, University Corporation for Atmospheric
/* Copyright 2018, University Corporation for Atmospheric
* Research. See the COPYRIGHT file for copying and redistribution
* conditions. */
/**
@ -2791,4 +2791,3 @@ NC4_walk(hid_t gid, int* countp)
}
return ncstat;
}

13
libhdf5/nc4info.c
View File

@ -2,7 +2,7 @@
* @file
* @internal Add provenance info for netcdf-4 files.
*
* Copyright 2010, UCAR/Unidata See netcdf/COPYRIGHT file for copying
* Copyright 2018, UCAR/Unidata See netcdf/COPYRIGHT file for copying
* and redistribution conditions.
* @author Dennis Heimbigner
*/
@ -73,7 +73,7 @@ NC4_provenance_init(void)
{stat = NC_ENOMEM; goto done;}
nclistpush(globalpropinfo.properties,value);
value = NULL;
/* Insert the HDF5 as underlying storage format library */
if((name = strdup(NCPHDF5LIB2)) == NULL)
{stat = NC_ENOMEM; goto done;}
@ -109,7 +109,7 @@ done:
if(name != NULL) free(name);
if(value != NULL) free(value);
if(other != NULL)
nclistfreeall(other);
nclistfreeall(other);
if(stat && globalpropinfo.properties != NULL) {
nclistfreeall(globalpropinfo.properties);
globalpropinfo.properties = NULL;
@ -192,7 +192,7 @@ properties_parse(const char* text0, NClist* pairs)
*q++ = '\0';
next = q;
/* split key and value */
q = locate(p,'=');
q = locate(p,'=');
name = p;
*q++ = '\0';
value = q;
@ -517,7 +517,7 @@ NC4_read_ncproperties(NC_FILE_INFO_T* h5)
hdf5grpid = ((NC_HDF5_GRP_INFO_T *)(h5->root_grp->format_grp_info))->hdf_grpid;
if(H5Aexists(hdf5grpid,NCPROPS) <= 0) { /* Does not exist */
/* File did not contain a _NCProperties attribute */
/* File did not contain a _NCProperties attribute */
retval=NC4_get_provenance(h5,NULL,&globalpropinfo);
goto done;
}
@ -641,7 +641,7 @@ ncprintpropinfo(struct NCPROPINFO* info)
char* name = nclistget(info->properties,i);
char* value = nclistget(info->properties,i+1);
fprintf(stderr,"\t[%d] name=|%s| value=|%s|\n",i,name,value);
}
}
}
void
@ -650,4 +650,3 @@ ncprintprovenance(struct NCPROVENANCE* prov)
fprintf(stderr,"[%p] superblockversion=%d\n",prov,prov->superblockversion);
ncprintpropinfo(&prov->propattr);
}

7
liblib/CMakeLists.txt
View File

@ -1,4 +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(liblib_LIBS dispatch netcdf3)
#####
@ -8,7 +13,7 @@ SET(liblib_LIBS dispatch netcdf3)
IF(USE_HDF5 OR USE_NETCDF4)
SET(liblib_LIBS ${liblib_LIBS} netcdf4)
SET(liblib_LIBS ${liblib_LIBS} netcdfhdf5)
ENDIF()
IF(USE_PNETCDF)

2
liblib/Makefile.am
View File

@ -1,5 +1,5 @@
## This is a automake file, part of Unidata's netCDF package.
# Copyright 2010, see the COPYRIGHT file for more information.
# Copyright 2018, see the COPYRIGHT file for more information.
# This Makefile assembles the correct libnetcdf based on various
# configure flags. It is assumed that all the relevant convenience

2
liblib/nc_initialize.c
View File

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

2
libsrc/CMakeLists.txt
View File

@ -1,5 +1,5 @@
## This is a CMake file, part of Unidata's netCDF package.
# Copyright 2012-2013, see the COPYRIGHT file for more information.
# Copyright 2012-2018, see the COPYRIGHT file for more information.
# Process these files with m4.
SET(m4_SOURCES attr ncx putget t_ncxx)

2
libsrc/Makefile.am
View File

@ -1,5 +1,5 @@
## This is an 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 automake file is in charge of building the libsrc directory,
# which contains the classic library code.

2
libsrc/attr.m4
View File

@ -5,7 +5,7 @@ dnl If you see this line, you can ignore the next one.
/* Do not edit this file. It is produced from the corresponding .m4 source */
dnl
/*
* Copyright 1996, University Corporation for Atmospheric Research
* Copyright 2018, University Corporation for Atmospheric Research
* See netcdf/COPYRIGHT file for copying and redistribution conditions.
*/

2
libsrc/dim.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: dim.c,v 1.83 2010/05/25 17:54:15 dmh Exp $ */

2
libsrc/ffio.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: ffio.c,v 1.56 2006/09/15 20:40:30 ed Exp $ */

2
libsrc/memio.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
libsrc/mmapio.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
libsrc/nc3dispatch.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.
$Id: nc3dispatch.c,v 2.8 2010/05/26 11:11:26 ed Exp $

2
libsrc/nc3internal.c
View File

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

2
libsrc/ncFile.c
View File

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

2
libsrc/ncio.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
libsrc/ncio.h
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: ncio.h,v 1.27 2006/01/03 04:56:28 russ Exp $ */

2
libsrc/ncstdio.c
View File

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

2
libsrc/ncstdio.h
View File

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

2
libsrc/ncx.h
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
libsrc/ncx_cray.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
libsrc/posixio.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: posixio.c,v 1.89 2010/05/22 21:59:08 dmh Exp $ */

2
libsrc/putget.m4
View File

@ -9,7 +9,7 @@ dnl If you see this line, you can ignore the next one.
/* Do not edit this file. It is produced from the corresponding .m4 source */
dnl
/*
* Copyright 1996, University Corporation for Atmospheric Research
* Copyright 2018, University Corporation for Atmospheric Research
* See netcdf/COPYRIGHT file for copying and redistribution conditions.
*/
/* $Id: putget.m4 2783 2014-10-26 05:19:35Z wkliao $ */

2
libsrc/t_ncio.c
View File

@ -1,5 +1,5 @@
/*
* Copyright 1995, University Corporation for Atmospheric Research
* Copyright 2018, University Corporation for Atmospheric Research
* See top level COPYRIGHT file for copying and redistribution conditions.
*/
/* $Id: t_ncio.c,v 1.10 2010/05/26 11:11:26 ed Exp $ */

68
libsrc/t_ncxx.m4
View File

@ -5,7 +5,7 @@ dnl If you see this line, you can ignore the next one.
/* Do not edit this file. It is produced from the corresponding .m4 source */
dnl
/*
* Copyright 1996, University Corporation for Atmospheric Research
* Copyright 2018, University Corporation for Atmospheric Research
* See netcdf/COPYRIGHT file for copying and redistribution conditions.
*/
/* "$Id: t_ncxx.m4,v 2.17 2005/05/20 14:48:14 russ Exp $" */
@ -16,13 +16,13 @@ dnl
* Unlike t_ncx.c, it only checks self consistency,
* not consistency with the xdr library.
*
* Link like this:
* Link like this:
* cc t_ncxx.c ncx.o -o t_nxc
* (The xdr library is not needed.)
*
* If an assertion fails, there is a problem.
* Otherwise, the program is silent and has exit code 0.
*/
*/
#if HAVE_CONFIG_H
#include <config.h>
@ -239,10 +239,10 @@ dnl T_PUTN(XType, Type)
dnl
define(`T_PUTN',dnl
`dnl
static void
static void
t_putn_$1_$2(char *const buf)
{
char *xp = buf;
char *xp = buf;
const $2 *tp = `$2's;
size_t nelems = ArraySize(`$2's);
int status = ncx_putn_$1_$2((void **)&xp, nelems, tp);
@ -273,10 +273,10 @@ dnl Doesn't make signed comparisons to unsigned type
dnl
define(`T_PUTN_U',dnl
`dnl
static void
static void
t_putn_$1_$2(char *const buf)
{
char *xp = buf;
char *xp = buf;
const $2 *tp = `$2's;
size_t nelems = ArraySize(`$2's);
int status = ncx_putn_$1_$2((void **)&xp, nelems, tp);
@ -301,10 +301,10 @@ dnl T_PAD_PUTN(XType, Type)
dnl
define(`T_PAD_PUTN',dnl
`dnl
static void
static void
t_pad_putn_$1_$2(char *const buf)
{
char *xp = buf;
char *xp = buf;
const $2 *tp = `$2's;
size_t nelems = ArraySize(`$2's);
const char *end = buf + nelems * Xsizeof($1);
@ -337,10 +337,10 @@ dnl T_GETN(XType, Type)
dnl
define(`T_GETN',dnl
`dnl
static void
static void
t_getn_$1_$2(const char *const buf)
{
const char *xp = buf;
const char *xp = buf;
const $2 *tp = `$2's;
$2 *lp = ($2 *)lbuf;
size_t nelems = ArraySize(`$2's);
@ -368,10 +368,10 @@ dnl Doesn't make signed comparisons to unsigned type
dnl
define(`T_GETN_U',dnl
`dnl
static void
static void
t_getn_$1_$2(const char *const buf)
{
const char *xp = buf;
const char *xp = buf;
const $2 *tp = `$2's;
$2 *lp = ($2 *)lbuf;
size_t nelems = ArraySize(`$2's);
@ -397,10 +397,10 @@ dnl T_PAD_GETN(XType, Type)
dnl
define(`T_PAD_GETN',dnl
`dnl
static void
static void
t_pad_getn_$1_$2(const char *const buf)
{
const char *xp = buf;
const char *xp = buf;
const $2 *tp = `$2's;
$2 *lp = ($2 *)lbuf;
size_t nelems = ArraySize(`$2's);
@ -434,10 +434,10 @@ dnl dnl dnl
T_PUTN(schar, schar)
dnl T_PUTN(schar, uchar) replaced by special case code.
dnl - we don't return conversion errors putting uchar to schar.
static void
static void
t_putn_schar_uchar(char *const buf)
{
char *xp = buf;
char *xp = buf;
const uchar *tp = uchars;
size_t nelems = ArraySize(schars);
int status = ncx_putn_schar_uchar((void **)&xp, nelems, tp);
@ -454,10 +454,10 @@ T_PUTN(schar, double)
T_PAD_PUTN(schar, schar)
dnl T_PAD_PUTN(schar, uchar) replaced by special case code.
dnl - we don't return conversion errors putting uchar to schar.
static void
static void
t_pad_putn_schar_uchar(char *const buf)
{
char *xp = buf;
char *xp = buf;
const uchar *tp = uchars;
size_t nelems = ArraySize(uchars);
const char *end = buf + nelems * X_SIZEOF_SCHAR;
@ -485,10 +485,10 @@ T_PUTN(short, double)
T_PAD_PUTN(short, schar)
dnl T_PAD_PUTN(short, uchar)
dnl Don't make signed comparisons to usigned type
static void
static void
t_pad_putn_short_uchar(char *const buf)
{
char *xp = buf;
char *xp = buf;
const uchar *tp = uchars;
size_t nelems = ArraySize(uchars);
const char *end = buf + nelems * X_SIZEOF_SHORT;
@ -545,10 +545,10 @@ T_PUTN(double, double)
T_GETN(schar, schar)
dnl T_GETN(schar, uchar)
dnl - we don't return conversion errors gettin schar to uchar.
static void
static void
t_getn_schar_uchar(const char *const buf)
{
const char *xp = buf;
const char *xp = buf;
const uchar *tp = uchars;
uchar *lp = (uchar *)lbuf;
size_t nelems = ArraySize(schars);
@ -574,10 +574,10 @@ T_GETN(schar, double)
T_PAD_GETN(schar, schar)
dnl T_PAD_GETN(schar, uchar)
dnl - we don't return conversion errors gettin schar to uchar.
static void
static void
t_pad_getn_schar_uchar(const char *const buf)
{
const char *xp = buf;
const char *xp = buf;
const uchar *tp = uchars;
uchar *lp = (uchar *)lbuf;
size_t nelems = ArraySize(schars);
@ -614,10 +614,10 @@ T_GETN(short, double)
T_PAD_GETN(short, schar)
dnl T_PAD_GETN(short, uchar)
dnl Don't make signed comparisons to usigned type
static void
static void
t_pad_getn_short_uchar(const char *const buf)
{
const char *xp = buf;
const char *xp = buf;
const uchar *tp = uchars;
uchar *lp = (uchar *)lbuf;
size_t nelems = ArraySize(uchars);
@ -659,10 +659,10 @@ T_GETN_U(float, uchar)
T_GETN(float, short)
dnl T_GETN(float, int)
dnl Exact conversion of int to x_float is limited by external float mantissa
static void
static void
t_getn_float_int(const char *const buf)
{
const char *xp = buf;
const char *xp = buf;
const int *tp = ints;
int *lp = (int *)lbuf;
size_t nelems = ArraySize(ints);
@ -687,10 +687,10 @@ t_getn_float_int(const char *const buf)
dnl T_GETN(float, long)
dnl Exact conversion of long to x_float is limited by external float mantissa
static void
static void
t_getn_float_long(const char *const buf)
{
const char *xp = buf;
const char *xp = buf;
const long *tp = longs;
long *lp = (long *)lbuf;
size_t nelems = ArraySize(longs);
@ -719,10 +719,10 @@ t_getn_float_long(const char *const buf)
T_GETN(float, float)
dnl T_GETN(float, double)
dnl Exact conversion of double to x_float is limited by external float mantissa
static void
static void
t_getn_float_double(const char *const buf)
{
const char *xp = buf;
const char *xp = buf;
const double *tp = doubles;
double *lp = (double *)lbuf;
size_t nelems = ArraySize(doubles);
@ -754,7 +754,7 @@ t_getn_float_double(const char *const buf)
(void) fprintf(stderr,
"%.9e != %.9e float_double (diff %.9e)\n",
tp[ii], lp[ii], tp[ii] - lp[ii]);
}
}
}

2
libsrc/v1hpg.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
libsrc/var.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: var.c,v 1.144 2010/05/30 00:50:35 russ Exp $ */

2
libsrc/winceio.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: winceio.c,v 1.2 2010/05/04 17:30:04 dmh Exp $ */