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 copyright stanza in libdap4

Browse Source
This commit is contained in:
Ward Fisher 2018-12-06 14:24:28 -07:00
parent c70480dc05
commit 72d56fb601
38 changed files with 73 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libdap4/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(dap4_SOURCES d4crc32.c d4curlfunctions.c d4fix.c d4data.c d4file.c d4parser.c d4meta.c d4varx.c d4dump.c d4swap.c d4chunk.c d4printer.c d4read.c d4http.c d4util.c d4odom.c d4cvt.c d4debug.c ncd4dispatch.c ezxml_extra.c ezxml.c)
add_library(dap4 OBJECT ${dap4_SOURCES})
@ -29,4 +35,3 @@ ENDIF(BUILD_PARALLEL)
FILE(GLOB CUR_EXTRA_DIST RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/*.c ${CMAKE_CURRENT_SOURCE_DIR}/*.h)
SET(CUR_EXTRA_DIST ${CUR_EXTRA_DIST} dce.y CMakeLists.txt Makefile.am)
ADD_EXTRA_DIST("${CUR_EXTRA_DIST}")

2
libdap4/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 automake file generates the Makefile to libdap2. Whatever that
# is!

2
libdap4/d4bytes.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
libdap4/d4bytes.h
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. */
#ifndef D4BYTES_H

2
libdap4/d4chunk.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
libdap4/d4chunk.h
View File

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

2
libdap4/d4curlflags.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
libdap4/d4curlfunctions.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
libdap4/d4curlfunctions.h
View File

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

2
libdap4/d4cvt.c
View File

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

2
libdap4/d4data.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
libdap4/d4debug.c
View File

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

2
libdap4/d4debug.h
View File

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

5
libdap4/d4dump.c
View File

@ -1,5 +1,5 @@
/* Copyright 2012, UCAR/Unidata.
See the LICENSE file for more information.
/* Copyright 2018, UCAR/Unidata.
See the COPYRIGHT file for more information.
*/
#include "d4includes.h"
@ -107,4 +107,3 @@ NCD4_dumpatomic(NCD4node* var, void* data)
union ATOMICS* p = (union ATOMICS*)data;
return p;
}

2
libdap4/d4file.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
libdap4/d4fix.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
libdap4/d4http.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
libdap4/d4http.h
View File

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

2
libdap4/d4includes.h
View File

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

2
libdap4/d4mem.c
View File

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

2
libdap4/d4meta.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
libdap4/d4odom.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
libdap4/d4odom.h
View File

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

2
libdap4/d4parser.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
libdap4/d4printer.c
View File

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

11
libdap4/d4read.c
View File

@ -1,3 +1,14 @@
/*! \file
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 \ref copyright file for more info.
*/
#include "d4includes.h"
#include "d4curlfunctions.h"
#ifdef HAVE_FCNTL_H

2
libdap4/d4read.h
View File

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

2
libdap4/d4swap.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
libdap4/d4util.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
libdap4/d4util.h
View File

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

2
libdap4/d4varx.c
View File

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

38
libdap4/ezxml.c
View File

@ -94,7 +94,7 @@ ezxml_t ezxml_vget(ezxml_t xml, va_list ap)
int idx = -1;
if (name && *name) {
idx = va_arg(ap, int);
idx = va_arg(ap, int);
xml = ezxml_child(xml, name);
}
return (idx < 0) ? xml : ezxml_vget(ezxml_idx(xml, idx), ap);
@ -136,7 +136,7 @@ ezxml_t ezxml_err(ezxml_root_t root, char *s, const char *err, ...)
va_list ap;
int line = 1;
char *t, fmt[EZXML_ERRL];
for (t = root->s; t < s; t++) if (*t == '\n') line++;
snprintf(fmt, EZXML_ERRL, "[error near line %d]: %s", line, err);
@ -164,7 +164,7 @@ char *ezxml_decode(char *s, char **ent, char t)
if (*s == '\n') memmove(s, (s + 1), strlen(s));
}
}
for (s = r; ; ) {
while (*s && *s != '&' && (*s != '%' || t != '%') && !isspace(*s)) s++;
@ -219,7 +219,7 @@ char *ezxml_decode(char *s, char **ent, char t)
void ezxml_open_tag(ezxml_root_t root, char *name, char **attr)
{
ezxml_t xml = root->cur;
if (xml->name) xml = ezxml_add_child(xml, name, strlen(xml->txt));
else xml->name = name; /* first open tag*/
@ -318,7 +318,7 @@ short ezxml_internal_dtd(ezxml_root_t root, char *s, size_t len)
{
char q, *c, *t, *n = NULL, *v, **ent, **pe;
int i, j;
pe = memcpy(malloc(sizeof(EZXML_NIL)), EZXML_NIL, sizeof(EZXML_NIL));
for (s[len] = '\0'; s; ) {
@ -454,7 +454,7 @@ char *ezxml_str2utf8(char **s, size_t *len)
void ezxml_free_attr(char **attr) {
int i = 0;
char *m;
if (! attr || attr == EZXML_NIL) return; /* nothing to free*/
while (attr[i]) i += 2; /* find end of attribute list*/
m = attr[i + 1]; /* list of which names and values are malloced*/
@ -477,7 +477,7 @@ ezxml_t ezxml_parse_str(char *s, size_t len)
if (! len) return ezxml_err(root, NULL, "root tag missing");
root->u = ezxml_str2utf8(&s, &len); /* convert utf-16 to utf-8*/
root->e = (root->s = s) + len; /* record start and end of work area*/
e = s[len - 1]; /* save end char*/
s[len - 1] = '\0'; /* turn end char into null terminator*/
@ -487,14 +487,14 @@ ezxml_t ezxml_parse_str(char *s, size_t len)
for (; ; ) {
attr = (char **)EZXML_NIL;
d = ++s;
if (isalpha(*s) || *s == '_' || *s == ':' || *s < '\0') { /* new tag*/
if (! root->cur)
return ezxml_err(root, d, "markup outside of root element");
s += strcspn(s, EZXML_WS "/>");
while (isspace(*s)) *(s++) = '\0'; /* null terminate tag name*/
if (*s && *s != '/' && *s != '>') /* find tag in default attr list*/
for (i = 0; (a = root->attr[i]) && strcmp(a[0], d); i++);
@ -509,7 +509,7 @@ ezxml_t ezxml_parse_str(char *s, size_t len)
attr[l] = s; /* set attribute name*/
s += strcspn(s, EZXML_WS "=/>");
if (*s == '=' || isspace(*s)) {
if (*s == '=' || isspace(*s)) {
*(s++) = '\0'; /* null terminate tag attribute name*/
q = *(s += strspn(s, EZXML_WS "="));
if (q == '"' || q == '\'') { /* attribute value*/
@ -547,7 +547,7 @@ ezxml_t ezxml_parse_str(char *s, size_t len)
}
else {
if (l) ezxml_free_attr(attr);
return ezxml_err(root, d, "missing >");
return ezxml_err(root, d, "missing >");
}
}
else if (*s == '/') { /* close tag*/
@ -567,7 +567,7 @@ ezxml_t ezxml_parse_str(char *s, size_t len)
else return ezxml_err(root, d, "unclosed <![CDATA[");
}
else if (! strncmp(s, "!DOCTYPE", 8)) { /* dtd*/
for (l = 0; *s && ((! l && *s != '>') || (l && (*s != ']' ||
for (l = 0; *s && ((! l && *s != '>') || (l && (*s != ']' ||
*(s + strspn(s + 1, EZXML_WS) + 1) != '>')));
l = (*s == '[') ? 1 : l) s += strcspn(s + 1, "[]>") + 1;
if (! *s && e != '>')
@ -577,12 +577,12 @@ ezxml_t ezxml_parse_str(char *s, size_t len)
}
else if (*s == '?') { /* <?...?> processing instructions*/
do { s = strchr(s, '?'); } while (s && *(++s) && *s != '>');
if (! s || (! *s && e != '>'))
if (! s || (! *s && e != '>'))
return ezxml_err(root, d, "unclosed <?");
else ezxml_proc_inst(root, d + 1, s - d - 2);
}
else return ezxml_err(root, d, "unexpected <");
if (! s || ! *s) break;
*s = '\0';
d = ++s;
@ -626,7 +626,7 @@ char *ezxml_ampencode(const char *s, size_t len, char **dst, size_t *dlen,
size_t *max, short a)
{
const char *e;
for (e = s + len; s != e; s++) {
while (*dlen + 10 > *max) *dst = realloc(*dst, *max += EZXML_BUFSIZE);
@ -687,7 +687,7 @@ char *ezxml_toxml_r(ezxml_t xml, char **s, size_t *len, size_t *max,
*s = (xml->child) ? ezxml_toxml_r(xml->child, s, len, max, 0, attr) /*child*/
: ezxml_ampencode(xml->txt, -1, s, len, max, 0); /*data*/
while (*len + strlen(xml->name) + 4 > *max) /* reallocate s*/
*s = realloc(*s, *max += EZXML_BUFSIZE);
@ -765,7 +765,7 @@ void ezxml_free(ezxml_t xml)
for (j = 1; root->pi[i][j]; j++);
free(root->pi[i][j + 1]);
free(root->pi[i]);
}
}
if (root->pi[0]) free(root->pi); /* free processing instructions*/
if (root->len == -1) free(root->m); /* malloced xml data*/
@ -793,7 +793,7 @@ ezxml_t ezxml_new(const char *name)
{
static char *ent[] = { "lt;", "&#60;", "gt;", "&#62;", "quot;", "&#34;",
"apos;", "&#39;", "amp;", "&#38;", NULL };
ezxml_root_t root = (ezxml_root_t)memset(malloc(sizeof(struct ezxml_root)),
ezxml_root_t root = (ezxml_root_t)memset(malloc(sizeof(struct ezxml_root)),
'\0', sizeof(struct ezxml_root));
root->xml.name = (char *)name;
root->cur = &root->xml;
@ -948,7 +948,7 @@ ezxml_t ezxml_cut(ezxml_t xml)
while (cur->next && cur->next != xml) cur = cur->next;
if (cur->next) cur->next = cur->next->next; /* patch next list*/
}
}
}
xml->ordered = xml->sibling = xml->next = NULL;
return xml;

4
libdap4/ezxml.h
View File

@ -66,7 +66,7 @@ ezxml_t ezxml_parse_fd(int fd);
/* a wrapper for ezxml_parse_fd() that accepts a file name*/
ezxml_t ezxml_parse_file(const char *file);
/* Wrapper for ezxml_parse_str() that accepts a file stream. Reads the entire*/
/* stream into memory and then parses it. For xml files, use ezxml_parse_file()*/
/* or ezxml_parse_fd()*/
@ -111,7 +111,7 @@ const char **ezxml_pi(ezxml_t xml, const char *target);
/* frees the memory allocated for an ezxml structure*/
void ezxml_free(ezxml_t xml);
/* returns parser error message or empty string if none*/
const char *ezxml_error(ezxml_t xml);

2
libdap4/ezxml_extra.c
View File

@ -1,5 +1,5 @@
/*
* Copyright 1998-2015 University Corporation for Atmospheric Research/Unidata
* Copyright 1998-2018 University Corporation for Atmospheric Research/Unidata
* See the LICENSE file for more information.
*/

2
libdap4/ncd4.h
View File

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

2
libdap4/ncd4dispatch.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
libdap4/ncd4dispatch.h
View File

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

2
libdap4/ncd4types.h
View File

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