Skip to content

Commit

Permalink
More copyright stanza updates.
Browse files Browse the repository at this point in the history
  • Loading branch information
WardF committed Dec 6, 2018
1 parent 8711013 commit 763750f
Show file tree
Hide file tree
Showing 62 changed files with 363 additions and 220 deletions.
6 changes: 6 additions & 0 deletions libsrc4/CMakeLists.txt
@@ -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.
# Process these files with m4.

SET(libsrc4_SOURCES nc4dispatch.c nc4attr.c nc4dim.c nc4grp.c nc4type.c nc4var.c ncfunc.c nc4internal.c ncindex.c )
Expand Down
7 changes: 1 addition & 6 deletions libsrc4/Makefile.am
@@ -1,4 +1,4 @@
# This is part of Unidata's netCDF package. Copyright 2005-2011, see
# This is part of Unidata's netCDF package. Copyright 2005-2018, see
# the COPYRIGHT file for more information.

# This automake file generates the Makefile to build netCDF-4.
Expand All @@ -15,8 +15,3 @@ nc4internal.c nc4type.c nc4var.c ncfunc.c error4.c nc4printer.c \
ncindex.c

EXTRA_DIST = CMakeLists.txt





15 changes: 8 additions & 7 deletions libsrc4/error4.c
@@ -1,4 +1,6 @@
/* Copyright 2003-2018, University Corporation for Atmospheric
/*! \file
Copyright 2003-2018, University Corporation for Atmospheric
Research. See netcdf-4/docs/COPYRIGHT file for copying and
redistribution conditions. */
/**
Expand All @@ -8,7 +10,7 @@ redistribution conditions. */
*
* This file contains functions relating to logging errors. Also it
* contains the functions nc_malloc, nc_calloc, and nc_free.
*
*
* @author Ed Hartnett
*/

Expand All @@ -28,15 +30,15 @@ extern int nc_log_level;
/* This function prints out a message, if the severity of the message
is lower than the global nc_log_level. To use it, do something like
this:
nc_log(0, "this computer will explode in %d seconds", i);
After the first arg (the severity), use the rest like a normal
printf statement. Output will appear on stderr.
This function is heavily based on the function in section 15.5 of
the C FAQ. */
void
void
nc_log(int severity, const char *fmt, ...)
{
va_list argp;
Expand All @@ -58,17 +60,16 @@ nc_log(int severity, const char *fmt, ...)
va_start(argp, fmt);
vfprintf(stderr, fmt, argp);
va_end(argp);

/* Put on a final linefeed. */
fprintf(stderr, "\n");
fflush(stderr);
}

void
void
nc_log_hdf5(void)
{
H5Eprint(NULL);
}

#endif /* ifdef LOGGING */

19 changes: 9 additions & 10 deletions libsrc4/nc4printer.c
@@ -1,5 +1,5 @@
/*********************************************************************
* Copyright 2016, UCAR/Unidata
* Copyright 2018, UCAR/Unidata
* See netcdf/COPYRIGHT file for copying and redistribution conditions.
*********************************************************************/

Expand All @@ -17,7 +17,7 @@ create other tools.
#include "ncbytes.h"
#include "nclist.h"

#undef DEBUG
#undef DEBUG

#define BUFSIZE 4096

Expand Down Expand Up @@ -148,7 +148,7 @@ freeNC4Printer(NC4printer* out)
{
int i;

if(out == NULL) return;
if(out == NULL) return;

#ifdef DEBUG
fprintf(stderr,"free: |allnodes=%ld\n",nclistlength(out->allnodes));
Expand Down Expand Up @@ -206,7 +206,7 @@ printNode(NC4printer* out, NCID* node, int depth)

switch (node->sort) {
case GROUP:
/* Get group name */
/* Get group name */
if((ret=nc_inq_grpname(node->id,name))) FAIL;
SETNAME(node,name);
/* get group counts */
Expand Down Expand Up @@ -304,7 +304,7 @@ printNode(NC4printer* out, NCID* node, int depth)
printXMLAttributeName(out, "name", node->name);
printXMLAttributeSize(out, "size", node->size);
CAT("/>");
break;
break;
case NC_ENUM:
if((ret=nc_inq_enum(GROUPOF(node),node->id,NULL,NULL,NULL,&count))) FAIL;
INDENT(depth); CAT("<Enumeration");
Expand Down Expand Up @@ -378,7 +378,7 @@ printNode(NC4printer* out, NCID* node, int depth)
SETNAME(id,name);
id->base = findType(out,base);
id->size = count;
printAttribute(out,id,depth);
printAttribute(out,id,depth);
CAT("\n");
}
depth--;
Expand Down Expand Up @@ -636,7 +636,7 @@ makeFQN(NCID* id, NCbytes* path)
fqnWalk(g,path);
ncbytesappend(path,'/');
if(id->sort != GROUP)
ncbytescat(path,id->name);
ncbytescat(path,id->name);
ncbytesnull(path);
}

Expand All @@ -646,7 +646,7 @@ fqnWalk(NCID* grp, NCbytes* path)
if(grp->id != 0) {
NCID* parent = grp->parent;
fqnWalk(parent,path);
ncbytesappend(path,'/');
ncbytesappend(path,'/');
ncbytescat(path,parent->name);
}
}
Expand Down Expand Up @@ -738,7 +738,7 @@ printString(NCbytes* out, const char* s, int quotes)
if(c == '\\') ncbytescat(out,"\\\\");
else if(c == '"') ncbytescat(out,"\\\"");
else ncbytesappend(out,c);
}
}
if(quotes) ncbytesappend(out,'"');
ncbytesnull(out);
}
Expand Down Expand Up @@ -783,4 +783,3 @@ readAttributeValues(NCID* attr, void** valuesp)
if(valuesp) *valuesp = values;
return ret;
}

2 changes: 1 addition & 1 deletion libsrc4/nc4var.c
@@ -1,4 +1,4 @@
/* Copyright 2003-2006, University Corporation for Atmospheric
/* Copyright 2003-2018, University Corporation for Atmospheric
* Research. See COPYRIGHT file for copying and redistribution
* conditions.*/
/**
Expand Down
4 changes: 2 additions & 2 deletions libsrc4/ncfunc.c
@@ -1,7 +1,7 @@
/**
* @internal
*
* Copyright 2003, University Corporation for Atmospheric
* Copyright 2018, University Corporation for Atmospheric
* Research. See netcdf-4/docs/COPYRIGHT file for copying and
* redistribution conditions.
*
Expand Down Expand Up @@ -82,7 +82,7 @@ NC4_inq_format_extended(int ncid, int *formatp, int *modep)
if(modep)
*modep = nc->mode|NC_NETCDF4;

if (formatp)
if (formatp)
*formatp = NC_FORMATX_NC_HDF5;

return NC_NOERR;
Expand Down
12 changes: 6 additions & 6 deletions libsrc4/ncindex.c
@@ -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.
*/

Expand Down Expand Up @@ -176,7 +176,7 @@ also recompute their hashkey.
/* Return 1 if ok, 0 otherwise.*/
int
ncindexrebuild(NCindex* index)
{
{
#ifndef NCNOHASH
size_t i;
size_t size = nclistlength(index->list);
Expand All @@ -196,7 +196,7 @@ ncindexrebuild(NCindex* index)
}
#endif
if(contents != NULL) free(contents);
return 1;
return 1;
}

/* Free a list map */
Expand All @@ -206,7 +206,7 @@ ncindexfree(NCindex* index)
if(index == NULL) return 1;
nclistfree(index->list);
NC_hashmapfree(index->map);
free(index);
free(index);
return 1;
}

Expand Down Expand Up @@ -235,7 +235,7 @@ keystr(NC_hentry* e)
{
if(e->keysize < sizeof(uintptr_t))
return (const char*)(&e->key);
else
else
return (const char*)(e->key);
}
#endif
Expand All @@ -253,7 +253,7 @@ ncindexverify(NCindex* lm, int dump)
if(lm == NULL) {
fprintf(stderr,"index: <empty>\n");
return 1;
}
}
if(dump) {
fprintf(stderr,"-------------------------\n");
#ifndef NCNOHASH
Expand Down
7 changes: 7 additions & 0 deletions libsrcp/CMakeLists.txt
@@ -1,3 +1,10 @@
# 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(libsrcp_SOURCES ncpdispatch.c)

add_library(netcdfp OBJECT ${libsrcp_SOURCES})
Expand Down
4 changes: 2 additions & 2 deletions libsrcp/Makefile.am
@@ -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 2018, see the COPYRIGHT file for more information.

# This automake file is in charge of building the libsrc directory,
# which contains the classic library code.
Expand All @@ -16,4 +16,4 @@ libnetcdfp_la_SOURCES = ncpdispatch.c

noinst_LTLIBRARIES = libnetcdfp.la

EXTRA_DIST = CMakeLists.txt
EXTRA_DIST = CMakeLists.txt
2 changes: 1 addition & 1 deletion libsrcp/ncpdispatch.c
@@ -1,5 +1,5 @@
/*********************************************************************
* Copyright 1993, UCAR/Unidata
* Copyright 2018, UCAR/Unidata
* See netcdf/COPYRIGHT file for copying and redistribution conditions.
*********************************************************************/

Expand Down
7 changes: 7 additions & 0 deletions nc_test/CMakeLists.txt
@@ -1,3 +1,10 @@
# 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.

message(STATUS "CMAKE_SOURCE_DIR=${CMAKE_SOURCE_DIR}")
message(STATUS "CMAKE_BINARY_DIR=${CMAKE_BINARY_DIR}")
message(STATUS "CMAKE_CURRENT_SOURCE_DIR=${CMAKE_CURRENT_SOURCE_DIR}")
Expand Down
2 changes: 1 addition & 1 deletion nc_test/Makefile.am
@@ -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 2018, see the COPYRIGHT file for more information.

# This file builds and runs the nc_test program, which tests the
# netCDF-3 API for all formats.
Expand Down
2 changes: 1 addition & 1 deletion nc_test/error.c
@@ -1,5 +1,5 @@
/*********************************************************************
* Copyright 1996, UCAR/Unidata
* Copyright 2018, UCAR/Unidata
* See netcdf/COPYRIGHT file for copying and redistribution conditions.
* $Id: error.c,v 1.7 2007/05/15 01:36:57 ed Exp $
*********************************************************************/
Expand Down
2 changes: 1 addition & 1 deletion nc_test/error.h
@@ -1,5 +1,5 @@
/*********************************************************************
* Copyright 1993, University Corporation for Atmospheric Research
* Copyright 2018, University Corporation for Atmospheric Research
* See netcdf/COPYRIGHT file for copying and redistribution conditions.
* $Header $
*********************************************************************/
Expand Down
2 changes: 1 addition & 1 deletion nc_test/large_files.c
@@ -1,5 +1,5 @@
/*
Copyright 2004-2006, UCAR/Unidata
Copyright 2004-2018, UCAR/Unidata
See COPYRIGHT file for copying and redistribution conditions.
This is part of netCDF.
Expand Down
2 changes: 1 addition & 1 deletion nc_test/nc_test.c
@@ -1,5 +1,5 @@
/*********************************************************************
* Copyright 1996-2005, UCAR/Unidata
* Copyright 1996-2018, UCAR/Unidata
* See COPYRIGHT file for copying and redistribution conditions.
* $Id: nc_test.c 2796 2014-10-28 03:40:29Z wkliao $
*********************************************************************/
Expand Down
2 changes: 1 addition & 1 deletion nc_test/quick_large_files.c
@@ -1,5 +1,5 @@
/*
Copyright 2004-2006, UCAR/Unidata
Copyright 2004-2018, UCAR/Unidata
See COPYRIGHT file for copying and redistribution conditions.
This program (quickly, but not thoroughly) tests the large file
Expand Down
2 changes: 1 addition & 1 deletion nc_test/t_nc.c
@@ -1,4 +1,4 @@
/* Copyright 1988-2010 University Corporation for Atmospheric Research
/* Copyright 1988-2018 University Corporation for Atmospheric Research
See netcdf/COPYRIGHT file for copying and redistribution
conditions.
Expand Down

0 comments on commit 763750f

Please sign in to comment.